From 83e6545bb5232250a16d1c9bc484c3af8706b931 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 27 Nov 2017 13:12:48 -0800 Subject: [PATCH] GBA Cheats: More fixes --- src/gba/cheats/parv3.c | 9 ++++++++- src/gba/test/cheats.c | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gba/cheats/parv3.c b/src/gba/cheats/parv3.c index d0e04a986..df405b5f7 100644 --- a/src/gba/cheats/parv3.c +++ b/src/gba/cheats/parv3.c @@ -222,8 +222,15 @@ bool GBACheatAddProActionReplayRaw(struct GBACheatSet* cheats, uint32_t op1, uin if (cheats->incompleteCheat != COMPLETE) { struct mCheat* incompleteCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat); 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->repeat = ((op2 >> 16) & 0xFF) + 1; + incompleteCheat->repeat = (op2 >> 16) & 0xFF; incompleteCheat->addressOffset = (op2 & 0xFFFF) * incompleteCheat->width; cheats->incompleteCheat = COMPLETE; return true; diff --git a/src/gba/test/cheats.c b/src/gba/test/cheats.c index 9fb0d996b..7af7df40a 100644 --- a/src/gba/test/cheats.c +++ b/src/gba/test/cheats.c @@ -1016,6 +1016,7 @@ M_TEST_DEFINE(doPARv3IfXContain1ElseContain1) { assert_int_equal(core->rawRead8(core, 0x03000006, -1), 0x62); assert_int_equal(core->rawRead8(core, 0x03000007, -1), 0x71); assert_int_equal(core->rawRead8(core, 0x03000008, -1), 0x82); + set->deinit(set); } M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(GBACheats,