From 7f9c6df3744d40ab1a10ea7a1558ef56dc9d1ae1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 26 Jul 2018 08:51:06 -0500 Subject: Fix nonmatching ChooseNextBattleTowerTrainer() --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 3c0169606..830f7704a 100644 --- a/include/global.h +++ b/include/global.h @@ -808,7 +808,7 @@ struct BattleTowerData /*0x04BC, 0x0564*/ u8 battleTowerTrainerId; // index for gBattleTowerTrainers table /*0x04BD, 0x0565*/ u8 selectedPartyMons[0x3]; // indices of the 3 selected player party mons. /*0x04C0, 0x0568*/ u16 prizeItem; - /*0x04C2, 0x056A*/ u8 filler_4C2[0x6]; + /*0x04C2, 0x056A*/ u8 battledTrainerIds[6]; /*0x04C8, 0x0570*/ u16 totalBattleTowerWins; /*0x04CA, 0x0572*/ u16 bestBattleTowerWinStreak; /*0x04CC, 0x0574*/ u16 currentWinStreaks[2]; -- cgit v1.2.3 From 1a378c07c6f95a6805d96852e55e3847e32c03b5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 26 Jul 2018 08:51:21 -0500 Subject: Fix nonmatching SetPlayerSecretBaseRecordMixingParty() --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 830f7704a..36e1db978 100644 --- a/include/global.h +++ b/include/global.h @@ -176,7 +176,7 @@ struct SecretBaseRecord /*0x1A19*/ u8 sbr_field_11; /*0x1A1A*/ u8 decorations[16]; /*0x1A2A*/ u8 decorationPos[16]; - /*0x1A3A*/ u32 partyPersonality[6]; + /*0x1A3C*/ u32 partyPersonality[6]; /*0x1A54*/ u16 partyMoves[6 * 4]; /*0x1A84*/ u16 partySpecies[6]; /*0x1A90*/ u16 partyHeldItems[6]; -- cgit v1.2.3