ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Cheats: More fixes

This commit is contained in:
Vicki Pfau 2017-11-27 13:12:48 -08:00
parent 97a23975ab
commit 83e6545bb5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gba/cheats/parv3.c
View File

@ -222,8 +222,15 @@ bool GBACheatAddProActionReplayRaw(struct GBACheatSet* cheats, uint32_t op1, uin
if (cheats->incompleteCheat != COMPLETE) { if (cheats->incompleteCheat != COMPLETE) {
struct mCheat* incompleteCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat); struct mCheat* incompleteCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat);
incompleteCheat->operand = op1 & (0xFFFFFFFFU >> ((4 - incompleteCheat->width) * 8)); incompleteCheat->operand = op1 & (0xFFFFFFFFU >> ((4 - incompleteCheat->width) * 8));
if (cheats->incompleteCheat > 0) {
struct mCheat* lastCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat - 1);
if (lastCheat->type == CHEAT_IF_BUTTON) {
cheats->incompleteCheat = COMPLETE;
return true;
}
}
incompleteCheat->operandOffset = op2 >> 24; incompleteCheat->operandOffset = op2 >> 24;
incompleteCheat->repeat = ((op2 >> 16) & 0xFF) + 1; incompleteCheat->repeat = (op2 >> 16) & 0xFF;
incompleteCheat->addressOffset = (op2 & 0xFFFF) * incompleteCheat->width; incompleteCheat->addressOffset = (op2 & 0xFFFF) * incompleteCheat->width;
cheats->incompleteCheat = COMPLETE; cheats->incompleteCheat = COMPLETE;
return true; return true;

1
src/gba/test/cheats.c
View File

@ -1016,6 +1016,7 @@ M_TEST_DEFINE(doPARv3IfXContain1ElseContain1) {
assert_int_equal(core->rawRead8(core, 0x03000006, -1), 0x62); assert_int_equal(core->rawRead8(core, 0x03000006, -1), 0x62);
assert_int_equal(core->rawRead8(core, 0x03000007, -1), 0x71); assert_int_equal(core->rawRead8(core, 0x03000007, -1), 0x71);
assert_int_equal(core->rawRead8(core, 0x03000008, -1), 0x82); assert_int_equal(core->rawRead8(core, 0x03000008, -1), 0x82);
set->deinit(set);
} }
M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(GBACheats, M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(GBACheats,