From 6db014cc32d28a64499af7d605be3a062560d5e0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 17 Oct 2019 19:22:03 -0400 Subject: Document party_menu first pass --- include/battle_main.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index c134f819f..5dd1aed44 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -84,13 +84,13 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); bool8 TryRunFromBattle(u8 battlerId); -extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3]; +extern struct UnknownPokemonStruct4 gMultiPartnerParty[PARTY_SIZE / 2]; extern const struct SpriteTemplate gUnknown_0831AC88; extern const struct OamData gOamData_831ACA8; extern const struct OamData gOamData_831ACB0; extern const u8 gTypeEffectiveness[336]; -extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1]; +extern const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1]; extern const struct TrainerMoney gTrainerMoneyTable[]; extern const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1]; extern const u8 *const gAbilityDescriptionPointers[]; -- cgit v1.2.3 From e01ec84837c018bd3bfde58d7987d32733cc8bd6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 25 Oct 2019 21:55:01 -0400 Subject: Document party_menu second pass --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index 5dd1aed44..fe88204bf 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -77,7 +77,7 @@ void sub_803B3AC(void); // unused void sub_803B598(void); // unused void BattleTurnPassed(void); u8 IsRunningFromBattleImpossible(void); -void sub_803BDA0(u8 battlerId); +void SwitchPartyOrder(u8 battlerId); void SwapTurnOrder(u8 id1, u8 id2); u8 GetWhoStrikesFirst(u8 battlerId1, u8 battlerId2, bool8 ignoreChosenMoves); void RunBattleScriptCommands_PopCallbacksStack(void); -- cgit v1.2.3 From 27169f634b27a8985945e8b592f3f4ce0a38c53e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 31 Oct 2019 21:33:01 -0400 Subject: Review changes for party menu doc --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index fe88204bf..e04db17bb 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -84,7 +84,7 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); bool8 TryRunFromBattle(u8 battlerId); -extern struct UnknownPokemonStruct4 gMultiPartnerParty[PARTY_SIZE / 2]; +extern struct UnknownPokemonStruct4 gMultiPartnerParty[MULTI_PARTY_SIZE]; extern const struct SpriteTemplate gUnknown_0831AC88; extern const struct OamData gOamData_831ACA8; -- cgit v1.2.3