dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trainer dump pass 2; flag refactoring

Browse Source
This commit is contained in:
PikalaxALT
2019-10-17 17:11:34 -04:00
parent 0b708aeade
commit 97dc0a6903
13 changed files with 1503 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs_seeker.c
+4 -4
View File
@@ -1258,19 +1258,19 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 2:
if (!FlagGet(FLAG_SYS_NATIONAL_DEX))
if (!FlagGet(FLAG_0x896))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 3:
if (!FlagGet(FLAG_SYS_CAVE_SHIP))
if (!FlagGet(FLAG_0x897))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 4:
if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x32c))
if (!FlagGet(FLAG_0x82C))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5:
if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x344))
if (!FlagGet(FLAG_0x844))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
}