diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_main.h | 2 | ||||
-rw-r--r-- | include/battle_util2.h | 2 | ||||
-rw-r--r-- | include/constants/party_menu.h | 2 | ||||
-rw-r--r-- | include/menu.h | 2 | ||||
-rw-r--r-- | include/party_menu.h | 14 | ||||
-rw-r--r-- | include/pokemon_icon.h | 2 |
6 files changed, 13 insertions, 11 deletions
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); diff --git a/include/battle_util2.h b/include/battle_util2.h index 336698ea3..fe767ea4b 100644 --- a/include/battle_util2.h +++ b/include/battle_util2.h @@ -4,7 +4,7 @@ void AllocateBattleResources(void); void FreeBattleResources(void); void AdjustFriendshipOnBattleFaint(u8 battler); -void sub_80571DC(u8 battler, u8 arg1); +void SwitchPartyOrderInGameMulti(u8 battler, u8 arg1); u32 sub_805725C(u8 battler); #endif // GUARD_BATTLE_UTIL_H diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h index a15280afb..7953967ed 100644 --- a/include/constants/party_menu.h +++ b/include/constants/party_menu.h @@ -54,7 +54,7 @@ #define PARTY_MENU_TYPE_CONTEST 2 #define PARTY_MENU_TYPE_CHOOSE_MON 3 #define PARTY_MENU_TYPE_CHOOSE_HALF 4 // multi battles, eReader battles, and some battle facilities -#define PARTY_MENU_TYPE_IN_MULTI_BATTLE 5 // TODO: investigate +#define PARTY_MENU_TYPE_MULTI_SHOWCASE 5 #define PARTY_MENU_TYPE_DAYCARE 6 #define PARTY_MENU_TYPE_MOVE_RELEARNER 7 #define PARTY_MENU_TYPE_UNION_ROOM_REGISTER 8 // trading board diff --git a/include/menu.h b/include/menu.h index 14f4c130d..c5cef202c 100644 --- a/include/menu.h +++ b/include/menu.h @@ -86,7 +86,7 @@ void RemoveMapNamePopUpWindow(void); u8 GetMapNamePopUpWindowId(void); u8 AddMapNamePopUpWindow(void); void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); -void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); +void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); void sub_8197AE8(bool8 copyToVram); diff --git a/include/party_menu.h b/include/party_menu.h index c9c62febe..c8926c0b9 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -4,6 +4,8 @@ #include "main.h" #include "task.h" +// seems like the last two fields may have been left as all-purpose vars +// and the second of the two just happens to only be used in one case struct PartyMenu { MainCallback exitCallback; @@ -15,13 +17,13 @@ struct PartyMenu s8 slotId2; u8 action; u16 bagItem; - s16 unkE; // used as both a moveId and a move slot/cursor position - s16 learnMoveState; + s16 data1; // used variously as a moveId, counter, moveSlotId, or cursorPos + s16 learnMoveState; // data2, used only as a learn move state }; extern struct PartyMenu gPartyMenu; -extern bool8 gUnknown_0203CEE8; -extern u8 gUnknown_0203CEE9; +extern bool8 gPartyMenuUseExitCallback; +extern u8 gSelectedMonPartyId; extern MainCallback gPostMenuFieldCallback; extern u8 gSelectedOrderFromParty[4]; extern u8 gBattlePartyCurrentOrder[3]; @@ -71,9 +73,9 @@ void OpenPartyMenuInBattle(u8 arg); void ChooseMonForInBattleItem(void); void sub_81B8C68(void); void sub_81B8D64(u8 battlerId, u8 multiplayerFlag); -void sub_81B8E80(u8 battlerId, u8 unk, u8 arrayIndex); +void SwitchPartyOrderLinkMulti(u8 battlerId, u8 slot, u8 arrayIndex); void SwitchPartyMonSlots(u8 slot, u8 slot2); -u8 GetBattlerPartyId(u8 slot); +u8 GetPartyIdFromBattlePartyId(u8 slot); void ShowPartyMenuToShowcaseMultiBattleParty(void); void ChooseMonForDaycare(void); bool8 CB2_FadeFromPartyMenu(void); diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 5018de37c..4fb990302 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -21,7 +21,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u u8 UpdateMonIconFrame(struct Sprite *sprite); void LoadMonIconPalette(u16 species); void sub_80D328C(struct Sprite *sprite); -void UpdateTradeMonIconFrame(struct Sprite *sprite); +void MonIconSpriteCallback(struct Sprite *sprite); void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum); u8 GetMonIconPaletteIndexFromSpecies(u16 species); |