From 94edade18ed4040db9cc2ce0cf766c7759c3372f Mon Sep 17 00:00:00 2001 From: "Prof. 9" Date: Fri, 20 Oct 2017 03:06:47 +0200 Subject: [PATCH] Fix PARv3 If-AND code types (fixes #913) (#914) --- include/mgba/internal/gba/cheats.h | 2 +- src/gba/cheats/parv3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mgba/internal/gba/cheats.h b/include/mgba/internal/gba/cheats.h index 83912f660..e8f23b26d 100644 --- a/include/mgba/internal/gba/cheats.h +++ b/include/mgba/internal/gba/cheats.h @@ -63,7 +63,7 @@ enum GBAActionReplay3Condition { PAR3_COND_GT = 0x20000000, PAR3_COND_ULT = 0x28000000, PAR3_COND_UGT = 0x30000000, - PAR3_COND_LAND = 0x38000000, + PAR3_COND_AND = 0x38000000, }; enum GBAActionReplay3Width { diff --git a/src/gba/cheats/parv3.c b/src/gba/cheats/parv3.c index ee2631f84..4def9171c 100644 --- a/src/gba/cheats/parv3.c +++ b/src/gba/cheats/parv3.c @@ -132,8 +132,8 @@ static bool _addPAR3Cond(struct GBACheatSet* cheats, uint32_t op1, uint32_t op2) case PAR3_COND_UGT: cheat->type = CHEAT_IF_UGT; break; - case PAR3_COND_LAND: - cheat->type = CHEAT_IF_LAND; + case PAR3_COND_AND: + cheat->type = CHEAT_IF_AND; break; } return true;