From eb48cc2f7eefc1e56c2dcec21c38381b4534b897 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sat, 23 Feb 2019 09:08:07 -0800 Subject: Decompile through sub_8167930. --- include/graphics.h | 5 +++++ include/strings.h | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index f7eaa394d..47962110d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4762,6 +4762,11 @@ extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; extern const u32 gBattleAnimFogTilemap[]; +extern const u32 gUsePokeblockGraph_Gfx[]; +extern const u32 gUsePokeblockGraph_Tilemap[]; +extern const u16 gUsePokeblockGraph_Pal[]; +extern const u16 gUsePokeblockNatureWin_Pal[]; + // Berry blender extern const u32 gBerryBlenderArrowTiles[]; extern const u32 gBerryBlenderStartTiles[]; diff --git a/include/strings.h b/include/strings.h index 74f3ca727..2c3d966b7 100644 --- a/include/strings.h +++ b/include/strings.h @@ -9,6 +9,11 @@ extern const u8 gText_OpenLevel[]; extern const u8 gText_Mom[]; extern const u8 gText_Dad[]; +extern const u8 gText_GetsAPokeBlockQuestion[]; +extern const u8 gText_WontEatAnymore[]; +extern const u8 gText_WasEnhanced[]; +extern const u8 gText_NothingChanged[]; + extern const u8 gText_Cool[]; extern const u8 gText_Beauty[]; extern const u8 gText_Cute[]; -- cgit v1.2.3 From 4907ce6f7f5e8d73c32f6d8746ba64465502df03 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 02:50:40 -0500 Subject: Fully document move_tutor (formerly learn_move) --- include/field_screen_effect.h | 2 +- include/learn_move.h | 7 ------- include/list_menu.h | 2 +- include/move_tutor.h | 7 +++++++ include/pokenav.h | 10 +++++----- include/strings.h | 16 ++++++++-------- 6 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 include/learn_move.h create mode 100644 include/move_tutor.h (limited to 'include') diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 2b8b3a5a3..a1cf580cd 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -5,7 +5,7 @@ void pal_fill_for_maplights(void); void pal_fill_black(void); void WarpFadeScreen(void); void sub_80AF128(void); -void sub_80AF168(void); +void FieldCallback_ReturnToEventScript2(void); void sub_80AF188(void); void sub_80AF214(void); void sub_80AF2B4(u8 taskId); diff --git a/include/learn_move.h b/include/learn_move.h deleted file mode 100644 index 542ae6a5a..000000000 --- a/include/learn_move.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_LEARN_MOVE_H -#define GUARD_LEARN_MOVE_H - -void TeachMoveTutorMove(void); -void ShowHideHearts(s32); - -#endif //GUARD_LEARN_MOVE_H diff --git a/include/list_menu.h b/include/list_menu.h index ef23688d8..a301e5b32 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -4,7 +4,7 @@ #include "window.h" #define LIST_NOTHING_CHOSEN -1 -#define LIST_B_PRESSED -2 +#define LIST_CANCEL -2 #define LIST_HEADER -3 #define LIST_NO_MULTIPLE_SCROLL 0 diff --git a/include/move_tutor.h b/include/move_tutor.h new file mode 100644 index 000000000..e3e5da1d4 --- /dev/null +++ b/include/move_tutor.h @@ -0,0 +1,7 @@ +#ifndef GUARD_LEARN_MOVE_H +#define GUARD_LEARN_MOVE_H + +void TeachMoveTutorMove(void); +void MoveTutorShowHideHearts(s32); + +#endif //GUARD_LEARN_MOVE_H diff --git a/include/pokenav.h b/include/pokenav.h index e5dba8ae0..f80123757 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -20,11 +20,11 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); -void sub_81D2BF4(u8 *); -u16 sub_81D2C3C(void); -void sub_81D2C50(void); -u8 sub_81D28C8(const struct ListMenuItem *items, u16 numChoices); -void sub_81D2824(u16); +void MoveTutorPrintText(u8 *); +u16 MoveTutorRunTextPrinters(void); +void MoveTutorCreateYesNoMenu(void); +u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveTutorWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index 3899b63aa..bd1a5349c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -859,15 +859,15 @@ extern const u8 gText_Winona[]; extern const u8 gText_Phoebe[]; extern const u8 gText_Glacia[]; -extern const u8 gText_PkmnLearnedMove4[]; -extern const u8 gText_PkmnTryingToLearnMove[]; -extern const u8 gText_WhichMoveToForget2[]; -extern const u8 gText_StopTryingToTeachMove[]; -extern const u8 gText_12AndPoof[]; -extern const u8 gText_PkmnForgotMoveAndLearnedNew[]; +extern const u8 gText_MoveTutorPkmnLearnedMove[]; +extern const u8 gText_MoveTutorPkmnTryingToLearnMove[]; +extern const u8 gText_MoveTutorWhichMoveToForget[]; +extern const u8 gText_MoveTutorStopTryingToTeachMove[]; +extern const u8 gText_MoveTutorAndPoof[]; +extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; -extern const u8 gText_GiveUpTeachingNewMove[]; -extern const u8 gText_TeachX[]; +extern const u8 gText_MoveTutorGiveUp[]; +extern const u8 gText_MoveTutorTeachMoveConfirm[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; -- cgit v1.2.3 From cae63cf1c79ed243827e8a9149c1aa652f80d374 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 20:56:39 -0500 Subject: Rename move tutor to move relearner --- include/move_relearner.h | 7 +++++++ include/move_tutor.h | 7 ------- include/pokenav.h | 10 +++++----- include/strings.h | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 include/move_relearner.h delete mode 100644 include/move_tutor.h (limited to 'include') diff --git a/include/move_relearner.h b/include/move_relearner.h new file mode 100644 index 000000000..51b476d25 --- /dev/null +++ b/include/move_relearner.h @@ -0,0 +1,7 @@ +#ifndef GUARD_MOVE_RELEARNER_H +#define GUARD_MOVE_RELEARNER_H + +void TeachMoveRelearnerMove(void); +void MoveRelearnerShowHideHearts(s32); + +#endif //GUARD_MOVE_RELEARNER_H diff --git a/include/move_tutor.h b/include/move_tutor.h deleted file mode 100644 index e3e5da1d4..000000000 --- a/include/move_tutor.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_LEARN_MOVE_H -#define GUARD_LEARN_MOVE_H - -void TeachMoveTutorMove(void); -void MoveTutorShowHideHearts(s32); - -#endif //GUARD_LEARN_MOVE_H diff --git a/include/pokenav.h b/include/pokenav.h index f80123757..e6fa5f40d 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -20,11 +20,11 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); -void MoveTutorPrintText(u8 *); -u16 MoveTutorRunTextPrinters(void); -void MoveTutorCreateYesNoMenu(void); -u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices); -void InitMoveTutorWindows(bool8 useContextWindow); +void MoveRelearnerPrintText(u8 *); +u16 MoveRelearnerRunTextPrinters(void); +void MoveRelearnerCreateYesNoMenu(void); +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index bd1a5349c..8fc5ad377 100644 --- a/include/strings.h +++ b/include/strings.h @@ -859,15 +859,15 @@ extern const u8 gText_Winona[]; extern const u8 gText_Phoebe[]; extern const u8 gText_Glacia[]; -extern const u8 gText_MoveTutorPkmnLearnedMove[]; -extern const u8 gText_MoveTutorPkmnTryingToLearnMove[]; -extern const u8 gText_MoveTutorWhichMoveToForget[]; -extern const u8 gText_MoveTutorStopTryingToTeachMove[]; -extern const u8 gText_MoveTutorAndPoof[]; -extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[]; +extern const u8 gText_MoveRelearnerPkmnLearnedMove[]; +extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[]; +extern const u8 gText_MoveRelearnerWhichMoveToForget[]; +extern const u8 gText_MoveRelearnerStopTryingToTeachMove[]; +extern const u8 gText_MoveRelearnerAndPoof[]; +extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; -extern const u8 gText_MoveTutorGiveUp[]; -extern const u8 gText_MoveTutorTeachMoveConfirm[]; +extern const u8 gText_MoveRelearnerGiveUp[]; +extern const u8 gText_MoveRelearnerTeachMoveConfirm[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; -- cgit v1.2.3 From 907492fd6e724d8dc2e5d2eff372be85e6f0d30c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 23:26:51 -0500 Subject: Split rom asm file in half The first half is ui/menu stuff, while the second half is link-related stuff. --- include/pokenav.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/pokenav.h b/include/pokenav.h index e6fa5f40d..849c9bf16 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -28,7 +28,7 @@ void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); -void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); #endif //GUARD_POKENAV_H -- cgit v1.2.3 From 9bea9e1624a30980aa194b076f0324b77c76edc9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 06:06:20 -0500 Subject: Start decompiling menu_unknown --- include/menu.h | 2 +- include/menu_unknown.h | 15 +++++++++++++++ include/pokenav.h | 9 --------- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 include/menu_unknown.h (limited to 'include') diff --git a/include/menu.h b/include/menu.h index aca462468..af60e5192 100644 --- a/include/menu.h +++ b/include/menu.h @@ -31,7 +31,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); -void SetStandardWindowBorderStyle(u8 a0, u8 a1); +void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void DisplayYesNoMenu(void); u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); diff --git a/include/menu_unknown.h b/include/menu_unknown.h new file mode 100644 index 000000000..b4c161dad --- /dev/null +++ b/include/menu_unknown.h @@ -0,0 +1,15 @@ +#ifndef GUARD_MENU_UNKNOWN_H +#define GUARD_MENU_UNKNOWN_H + +#include "player_pc.h" + +bool8 sub_81D1C44(u8 a0); +u8 sub_81D1C84(u8 a0); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); +void sub_81D1E90(struct PlayerPCItemPageStruct *a0); +void sub_81D1EC0(void); +void sub_81D1D04(u8 a0); +void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); + +#endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokenav.h b/include/pokenav.h index 849c9bf16..a1f311944 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,6 +1,5 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H -#include "player_pc.h" #include "list_menu.h" bool8 sub_81D20BC(void *arg0); @@ -13,12 +12,6 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(void *arg0, void *arg1); void sub_81D1F84(void *arg0, void *arg1, void *arg2); -u8 sub_81D1C84(u8); -u8 sub_81D1DC0(struct PlayerPCItemPageStruct *); -void sub_81D1E90(struct PlayerPCItemPageStruct *); -void sub_81D1EC0(void); -void sub_81D1D04(u8); -bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); u16 MoveRelearnerRunTextPrinters(void); @@ -28,7 +21,5 @@ void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); -void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); #endif //GUARD_POKENAV_H -- cgit v1.2.3 From c3594f982ddd0839aa7b97cb5a54087e198b0326 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 20:32:14 -0500 Subject: Decompiling pokeblock ui stuff --- include/menu_unknown.h | 26 ++++++++++++++++++++++++++ include/pokenav.h | 8 -------- 2 files changed, 26 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/menu_unknown.h b/include/menu_unknown.h index b4c161dad..9d398e2b0 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -3,6 +3,24 @@ #include "player_pc.h" +struct UnknownSubStruct_81D1ED4 +{ + u16 unk0; + u16 unk2; +}; + +struct UnknownStruct_81D1ED4 +{ + u8 unk0[4][5]; + struct UnknownSubStruct_81D1ED4 unk14[4][5]; + struct UnknownSubStruct_81D1ED4 unk64[10][5]; + struct UnknownSubStruct_81D1ED4 unk12C[4]; + u8 unk13C[0x216]; + u16 unk352; + u8 unk354; + u8 unk355[0x23]; +}; + bool8 sub_81D1C44(u8 a0); u8 sub_81D1C84(u8 a0); u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); @@ -11,5 +29,13 @@ void sub_81D1EC0(void); void sub_81D1D04(u8 a0); void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); +void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D3464(void *arg0); +void sub_81D3480(void *arg0, u8 arg1); +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokenav.h b/include/pokenav.h index a1f311944..10f042225 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -4,14 +4,6 @@ bool8 sub_81D20BC(void *arg0); bool8 sub_81D312C(void *arg0); -void sub_81D1ED4(void *arg0); -void sub_81D2108(void *arg0); -void sub_81D20AC(void *arg0); -void sub_81D2230(void *arg0); -void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(void *arg0, void *arg1); -void sub_81D1F84(void *arg0, void *arg1, void *arg2); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); u16 MoveRelearnerRunTextPrinters(void); -- cgit v1.2.3 From 4345ba8e6cf145a646666b8d2be1a255873ed29a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 22:32:28 -0500 Subject: More decompiled and cleanup --- include/menu_unknown.h | 4 +++- include/pokenav.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu_unknown.h b/include/menu_unknown.h index 9d398e2b0..744e985ca 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -18,7 +18,8 @@ struct UnknownStruct_81D1ED4 u8 unk13C[0x216]; u16 unk352; u8 unk354; - u8 unk355[0x23]; + u8 unk355; + u8 unk356[0x22]; }; bool8 sub_81D1C44(u8 a0); @@ -33,6 +34,7 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); diff --git a/include/pokenav.h b/include/pokenav.h index 10f042225..e39373b35 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -2,7 +2,6 @@ #define GUARD_POKENAV_H #include "list_menu.h" -bool8 sub_81D20BC(void *arg0); bool8 sub_81D312C(void *arg0); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); -- cgit v1.2.3 From 0da83abad297cdc2d07e89aa30dbf86ab6360ac9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 6 Mar 2019 22:27:30 -0500 Subject: Several nonmatching functions Huge and difficult. --- include/menu_unknown.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/menu_unknown.h b/include/menu_unknown.h index 744e985ca..d63abdc0b 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -14,8 +14,10 @@ struct UnknownStruct_81D1ED4 u8 unk0[4][5]; struct UnknownSubStruct_81D1ED4 unk14[4][5]; struct UnknownSubStruct_81D1ED4 unk64[10][5]; - struct UnknownSubStruct_81D1ED4 unk12C[4]; - u8 unk13C[0x216]; + struct UnknownSubStruct_81D1ED4 unk12C[5]; + struct UnknownSubStruct_81D1ED4 unk13C[0x42]; + struct UnknownSubStruct_81D1ED4 unk248[0x42]; + u16 unk350; u16 unk352; u8 unk354; u8 unk355; @@ -37,7 +39,7 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file -- cgit v1.2.3 From 69aec91577659cfe89a63fc4c8d2fc77ab344cbb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 01:56:38 -0500 Subject: Decompile move tutor stuff 2 nonmatching. --- include/contest_effect.h | 1 + include/menu_unknown.h | 6 ++++++ include/pokemon_summary_screen.h | 3 +++ include/pokenav.h | 5 ----- include/strings.h | 7 +++++++ 5 files changed, 17 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/contest_effect.h b/include/contest_effect.h index 5f48e1b8b..0474cb38c 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -19,6 +19,7 @@ struct ContestEffect extern const struct ContestMove gContestMoves[]; extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectDescriptionPointers[]; +extern const u8 *const gContestMoveTypeTextPointers[]; bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove); diff --git a/include/menu_unknown.h b/include/menu_unknown.h index d63abdc0b..a442ec318 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -2,6 +2,7 @@ #define GUARD_MENU_UNKNOWN_H #include "player_pc.h" +#include "list_menu.h" struct UnknownSubStruct_81D1ED4 { @@ -41,5 +42,10 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); +void MoveRelearnerPrintText(u8 *text); +bool16 MoveRelearnerRunTextPrinters(void); +void MoveRelearnerCreateYesNoMenu(void); +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveRelearnerWindows(bool8 useContextWindow); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index bd99fed0e..19994b77f 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -1,7 +1,10 @@ #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H #define GUARD_POKEMON_SUMMARY_SCREEN_H +#include "main.h" + extern u8 gLastViewedMonIndex; +extern const u8 *const gMoveDescriptionPointers[]; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); diff --git a/include/pokenav.h b/include/pokenav.h index e39373b35..a562b0c7b 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -4,11 +4,6 @@ bool8 sub_81D312C(void *arg0); bool8 sub_81D4A58(struct EventObject*); -void MoveRelearnerPrintText(u8 *); -u16 MoveRelearnerRunTextPrinters(void); -void MoveRelearnerCreateYesNoMenu(void); -u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); -void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index 8fc5ad377..9e464562d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -868,6 +868,13 @@ extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; extern const u8 gText_MoveRelearnerGiveUp[]; extern const u8 gText_MoveRelearnerTeachMoveConfirm[]; +extern const u8 gText_MoveRelearnerBattleMoves[]; +extern const u8 gText_MoveRelearnerPP[]; +extern const u8 gText_MoveRelearnerPower[]; +extern const u8 gText_MoveRelearnerAccuracy[]; +extern const u8 gText_MoveRelearnerContestMovesTitle[]; +extern const u8 gText_MoveRelearnerAppeal[]; +extern const u8 gText_MoveRelearnerJam[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; -- cgit v1.2.3 From af182d6f168afbb7c8c35fe9240ecf931099d06e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 02:10:44 -0500 Subject: Minor cleanup before pushing --- include/menu_unknown.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/menu_unknown.h b/include/menu_unknown.h index a442ec318..2eefb5971 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -25,10 +25,10 @@ struct UnknownStruct_81D1ED4 u8 unk356[0x22]; }; -bool8 sub_81D1C44(u8 a0); +bool8 sub_81D1C44(u8 count); u8 sub_81D1C84(u8 a0); -u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); -void sub_81D1E90(struct PlayerPCItemPageStruct *a0); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); +void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1EC0(void); void sub_81D1D04(u8 a0); void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); @@ -42,7 +42,7 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); -void MoveRelearnerPrintText(u8 *text); +void MoveRelearnerPrintText(u8 *str); bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); -- cgit v1.2.3 From eac70acab65dea005da2299e4bb209aff1ded60f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 02:17:01 -0500 Subject: Change filename to something more descriptive --- include/menu_specialized.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++ include/menu_unknown.h | 51 ---------------------------------------------- 2 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 include/menu_specialized.h delete mode 100644 include/menu_unknown.h (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h new file mode 100644 index 000000000..3012ac90a --- /dev/null +++ b/include/menu_specialized.h @@ -0,0 +1,51 @@ +#ifndef GUARD_MENU_SPECIALIZED_H +#define GUARD_MENU_SPECIALIZED_H + +#include "player_pc.h" +#include "list_menu.h" + +struct UnknownSubStruct_81D1ED4 +{ + u16 unk0; + u16 unk2; +}; + +struct UnknownStruct_81D1ED4 +{ + u8 unk0[4][5]; + struct UnknownSubStruct_81D1ED4 unk14[4][5]; + struct UnknownSubStruct_81D1ED4 unk64[10][5]; + struct UnknownSubStruct_81D1ED4 unk12C[5]; + struct UnknownSubStruct_81D1ED4 unk13C[0x42]; + struct UnknownSubStruct_81D1ED4 unk248[0x42]; + u16 unk350; + u16 unk352; + u8 unk354; + u8 unk355; + u8 unk356[0x22]; +}; + +bool8 sub_81D1C44(u8 count); +u8 sub_81D1C84(u8 a0); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); +void sub_81D1E90(struct PlayerPCItemPageStruct *page); +void sub_81D1EC0(void); +void sub_81D1D04(u8 a0); +void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); +void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D3464(void *arg0); +void sub_81D3480(void *arg0, u8 arg1); +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); +void MoveRelearnerPrintText(u8 *str); +bool16 MoveRelearnerRunTextPrinters(void); +void MoveRelearnerCreateYesNoMenu(void); +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveRelearnerWindows(bool8 useContextWindow); + +#endif // GUARD_MENU_SPECIALIZED_H \ No newline at end of file diff --git a/include/menu_unknown.h b/include/menu_unknown.h deleted file mode 100644 index 2eefb5971..000000000 --- a/include/menu_unknown.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef GUARD_MENU_UNKNOWN_H -#define GUARD_MENU_UNKNOWN_H - -#include "player_pc.h" -#include "list_menu.h" - -struct UnknownSubStruct_81D1ED4 -{ - u16 unk0; - u16 unk2; -}; - -struct UnknownStruct_81D1ED4 -{ - u8 unk0[4][5]; - struct UnknownSubStruct_81D1ED4 unk14[4][5]; - struct UnknownSubStruct_81D1ED4 unk64[10][5]; - struct UnknownSubStruct_81D1ED4 unk12C[5]; - struct UnknownSubStruct_81D1ED4 unk13C[0x42]; - struct UnknownSubStruct_81D1ED4 unk248[0x42]; - u16 unk350; - u16 unk352; - u8 unk354; - u8 unk355; - u8 unk356[0x22]; -}; - -bool8 sub_81D1C44(u8 count); -u8 sub_81D1C84(u8 a0); -u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); -void sub_81D1E90(struct PlayerPCItemPageStruct *page); -void sub_81D1EC0(void); -void sub_81D1D04(u8 a0); -void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); -void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); -void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); -bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); -void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); -void MoveRelearnerPrintText(u8 *str); -bool16 MoveRelearnerRunTextPrinters(void); -void MoveRelearnerCreateYesNoMenu(void); -u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); -void InitMoveRelearnerWindows(bool8 useContextWindow); - -#endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file -- cgit v1.2.3 From b7cfa9d36537b8ae53012eb88d59f8b842fb35c4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 21:39:51 -0500 Subject: Move more contest constants into C --- include/graphics.h | 8 ++++++++ include/sprite.h | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index c651268ca..063f71ee5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4765,6 +4765,14 @@ extern const u32 gUnknown_08C16FA8[]; extern const u32 gUnknown_08C16E90[]; extern const u32 gUnknown_08C17170[]; extern const u32 gUnknown_08C17980[]; +extern const u32 gTiles_8C19450[]; +extern const u32 gContestNextTurnGfx[]; +extern const u16 gContestPal[]; +extern const u32 gUnknown_08C19168[]; +extern const u32 gContestApplauseGfx[]; +extern const u32 gContestJudgeGfx[]; +extern const u32 gContestJudgeSymbolsGfx[]; +extern const u32 gContest3Pal[]; extern const u32 gUnknown_08D95E00[]; extern const u32 gUnknown_08D960D0[]; diff --git a/include/sprite.h b/include/sprite.h index 32bdd9c55..10c4145b0 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -151,6 +151,26 @@ enum SUBSPRITES_IGNORE_PRIORITY, // on but priority is ignored }; +#define OAM_SIZE_0 (0) +#define OAM_SIZE_1 (1 << 0) +#define OAM_SIZE_2 (1 << 1) +#define OAM_SIZE_3 (1 << 2) + +#define SPRITE_SIZE_8x8 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_0 +#define SPRITE_SIZE_16x16 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_1 +#define SPRITE_SIZE_32x32 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_2 +#define SPRITE_SIZE_64x64 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_3 + +#define SPRITE_SIZE_16x8 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_0 +#define SPRITE_SIZE_32x8 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_1 +#define SPRITE_SIZE_32x16 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_2 +#define SPRITE_SIZE_64x32 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_3 + +#define SPRITE_SIZE_8x16 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_0 +#define SPRITE_SIZE_8x32 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_1 +#define SPRITE_SIZE_16x32 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_2 +#define SPRITE_SIZE_32x64 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_3 + struct Subsprite { s8 x; // was u16 in R/S -- cgit v1.2.3 From 5b4b0a245be14b7485c3e2cc40e40c78eeaa7ce0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Mar 2019 00:00:10 -0500 Subject: Move contest winner list to C --- include/contest.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index 8146486cb..4fbec9d22 100644 --- a/include/contest.h +++ b/include/contest.h @@ -196,6 +196,14 @@ enum CONTEST_STRING_NONE = 255 }; +enum { + CONTEST_RANK_NORMAL, + CONTEST_RANK_SUPER, + CONTEST_RANK_HYPER, + CONTEST_RANK_MASTER, + CONTEST_RANK_LINK +}; + struct ContestPokemon { /*0x00*/ u16 species; -- cgit v1.2.3 From 153499ed6f08b6546349ba1ec33ea9e18840f44b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Mar 2019 01:38:38 -0500 Subject: Clean up contest_opponents.inc --- include/contest.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index 4fbec9d22..a803c6d4c 100644 --- a/include/contest.h +++ b/include/contest.h @@ -208,15 +208,17 @@ struct ContestPokemon { /*0x00*/ u16 species; /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; - /*0x0D*/ u8 trainerName[8]; + /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x15*/ u8 trainerGfxId; + // Temp note: 2 bytes of padding /*0x18*/ u32 flags; - /*0x1C*/ u8 whichRank:2; - u8 aiPool_Cool:1; - u8 aiPool_Beauty:1; - u8 aiPool_Cute:1; - u8 aiPool_Smart:1; - u8 aiPool_Tough:1; + /*0x1C*/ u8 whichRank:2; // 0x1 0x2 + u8 aiPool_Cool:1; // 0x4 + u8 aiPool_Beauty:1; // 0x8 + u8 aiPool_Cute:1; // 0x10 + u8 aiPool_Smart:1; // 0x20 + u8 aiPool_Tough:1; // 0x40 + // Temp note: 1 byte of padding /*0x1E*/ u16 moves[4]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty @@ -227,7 +229,7 @@ struct ContestPokemon /*0x2C*/ u8 unk2C[12]; /*0x38*/ u32 personality; // personality /*0x3C*/ u32 otId; // otId -}; // wow +}; struct Shared18000 { -- cgit v1.2.3 From 0c935a8bd500535ba67fad4f25ea50199cfc1871 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Mar 2019 22:54:17 -0500 Subject: Move the contest opponent filter to C --- include/contest.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index a803c6d4c..5c299bee5 100644 --- a/include/contest.h +++ b/include/contest.h @@ -204,6 +204,12 @@ enum { CONTEST_RANK_LINK }; +enum { + CONTEST_FILTER_NONE, + CONTEST_FILTER_NO_POSTGAME, + CONTEST_FILTER_ONLY_POSTGAME +}; + struct ContestPokemon { /*0x00*/ u16 species; -- cgit v1.2.3 From 7f70b629f569ce9a4c1b90cca3a3ce86ebd3e1c2 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Mar 2019 05:35:15 -0400 Subject: Document sAreaGlowTilemapMapping I used a script to generate the format for the array, so I can easily change its formatting if needed. --- include/constants/maps.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/constants/maps.h b/include/constants/maps.h index e1e2da992..93291f29e 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -9,4 +9,10 @@ #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) +// These groups are used by pokedex_area_screen.c to find wild +// pokemon locations. +#define MAP_AREA_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY) +#define MAP_AREA_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R) +#define MAP_AREA_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST) + #endif // GUARD_CONSTANTS_MAPS_H -- cgit v1.2.3 From 61344a4fee6500cd61a0bc2c2d3346db361134c4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Mar 2019 22:56:53 -0400 Subject: Document the water droplet data. --- include/title_screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/title_screen.h b/include/title_screen.h index ad0809ed2..b7100f124 100644 --- a/include/title_screen.h +++ b/include/title_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_TITLE_SCREEN_H #define GUARD_TITLE_SCREEN_H -extern const u16 gIntroWaterDropData[]; +extern const u16 gIntroWaterDropAlphaBlend[]; void CB2_InitTitleScreen(void); -- cgit v1.2.3 From 092608aef6495fdd9b9d2d8cae00e1bd940f9b27 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Mar 2019 01:12:41 -0500 Subject: Add a constant for "no music" on maps. --- include/constants/songs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/constants/songs.h b/include/constants/songs.h index a459edd24..14b766965 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -538,4 +538,6 @@ #define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). +#define MUS_NONE 0xFFFF + #endif // GUARD_CONSTANTS_SONGS_H -- cgit v1.2.3 From 9848f84b9ec2d5950cb5dc4600b7651486ff986a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Mar 2019 03:12:15 -0400 Subject: Use constants for Oam .shape and .size fields Also some general formatting fixes for constants. --- include/gba/types.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'include') diff --git a/include/gba/types.h b/include/gba/types.h index 3d78b5b5e..cb370c785 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -87,6 +87,29 @@ struct OamData #define ST_OAM_H_RECTANGLE 1 #define ST_OAM_V_RECTANGLE 2 +#define ST_OAM_SIZE_0 0 +#define ST_OAM_SIZE_1 1 +#define ST_OAM_SIZE_2 2 +#define ST_OAM_SIZE_3 3 + +#define SPRITE_SIZE_8x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_16x16 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_32x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_64x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE)) + +#define SPRITE_SIZE_16x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_32x8 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_32x16 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_64x32 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE)) + +#define SPRITE_SIZE_8x16 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_8x32 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_16x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_32x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE)) + +#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2) +#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF) + struct BgAffineSrcData { s32 texX; -- cgit v1.2.3 From 7118462b9f58e4b9756c41fe1d464be70e9ac2b4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Mar 2019 18:15:47 -0500 Subject: Decompile ereader.c up to faraway island code --- include/ereader.h | 9 +++++++++ include/pokenav.h | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100755 include/ereader.h (limited to 'include') diff --git a/include/ereader.h b/include/ereader.h new file mode 100755 index 000000000..da31c8212 --- /dev/null +++ b/include/ereader.h @@ -0,0 +1,9 @@ +#ifndef GUARD_EREADER_H +#define GUARD_EREADER_H + +bool32 sub_81D3B34(void); +u32 sub_81D427C(void); +bool8 sub_81D4A58(struct EventObject*); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); + +#endif // GUARD_EREADER_H diff --git a/include/pokenav.h b/include/pokenav.h index 55bfb366c..4e02461fe 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,9 +3,6 @@ #include "list_menu.h" bool8 sub_81D312C(void *arg0); -bool8 sub_81D4A58(struct EventObject*); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); -u32 sub_81D427C(void); void sub_81D4998(void); void CB2_InitPokeNav(void); -- cgit v1.2.3 From f4f666f5af6586203692427860a474fe020abd42 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Mar 2019 13:36:06 -0500 Subject: Finish decompiling ereader.c --- include/constants/vars.h | 2 +- include/ereader.h | 2 ++ include/link.h | 1 - include/pokenav.h | 1 - include/rom_8011DC0.h | 4 ++++ include/strings.h | 20 ++++++++++++++++++++ 6 files changed, 27 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/constants/vars.h b/include/constants/vars.h index c025d62fc..67a9e6cbd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -74,7 +74,7 @@ #define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 #define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 -#define VAR_NEVER_READ_0x403A 0x403A // Var is written to, but never checked +#define VAR_FARAWAY_ISLAND_STEP_COUNTER 0x403A #define VAR_REGICE_STEPS_1 0x403B #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D diff --git a/include/ereader.h b/include/ereader.h index da31c8212..348affe81 100755 --- a/include/ereader.h +++ b/include/ereader.h @@ -4,6 +4,8 @@ bool32 sub_81D3B34(void); u32 sub_81D427C(void); bool8 sub_81D4A58(struct EventObject*); +void UpdateFarawayIslandStepCounter(void); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 IsMewPlayingHideAndSeek(void); #endif // GUARD_EREADER_H diff --git a/include/link.h b/include/link.h index 24a834c68..1e865e72b 100644 --- a/include/link.h +++ b/include/link.h @@ -230,7 +230,6 @@ bool8 IsLinkMaster(void); void CB2_LinkError(void); u8 GetSioMultiSI(void); bool8 IsLinkConnectionEstablished(void); -void SetSuppressLinkErrorMessage(bool8); bool8 HasLinkErrorOccurred(void); void ResetSerial(void); u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENGTH]); diff --git a/include/pokenav.h b/include/pokenav.h index 4e02461fe..13cb0babf 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,7 +3,6 @@ #include "list_menu.h" bool8 sub_81D312C(void *arg0); -void sub_81D4998(void); void CB2_InitPokeNav(void); #endif //GUARD_POKENAV_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index ac9bbb5c3..0f13718e5 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -20,4 +20,8 @@ bool32 sub_802C908(u16); void nullsub_89(u8 taskId); void var_800D_set_xB(void); +bool32 mevent_0814257C(u8 *textState, const u8 *str); +void sub_8018884(const u8 *src); +void sub_80186A4(void); + #endif //GUARD_rom_8011DC0_H diff --git a/include/strings.h b/include/strings.h index 9e464562d..1e4c789df 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2563,4 +2563,24 @@ extern const u8 gUnknown_0862BAC4[]; extern const u8 gUnknown_0862BACF[]; extern const u8 gUnknown_0862BADA[]; +// E-Reader +extern const u8 gUnknown_085EDFD6[]; +extern const u8 gUnknown_085EDFF5[]; +extern const u8 gUnknown_085EE014[]; +extern const u8 gUnknown_085EE035[]; +extern const u8 gUnknown_085EE05C[]; +extern const u8 gUnknown_085EE06B[]; +extern const u8 gUnknown_085EE080[]; +extern const u8 gUnknown_085EE097[]; +extern const u8 gUnknown_085EE0A3[]; +extern const u8 gUnknown_085EE0BF[]; +extern const u8 gUnknown_085EE0DC[]; +extern const u8 gUnknown_085EE0FA[]; +extern const u8 gUnknown_085EE107[]; +extern const u8 gUnknown_085EE120[]; +extern const u8 gUnknown_085EE12D[]; +extern const u8 gUnknown_085EE14B[]; +extern const u8 gUnknown_085EE14F[]; +extern const u8 gUnknown_085EE154[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From a7d5f032b17bf95d879a856d801731a7ae7f5b9b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Mar 2019 14:16:26 -0500 Subject: Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c --- include/ereader.h | 11 ----------- include/ereader_helpers.h | 20 ++++++++++++++++++++ include/ereader_screen.h | 6 ++++++ include/faraway_island.h | 10 ++++++++++ 4 files changed, 36 insertions(+), 11 deletions(-) delete mode 100755 include/ereader.h create mode 100755 include/ereader_helpers.h create mode 100755 include/ereader_screen.h create mode 100755 include/faraway_island.h (limited to 'include') diff --git a/include/ereader.h b/include/ereader.h deleted file mode 100755 index 348affe81..000000000 --- a/include/ereader.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GUARD_EREADER_H -#define GUARD_EREADER_H - -bool32 sub_81D3B34(void); -u32 sub_81D427C(void); -bool8 sub_81D4A58(struct EventObject*); -void UpdateFarawayIslandStepCounter(void); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); -bool8 IsMewPlayingHideAndSeek(void); - -#endif // GUARD_EREADER_H diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h new file mode 100755 index 000000000..54b36ef0f --- /dev/null +++ b/include/ereader_helpers.h @@ -0,0 +1,20 @@ +#ifndef GUARD_EREADER_HELPERS_H +#define GUARD_EREADER_HELPERS_H + +struct Unk81D38FC +{ + u8 unk0[0x270]; + int checksum; +}; + +bool8 sub_81D3920(u8 *buffer); +bool32 sub_81D3AB0(struct Unk81D38FC *arg0); +bool32 sub_81D3B34(void); +int sub_81D3D70(u8, u32, u32*, u32*); +void sub_81D3F9C(void); +void sub_81D3FAC(void); +void sub_81D41A0(void); +void sub_81D41F4(void); +void sub_81D4238(void); + +#endif // GUARD_EREADER_HELPERS_H diff --git a/include/ereader_screen.h b/include/ereader_screen.h new file mode 100755 index 000000000..0e3e51c76 --- /dev/null +++ b/include/ereader_screen.h @@ -0,0 +1,6 @@ +#ifndef GUARD_EREADER_SCREEN_H +#define GUARD_EREADER_SCREEN_H + +void sub_81D5014(void); + +#endif // GUARD_EREADER_SCREEN_H diff --git a/include/faraway_island.h b/include/faraway_island.h new file mode 100755 index 000000000..89b4bcd08 --- /dev/null +++ b/include/faraway_island.h @@ -0,0 +1,10 @@ +#ifndef GUARD_FARAWAY_ISLAND_H +#define GUARD_FARAWAY_ISLAND_H + +u32 sub_81D427C(void); +bool8 sub_81D4A58(struct EventObject*); +void UpdateFarawayIslandStepCounter(void); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 IsMewPlayingHideAndSeek(void); + +#endif // GUARD_FARAWAY_ISLAND_H -- cgit v1.2.3 From 77c4856e62040531994f772e964118309fb74653 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 22 Mar 2019 17:27:18 +0100 Subject: Nonmatchings go away --- include/menu_specialized.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index e43ea024c..80506b4b5 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -17,8 +17,8 @@ struct UnknownStruct_81D1ED4 struct UnknownSubStruct_81D1ED4 unk14[4][5]; struct UnknownSubStruct_81D1ED4 unk64[10][5]; struct UnknownSubStruct_81D1ED4 unk12C[5]; - struct UnknownSubStruct_81D1ED4 unk13C[0x42]; - struct UnknownSubStruct_81D1ED4 unk248[0x42]; + u16 unk140[66][2]; + u16 unk248[66][2]; u16 unk350; u16 unk352; u8 unk354; @@ -41,8 +41,8 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); -void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); +void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); @@ -50,4 +50,4 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); -#endif // GUARD_MENU_SPECIALIZED_H \ No newline at end of file +#endif // GUARD_MENU_SPECIALIZED_H -- cgit v1.2.3 From 7d54c2b9600060c2b0cc37bac7fbdcdad6ee3178 Mon Sep 17 00:00:00 2001 From: Fontbane Date: Thu, 21 Mar 2019 22:10:56 -0400 Subject: EventScript and Text Documentation In event_script.s. Also renamed a couple events for consistency/detail. --- include/event_scripts.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index e3ec8afb4..bf7084326 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -544,9 +544,9 @@ extern const u8 EventScript_RegionMap[]; extern const u8 EventScript_RunningShoesManual[]; extern const u8 EventScript_PictureBookShelf[]; extern const u8 EventScript_BookShelf[]; -extern const u8 EventScript_PokemonCenterBookshelf[]; +extern const u8 EventScript_PokemonCenterBookShelf[]; extern const u8 EventScript_Vase[]; -extern const u8 EventScript_TrashCan[]; +extern const u8 EventScript_EmptyTrashCan[]; extern const u8 EventScript_ShopShelf[]; extern const u8 EventScript_Blueprint[]; extern const u8 EventScript_WirelessBoxResults[]; -- cgit v1.2.3 From e8add87bf3ccc3563a3d4fa94e109251f4a06eea Mon Sep 17 00:00:00 2001 From: Fontbane Date: Fri, 22 Mar 2019 12:25:51 -0400 Subject: Document Field Effects and some related text Also VAR_TRICK_HOUSE_LEVEL --- include/constants/field_effects.h | 6 +++--- include/constants/vars.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 282f9ce75..00ca60457 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,7 +1,7 @@ #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H #define GUARD_FIELD_EFFECT_CONSTANTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 #define FLDEFF_USE_CUT_ON_GRASS 1 #define FLDEFF_USE_CUT_ON_TREE 2 #define FLDEFF_SHADOW 3 @@ -61,11 +61,11 @@ #define FLDEFF_SECRET_POWER_SHRUB 57 #define FLDEFF_CUT_GRASS 58 #define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59 -#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60 +#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60 #define FLDEFF_PCTURN_ON 61 #define FLDEFF_HALL_OF_FAME_RECORD 62 #define FLDEFF_USE_TELEPORT 63 -#define FLDEFF_64 64 +#define FLDEFF_RAYQUAZA 64 #define FLDEFF_65 65 #define FLDEFF_MOVE_DEOXYS_ROCK 66 diff --git a/include/constants/vars.h b/include/constants/vars.h index 67a9e6cbd..81ae99e1e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -84,7 +84,7 @@ #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_0x4044 0x4044 +#define VAR_TRICK_HOUSE_LEVEL 0x4044 #define VAR_POKELOT_PRIZE_ITEM 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SEEDOT_SIZE_RECORD 0x4047 -- cgit v1.2.3 From 91fa5faf4acf617db0625992b2caf116e64f0888 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Mar 2019 10:10:51 -0500 Subject: Match sub_8166564 --- include/menu_specialized.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index afc89a149..2ad3bb8c8 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -39,7 +39,7 @@ void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1); +void sub_81D3480(void *arg0, u8 arg1, u8 arg2); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); void MoveRelearnerPrintText(u8 *str); -- cgit v1.2.3 From 511ff2f20f14a1e74109416a0b0d704c8c2692fc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Mar 2019 10:41:09 -0500 Subject: Match sub_8166BEC and do some cleanup --- include/menu_specialized.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 51f54759d..70891772a 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -1,6 +1,7 @@ #ifndef GUARD_MENU_SPECIALIZED_H #define GUARD_MENU_SPECIALIZED_H +#include "sprite.h" #include "player_pc.h" #include "list_menu.h" #include "pokemon.h" @@ -37,9 +38,11 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D3520(struct Sprite **); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1, u8 arg2); +void sub_81D354C(struct Sprite **); +void sub_81D3464(struct Sprite **arg0); +void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); -- cgit v1.2.3 From 6566a49bebc877e742f8ee325dd659879afe63f3 Mon Sep 17 00:00:00 2001 From: Wyrserth Date: Sat, 23 Mar 2019 21:52:58 +0100 Subject: Use constants for naming screen's pages. --- include/naming_screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/naming_screen.h b/include/naming_screen.h index b04cb19b6..611f53ef2 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -59,9 +59,9 @@ struct NamingScreenData { enum { + PAGE_OTHERS, PAGE_UPPER, PAGE_LOWER, - PAGE_OTHERS, }; enum -- cgit v1.2.3 From 4fd2b0b48455774e1acc0ec0f86f023a26068fe5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Mar 2019 17:19:08 -0500 Subject: Decompile remaining functions in use_pokeblock.s --- include/graphics.h | 3 +++ include/menu_specialized.h | 4 ++++ include/strings.h | 1 + 3 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 8aa8a9b60..03840b6ff 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4905,4 +4905,7 @@ extern const u16 gEasyChatCursor_Pal[]; extern const u32 gEasyChatRightWindow_Gfx[]; extern const u16 gEasyChatRightWindow_Pal[]; +// Use Pokeblock +extern const u32 gUsePokeblockCondition_Gfx[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 70891772a..a629ab014 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -43,6 +43,10 @@ bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D354C(struct Sprite **); void sub_81D3464(struct Sprite **arg0); void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2); +u8 sub_81D3178(struct UnknownStruct_81D1ED4*, u16*); +u8 sub_81D31A4(struct UnknownStruct_81D1ED4*, u16*); +bool32 sub_81D2074(struct UnknownStruct_81D1ED4 *a0); +u8 sub_81D3150(u16 *arg0); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); diff --git a/include/strings.h b/include/strings.h index d6054c5fd..ded997b04 100644 --- a/include/strings.h +++ b/include/strings.h @@ -13,6 +13,7 @@ extern const u8 gText_GetsAPokeBlockQuestion[]; extern const u8 gText_WontEatAnymore[]; extern const u8 gText_WasEnhanced[]; extern const u8 gText_NothingChanged[]; +extern const u8 gText_NatureSlash[]; extern const u8 gText_Cool[]; extern const u8 gText_Beauty[]; -- cgit v1.2.3 From 456cc3a6f02b6f45753b47e5ea37bd92e616f089 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Mar 2019 13:09:46 -0500 Subject: Split out the remaining wireless-related files --- include/constants/songs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/constants/songs.h b/include/constants/songs.h index 14b766965..3778d5f08 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -467,7 +467,7 @@ #define MUS_RG_UNION 539 // Union Room #define MUS_RG_NETWORK 540 // Network Center #define MUS_RG_OKURIMONO 541 // Mystery Gift -#define MUS_RG_KINOMIKUI 542 +#define MUS_RG_KINOMIKUI 542 // Dodrio Berry Picking #define MUS_RG_NANADUNGEON 543 // Sevii Caves/Altering Cave (Mt. Moon) #define MUS_RG_OSHIE_TV 544 // Follow Me! #define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage) -- cgit v1.2.3 From cf917a873392df734afde73d7ff6125fd56a3ed4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Mar 2019 14:45:09 -0500 Subject: Decompile berry_powder.c --- include/berry_powder.h | 9 +++++++++ include/strings.h | 3 +++ 2 files changed, 12 insertions(+) create mode 100755 include/berry_powder.h (limited to 'include') diff --git a/include/berry_powder.h b/include/berry_powder.h new file mode 100755 index 000000000..8deea7ec0 --- /dev/null +++ b/include/berry_powder.h @@ -0,0 +1,9 @@ +#ifndef GUARD_BERRY_POWDER_H +#define GUARD_BERRY_POWDER_H + +void SetBerryPowder(u32 *powder, u32 amount); +void ApplyNewEncryptionKeyToBerryPowder(u32 encryptionKey); +bool8 GiveBerryPowder(u32 amountToAdd); +u32 GetBerryPowder(void); + +#endif // GUARD_BERRY_POWDER_H diff --git a/include/strings.h b/include/strings.h index ded997b04..400e48036 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2589,4 +2589,7 @@ extern const u8 gUnknown_085EE14B[]; extern const u8 gUnknown_085EE14F[]; extern const u8 gUnknown_085EE154[]; +// Berry Powder Menu +extern const u8 gText_Powder[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From e6caf0ff1019a1744df5b7c550a1a40db33d0154 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Mar 2019 17:20:35 -0500 Subject: Port mevent2.c from pokefirered --- include/constants/flags.h | 35 +++++++++++----------- include/global.h | 75 +++++++++++++++++++++++++++++++++++++++++++++-- include/link.h | 2 +- include/main.h | 2 ++ include/mevent.h | 36 +++++++++++++++++++++++ include/mevent_news.h | 6 ++++ 6 files changed, 135 insertions(+), 21 deletions(-) create mode 100755 include/mevent.h create mode 100755 include/mevent_news.h (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index 230fbabaf..f28af3278 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -336,24 +336,23 @@ #define FLAG_RECEIVED_AURORA_TICKET 0x13A // RECEIVED Aurora Ticket in Mystery Gift #define FLAG_RECEIVED_MYSTIC_TICKET 0x13B // RECEIVED Mystic Ticket in Mystery Gift #define FLAG_RECEIVED_OLD_SEA_MAP 0x13C // RECEIVED Old Sea Map in Mystery Gift - -#define FLAG_UNUSED_0x13D 0x13D // Unused Flag -#define FLAG_UNUSED_0x13E 0x13E // Unused Flag -#define FLAG_UNUSED_0x13F 0x13F // Unused Flag -#define FLAG_UNUSED_0x140 0x140 // Unused Flag -#define FLAG_UNUSED_0x141 0x141 // Unused Flag -#define FLAG_UNUSED_0x142 0x142 // Unused Flag -#define FLAG_UNUSED_0x143 0x143 // Unused Flag -#define FLAG_UNUSED_0x144 0x144 // Unused Flag -#define FLAG_UNUSED_0x145 0x145 // Unused Flag -#define FLAG_UNUSED_0x146 0x146 // Unused Flag -#define FLAG_UNUSED_0x147 0x147 // Unused Flag -#define FLAG_UNUSED_0x148 0x148 // Unused Flag -#define FLAG_UNUSED_0x149 0x149 // Unused Flag -#define FLAG_UNUSED_0x14A 0x14A // Unused Flag -#define FLAG_UNUSED_0x14B 0x14B // Unused Flag -#define FLAG_UNUSED_0x14C 0x14C // Unused Flag -#define FLAG_UNUSED_0x14D 0x14D // Unused Flag +#define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D +#define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E +#define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F +#define FLAG_UNUSED_MYSTERY_GIFT_0x140 0x140 +#define FLAG_UNUSED_MYSTERY_GIFT_0x141 0x141 +#define FLAG_UNUSED_MYSTERY_GIFT_0x142 0x142 +#define FLAG_UNUSED_MYSTERY_GIFT_0x143 0x143 +#define FLAG_UNUSED_MYSTERY_GIFT_0x144 0x144 +#define FLAG_UNUSED_MYSTERY_GIFT_0x145 0x145 +#define FLAG_UNUSED_MYSTERY_GIFT_0x146 0x146 +#define FLAG_UNUSED_MYSTERY_GIFT_0x147 0x147 +#define FLAG_UNUSED_MYSTERY_GIFT_0x148 0x148 +#define FLAG_UNUSED_MYSTERY_GIFT_0x149 0x149 +#define FLAG_UNUSED_MYSTERY_GIFT_0x14A 0x14A +#define FLAG_UNUSED_MYSTERY_GIFT_0x14B 0x14B +#define FLAG_UNUSED_MYSTERY_GIFT_0x14C 0x14C +#define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E #define FLAG_CHOSE_CLAW_FOSSIL 0x14F // Player chose Claw Fossil diff --git a/include/global.h b/include/global.h index 1f9ac5185..d738deb3c 100644 --- a/include/global.h +++ b/include/global.h @@ -808,6 +808,76 @@ struct SaveTrainerHill /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 }; +struct MysteryEventStruct +{ + u8 unk_0_0:2; + u8 unk_0_2:3; + u8 unk_0_5:3; + u8 unk_1; +}; + + struct MEventBuffer_3120_Sub +{ + u16 unk_00; + u8 unk_02; + u8 unk_03; + u8 unk_04[40]; + u8 unk_2C[10][40]; +}; + + struct MEventBuffer_3120 +{ + u32 crc; + struct MEventBuffer_3120_Sub data; +}; + + struct MEventBuffer_32E0_Sub +{ + u16 unk_00; + u16 unk_02; + u32 unk_04; + u8 unk_08_0:2; + u8 unk_08_2:4; + u8 unk_08_6:2; + u8 unk_09; + u8 unk_0A[40]; + u8 unk_32[40]; + u8 unk_5A[4][40]; + u8 unk_FA[40]; + u8 unk_122[40]; +}; + + struct MEventBuffer_32E0 +{ + u32 crc; + struct MEventBuffer_32E0_Sub data; +}; + + struct MEventBuffer_3430_Sub +{ + u16 unk_00; + u16 unk_02; + u16 unk_04; + u16 unk_06; + u16 unk_08[2][7]; +}; + + struct MEventBuffer_3430 +{ + u32 crc; + struct MEventBuffer_3430_Sub data; +}; + + struct MEventBuffers +{ + /*0x000 0x322C*/ struct MEventBuffer_3120 buffer_000; + /*0x1c0 0x33EC*/ struct MEventBuffer_32E0 buffer_1c0; + /*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310; + /*0x338 0x3564*/ u16 unk_338[4]; + /*0x340 0x356C*/ struct MysteryEventStruct unk_340; + /*0x344 0x3570*/ u32 unk_344[2][5]; +}; // 0x36C 0x3598 + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -884,14 +954,15 @@ struct SaveBlock1 /*0x31A8*/ u8 giftRibbons[52]; /*0x31DC*/ struct Roamer roamer; /*0x31F8*/ struct EnigmaBerry enigmaBerry; - /*0x322C*/ u8 field_322C[1260]; + /*0x322C*/ struct MEventBuffers unk_322C; + /*0x3598*/ u8 field_3598[0x180]; /*0x3718*/ u32 trainerHillTimes[4]; /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; - /*0x3C88*/ u8 filler_3C88[0xDC]; + /*0x3C88*/ u8 unk3C88[11][20]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; // sizeof: 0x3D88 diff --git a/include/link.h b/include/link.h index 1e865e72b..b2d4284b7 100644 --- a/include/link.h +++ b/include/link.h @@ -306,7 +306,7 @@ void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); -u16 *GetSaveBlock1Field3564(void); +u16 *sub_801B058(void); u8 sub_800A9A8(void); void sub_800AD10(void); void sub_800AB18(void); diff --git a/include/main.h b/include/main.h index 4f9a9e61a..6c67fbe9f 100644 --- a/include/main.h +++ b/include/main.h @@ -42,6 +42,8 @@ struct Main extern const u8 gGameVersion; extern const u8 gGameLanguage; +extern const u8 RomHeaderGameCode[4]; +extern const u8 RomHeaderSoftwareVersion; extern u16 gKeyRepeatStartDelay; extern bool8 gLinkTransferringData; diff --git a/include/mevent.h b/include/mevent.h new file mode 100755 index 000000000..ce50591b1 --- /dev/null +++ b/include/mevent.h @@ -0,0 +1,36 @@ +#ifndef GUARD_MEVENT_H +#define GUARD_MEVENT_H + +#include + +struct MEvent_Str_1 +{ + u16 unk_000; + size_t unk_004; + const void * unk_008; +}; + +struct MEvent_Str_2 +{ + u8 fill_00[0x40]; +}; + +struct MEventStruct_Unk1442CC +{ + u32 unk_00; + u16 unk_04; + u32 unk_08; + u16 unk_0C; + u32 unk_10; + u16 unk_14; + u16 unk_16[4]; + struct MEventBuffer_3430_Sub unk_20; + u8 unk_44; + u8 unk_45[7]; + u8 unk_4C[4]; + u16 unk_50[6]; + u8 unk_5C[4]; + u8 unk_60; +}; + +#endif //GUARD_MEVENT_H diff --git a/include/mevent_news.h b/include/mevent_news.h new file mode 100755 index 000000000..698d7148c --- /dev/null +++ b/include/mevent_news.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MEVENT_NEWS_H +#define GUARD_MEVENT_NEWS_H + +void sub_801DBC0(void); + +#endif //GUARD_MEVENT_NEWS_H -- cgit v1.2.3 From d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Mar 2019 18:13:32 -0500 Subject: Cleanup mevent2 --- include/link.h | 1 - include/mevent.h | 31 +++++++++++++++++++++++++++++-- include/rom_8011DC0.h | 1 - 3 files changed, 29 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/link.h b/include/link.h index b2d4284b7..714b6bf15 100644 --- a/include/link.h +++ b/include/link.h @@ -306,7 +306,6 @@ void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); -u16 *sub_801B058(void); u8 sub_800A9A8(void); void sub_800AD10(void); void sub_800AB18(void); diff --git a/include/mevent.h b/include/mevent.h index ce50591b1..7f12f3501 100755 --- a/include/mevent.h +++ b/include/mevent.h @@ -1,8 +1,6 @@ #ifndef GUARD_MEVENT_H #define GUARD_MEVENT_H -#include - struct MEvent_Str_1 { u16 unk_000; @@ -33,4 +31,33 @@ struct MEventStruct_Unk1442CC u8 unk_60; }; +void sub_801AFD8(void); +struct MEventBuffer_3120_Sub *sub_801B00C(void); +struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void); +struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void); +struct MysteryEventStruct *sub_801B044(void); +u16 *sub_801B058(void); +void sub_801B06C(void); +bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src); +bool32 sub_801B0CC(void); +bool32 sub_801B128(void); +bool32 sub_801B1A4(const u8 *src); +void sub_801B1E8(void); +bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data); +bool32 sub_801B27C(void); +bool32 sub_801B308(void); +u16 sub_801B39C(void); +void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer); +bool32 sub_801B3F8(void); +bool32 sub_801B508(const u16 *data); +void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1); +bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1); +u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); +u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); +bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1); +u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command); +u16 mevent_081445C0(u32 command); +void sub_801B940(void); +bool32 sub_801B94C(u16 a0); + #endif //GUARD_MEVENT_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 0f13718e5..8376d1bc6 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -13,7 +13,6 @@ extern u8 gUnknown_02022C3E; // Exported ROM declarations void sub_8018438(void); -u16 mevent_081445C0(u8); void sub_801B990(u32, u32); u8 sub_8013F78(void); bool32 sub_802C908(u16); -- cgit v1.2.3 From af1baa89f1c7f657eb096df5bf2677527301b5c4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Mar 2019 19:03:46 -0500 Subject: Start decompiling union_room_chat.c --- include/global.h | 3 ++- include/link.h | 1 - include/link_rfu.h | 3 +++ include/union_room_chat.h | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 include/union_room_chat.h (limited to 'include') diff --git a/include/global.h b/include/global.h index d738deb3c..0506c036e 100644 --- a/include/global.h +++ b/include/global.h @@ -962,7 +962,8 @@ struct SaveBlock1 /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; - /*0x3C88*/ u8 unk3C88[11][20]; + /*0x3C88*/ u8 unk3C88[10][21]; + /*0x3D5A*/ u8 filler3D5A[0xA]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; // sizeof: 0x3D88 diff --git a/include/link.h b/include/link.h index 714b6bf15..719b0f067 100644 --- a/include/link.h +++ b/include/link.h @@ -236,7 +236,6 @@ u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENG void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); -u8 GetLinkPlayerCount(void); bool32 InUnionRoom(void); void sub_800E0E8(void); bool8 IsLinkTaskFinished(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index 5b8ccd9fb..e341dd4f3 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -284,5 +284,8 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); void sub_8010198(void); +bool32 sub_8011A9C(void); +void sub_80104B0(void); +void sub_8011A50(void); #endif //GUARD_LINK_RFU_H diff --git a/include/union_room_chat.h b/include/union_room_chat.h new file mode 100755 index 000000000..dae751576 --- /dev/null +++ b/include/union_room_chat.h @@ -0,0 +1,6 @@ +#ifndef GUARD_UNION_ROOM_CHAT_H +#define GUARD_UNION_ROOM_CHAT_H + +void sub_801DD98(void); + +#endif // GUARD_UNION_ROOM_CHAT_H -- cgit v1.2.3 From c6c0c9582f486f805c98ecfa51a803ed62a23918 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 26 Mar 2019 15:11:55 -0400 Subject: Port menews_jisan.c from FireRed --- include/constants/vars.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/constants/vars.h b/include/constants/vars.h index 81ae99e1e..20524611b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -60,7 +60,7 @@ #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_UNUSED_0x402E 0x402E // Unused Var +#define VAR_0x402E 0x402E #define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 -- cgit v1.2.3 From 9a8b001ebf66a3c657512fb660b3c4768dabad1c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Mar 2019 10:44:49 -0400 Subject: through sub_801704C --- include/link_rfu.h | 1 + include/menu.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index 5b8ccd9fb..199df27aa 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -281,6 +281,7 @@ void sub_8011DE0(u32 arg0); u8 sub_801100C(int a0); void sub_800EF7C(void); bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); +bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); void sub_8010198(void); diff --git a/include/menu.h b/include/menu.h index e236ffcfa..ffa2a0b7f 100644 --- a/include/menu.h +++ b/include/menu.h @@ -99,5 +99,6 @@ void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile); void sub_8198314(void); void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram); +void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); #endif // GUARD_MENU_H -- cgit v1.2.3 From 8e0773675c63cdc1b51f6fcc3db3ca367bf4654b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Mar 2019 13:16:10 -0400 Subject: through sub_8017168 --- include/menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index ffa2a0b7f..a119b4a07 100644 --- a/include/menu.h +++ b/include/menu.h @@ -100,5 +100,6 @@ u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile); void sub_8198314(void); void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram); void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); +void sub_8198C78(void); #endif // GUARD_MENU_H -- cgit v1.2.3 From aebc676913addd23a141b527b8d0b26fb5004189 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Mar 2019 19:09:12 -0500 Subject: Decompile union_room_chat.c up to sub_801F5B8 --- include/link_rfu.h | 1 + include/strings.h | 14 ++++++++++++++ include/text.h | 2 ++ include/union_room_chat.h | 1 + 4 files changed, 18 insertions(+) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index e341dd4f3..f630302c7 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -287,5 +287,6 @@ void sub_8010198(void); bool32 sub_8011A9C(void); void sub_80104B0(void); void sub_8011A50(void); +void sub_80110B8(u32 a0); #endif //GUARD_LINK_RFU_H diff --git a/include/strings.h b/include/strings.h index 400e48036..4a65e6875 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2592,4 +2592,18 @@ extern const u8 gUnknown_085EE154[]; // Berry Powder Menu extern const u8 gText_Powder[]; +// Union Room Chat +extern const u8 gText_F700JoinedChat[]; +extern const u8 gText_F700LeftChat[]; +extern const u8 gText_Hello[]; +extern const u8 gText_Pokemon2[]; +extern const u8 gText_Trade[]; +extern const u8 gText_Battle[]; +extern const u8 gText_Lets[]; +extern const u8 gText_Ok[]; +extern const u8 gText_Sorry[]; +extern const u8 gText_YayUnkF9F9[]; +extern const u8 gText_ThankYou[]; +extern const u8 gText_ByeBye[]; + #endif // GUARD_STRINGS_H diff --git a/include/text.h b/include/text.h index d8f2fd8a3..e3944868c 100644 --- a/include/text.h +++ b/include/text.h @@ -99,6 +99,8 @@ // #define EXT_CTRL_CODE_CLEAR 0x11 // +#define EXT_CTRL_CODE_CLEAR_TO 0x13 +// #define EXT_CTRL_CODE_JPN 0x15 #define EXT_CTRL_CODE_ENG 0x16 diff --git a/include/union_room_chat.h b/include/union_room_chat.h index dae751576..17e482525 100755 --- a/include/union_room_chat.h +++ b/include/union_room_chat.h @@ -2,5 +2,6 @@ #define GUARD_UNION_ROOM_CHAT_H void sub_801DD98(void); +void copy_strings_to_sav1(void); #endif // GUARD_UNION_ROOM_CHAT_H -- cgit v1.2.3 From 7c45a7c443fc5fcc0cf254527049004e14724150 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Mar 2019 23:41:05 -0400 Subject: port mevent_801BAAC from fire red --- include/union_room.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/union_room.h (limited to 'include') diff --git a/include/union_room.h b/include/union_room.h new file mode 100644 index 000000000..7634e4763 --- /dev/null +++ b/include/union_room.h @@ -0,0 +1,9 @@ +#ifndef GUARD_UNION_ROOM_H +#define GUARD_UNION_ROOM_H + +extern bool8 gUnknown_02022C60; + +void sub_8018798(u8); +void sub_80186EC(bool8, bool32); + +#endif //GUARD_UNION_ROOM_H -- cgit v1.2.3 From 519426f4e6629a1f79fa4ce5f8ffff672d25533d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 28 Mar 2019 20:20:52 -0500 Subject: Decompile union_room_chat through sub_8020118 --- include/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index e3944868c..eba3d0c4e 100644 --- a/include/text.h +++ b/include/text.h @@ -100,7 +100,7 @@ #define EXT_CTRL_CODE_CLEAR 0x11 // #define EXT_CTRL_CODE_CLEAR_TO 0x13 -// +#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14 #define EXT_CTRL_CODE_JPN 0x15 #define EXT_CTRL_CODE_ENG 0x16 -- cgit v1.2.3 From 8fc51b045941324c210096ccdbd385f7bfb0f6a6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Mar 2019 15:50:04 -0400 Subject: through sub_8017CB0 --- include/rom_8011DC0.h | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) (limited to 'include') diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 8376d1bc6..4341185a3 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -1,12 +1,158 @@ #ifndef GUARD_rom_8011DC0_H #define GUARD_rom_8011DC0_H +#include "librfu.h" + // Exported type declarations +struct UnkStruct_Shared +{ + struct UnkLinkRfuStruct_02022B14 field_0; + u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1]; +}; + +struct UnkStruct_x1C +{ + struct UnkStruct_Shared unk0; + u8 unk18:1; +}; + +struct UnkStruct_x20 +{ + struct UnkStruct_Shared unk; + u16 field_18; + u8 field_1A_0:2; + u8 field_1A_1:1; + u8 field_1B; + u8 field_1D; + u8 field_1E; + u8 field_1F; +}; + +struct UnkStruct_Main0 +{ + struct UnkStruct_x20 arr[8]; +}; + +struct UnkStruct_Main4 +{ + struct UnkStruct_x1C arr[5]; +}; + +struct UnkStruct_Main8 +{ + struct UnkStruct_x20 arr[5]; +}; + +struct UnkStruct_Leader +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main8 *field_8; + u8 state; + u8 textState; + u8 field_E; + u8 listWindowId; + u8 field_10; + u8 field_11; + u8 listTaskId; + u8 field_13; + u8 field_14; + u8 field_15; + u8 field_16; + u8 field_17; + u8 field_18; + u8 field_19; + u16 field_1A; +}; + +struct UnkStruct_Group +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + u8 state; + u8 textState; + u8 field_A; + u8 listWindowId; + u8 field_C; + u8 field_D; + u8 listTaskId; + u8 field_F; + u8 field_10; + u8 field_11; + u8 field_12; + u8 field_13; + u8 field_14; + u8 field_15; +}; + +struct UnkStruct_8019BA8 +{ + u8 field_0; + u8 field_1; + u8 field_2; + u8 field_3; +}; + +struct UnkStruct_URoom +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main0 *field_8; + struct UnkStruct_Main4 *field_C; + u16 field_10; + u16 field_12; + u8 state; + u8 stateAfterPrint; + u8 textState; + u8 field_17; + u8 field_18; + u8 field_19; + u8 field_1A; + u8 field_1B; + u8 field_1C; + u8 field_1D; + u8 field_1E; + u8 field_1F; + u8 field_20; + u8 spriteIds[40]; + u8 field_49; + u8 field_4A; + u16 field_4C[6]; + u8 field_58[0x98 - 0x58]; + u16 field_98; + u16 field_9A[3]; + struct UnkStruct_8019BA8 field_A0[8]; +}; + +union UnkUnion_Main +{ + struct UnkStruct_Leader *leader; + struct UnkStruct_Group *group; + struct UnkStruct_URoom *uRoom; +}; + +struct TradeUnkStruct +{ + u16 field_0; + u16 field_2; + u32 field_4; + u8 field_8; + u8 field_9; + u16 field_A; + u16 field_C; + u16 species; + u16 level; + u16 field_12; + u32 personality; +}; + // Exported RAM declarations extern u8 gUnknown_02022C2C; +extern union UnkUnion_Main gUnknown_02022C30; extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; + extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C3E; -- cgit v1.2.3 From 2e588fd4d73a123ec41c92f2d7d3e70225c31c9d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Mar 2019 22:22:26 -0400 Subject: through sub_80181DC --- include/event_obj_lock.h | 1 + include/rom_8011DC0.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 2f09ad36a..037c0080d 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -8,5 +8,6 @@ void LockSelectedEventObject(void); void sub_8098630(void); bool8 sub_8098734(void); void ScriptUnfreezeEventObjects(void); +void sub_8098524(void); #endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 4341185a3..f994f846e 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -135,12 +135,12 @@ union UnkUnion_Main struct TradeUnkStruct { u16 field_0; - u16 field_2; - u32 field_4; + u16 type; + u32 playerPersonality; u8 field_8; u8 field_9; - u16 field_A; - u16 field_C; + u16 playerSpecies; + u16 playerLevel; u16 species; u16 level; u16 field_12; -- cgit v1.2.3 From a978a6a62400b2bfba7107b66077d21822759cff Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 29 Mar 2019 21:22:51 -0500 Subject: Finish decompiling union_room_chat.c --- include/graphics.h | 9 +++++++++ include/menu.h | 1 + 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 03840b6ff..b49b2a661 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4908,4 +4908,13 @@ extern const u16 gEasyChatRightWindow_Pal[]; // Use Pokeblock extern const u32 gUsePokeblockCondition_Gfx[]; +// Union Room Chat +extern const u16 gUnknown_08DD4BB0[]; +extern const u16 gUnknown_08DD4BD0[]; +extern const u32 gUnknown_08DD4BF0[]; +extern const u32 gUnknown_08DD4C4C[]; +extern const u16 gLinkMiscMenu_Pal[]; +extern const u32 gLinkMiscMenu_Gfx[]; +extern const u32 gLinkMiscMenu_Tilemap[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/menu.h b/include/menu.h index e236ffcfa..ff5730bad 100644 --- a/include/menu.h +++ b/include/menu.h @@ -99,5 +99,6 @@ void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile); void sub_8198314(void); void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram); +void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs); #endif // GUARD_MENU_H -- cgit v1.2.3 From 2f57d6bc0f822fb5f6b6dd681de7cab252626144 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Mar 2019 09:18:58 -0400 Subject: sub_8018220 --- include/battle.h | 1 + include/rom_8011DC0.h | 3 +++ 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index d155ca5a0..38bce0e61 100644 --- a/include/battle.h +++ b/include/battle.h @@ -776,5 +776,6 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; +extern const u8 gTrainerClassNames[][13]; #endif // GUARD_BATTLE_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index f994f846e..fa54fca66 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -123,6 +123,9 @@ struct UnkStruct_URoom u16 field_98; u16 field_9A[3]; struct UnkStruct_8019BA8 field_A0[8]; + u8 field_C0[12][15]; + u8 field_174[48]; + u8 field_1A4[200]; }; union UnkUnion_Main -- cgit v1.2.3 From 35cffea9874a8b135eddade958b62ee2ecf441c1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Mar 2019 12:37:18 +0100 Subject: Helpful macros for atk49 --- include/constants/battle_script_commands.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index e8a2980a5..894bd13b6 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -95,8 +95,6 @@ // statchange defines #define STAT_CHANGE_BS_PTR 0x1 #define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20 -#define STAT_CHANGE_WORKED 0 -#define STAT_CHANGE_DIDNT_WORK 1 // atk48 #define ATK48_STAT_NEGATIVE 0x1 @@ -104,6 +102,26 @@ #define ATK48_ONLY_MULTIPLE 0x4 #define ATK48_DONT_CHECK_LOWER 0x8 +// atk49, moveend cases +#define ATK49_RAGE 0 +#define ATK49_DEFROST 1 +#define ATK49_SYNCHRONIZE_TARGET 2 +#define ATK49_MOVE_END_ABILITIES 3 +#define ATK49_STATUS_IMMUNITY_ABILITIES 4 +#define ATK49_SYNCHRONIZE_ATTACKER 5 +#define ATK49_CHOICE_MOVE 6 +#define ATK49_CHANGED_ITEMS 7 +#define ATK49_ATTACKER_INVISIBLE 8 +#define ATK49_ATTACKER_VISIBLE 9 +#define ATK49_TARGET_VISIBLE 10 +#define ATK49_ITEM_EFFECTS_ALL 11 +#define ATK49_KINGSROCK_SHELLBELL 12 +#define ATK49_SUBSTITUTE 13 +#define ATK49_UPDATE_LAST_MOVES 14 +#define ATK49_MIRROR_MOVE 15 +#define ATK49_NEXT_TARGET 16 +#define ATK49_COUNT 17 + #define BIT_HP 0x1 #define BIT_ATK 0x2 #define BIT_DEF 0x4 -- cgit v1.2.3 From aa7f69f067a83a651c84c1feb9a874858c3adf82 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 31 Mar 2019 12:59:01 +0200 Subject: Begin use pokeblock and menu specialised --- include/graphics.h | 4 ++++ include/menu_specialized.h | 20 +++++++++++++++++--- include/pokenav.h | 2 -- include/strings.h | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index b49b2a661..7833d4f7d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4917,4 +4917,8 @@ extern const u16 gLinkMiscMenu_Pal[]; extern const u32 gLinkMiscMenu_Gfx[]; extern const u32 gLinkMiscMenu_Tilemap[]; +// Pokeblock +extern const u8 gPokenavConditionCancel_Gfx[]; +extern const u16 gPokenavConditionCancel_Pal[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/menu_specialized.h b/include/menu_specialized.h index a629ab014..90623a888 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -26,6 +26,12 @@ struct UnknownStruct_81D1ED4 /*0x355*/ u8 unk355; }; +struct Unk81D2F78_Struct +{ + u8 contestStats[4][5]; + struct UnknownSubStruct_81D1ED4 field_20[4][5]; +}; + bool8 sub_81D1C44(u8 count); u8 sub_81D1C84(u8 a0); u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); @@ -43,10 +49,7 @@ bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D354C(struct Sprite **); void sub_81D3464(struct Sprite **arg0); void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2); -u8 sub_81D3178(struct UnknownStruct_81D1ED4*, u16*); -u8 sub_81D31A4(struct UnknownStruct_81D1ED4*, u16*); bool32 sub_81D2074(struct UnknownStruct_81D1ED4 *a0); -u8 sub_81D3150(u16 *arg0); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); @@ -55,5 +58,16 @@ void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); +s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst); +void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); +void sub_81D2F78(struct Unk81D2F78_Struct *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); +void sub_81D3094(u8 *tilesDst, u8 *palDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); +bool8 sub_81D312C(s16 *var); +bool8 sub_81D3150(s16 *var); +bool8 sub_81D3178(struct UnknownStruct_81D1ED4 *arg0, s16 *arg1); +bool8 sub_81D31A4(struct UnknownStruct_81D1ED4 *arg0, s16 *arg1); +void sub_81D31D0(struct SpriteSheet *sheet, struct SpriteTemplate *template, struct SpritePalette *pal); +void sub_81D321C(struct SpriteSheet *sheets, struct SpriteTemplate * template, struct SpritePalette *pals); +void sub_81D32B0(struct SpriteSheet *sheet, struct SpritePalette *pal); #endif // GUARD_MENU_SPECIALIZED_H diff --git a/include/pokenav.h b/include/pokenav.h index 13cb0babf..4e1648c93 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,8 +1,6 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H -#include "list_menu.h" -bool8 sub_81D312C(void *arg0); void CB2_InitPokeNav(void); #endif //GUARD_POKENAV_H diff --git a/include/strings.h b/include/strings.h index 4a65e6875..c762ebd45 100644 --- a/include/strings.h +++ b/include/strings.h @@ -194,6 +194,7 @@ extern const u8 gText_SeeYaDescription[]; extern const u8 gText_EggNickname[]; extern const u8 gText_Pokemon[]; +extern const u8 gText_InParty[]; extern const u8 gText_InGameClockUsable[]; // reset rtc screen texts -- cgit v1.2.3 From e3c07c83f2bb8ce91d96f4bb39110fae18eccdc1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 31 Mar 2019 14:32:26 +0200 Subject: More work on use pokeblock --- include/menu_specialized.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 90623a888..d29ac5751 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -26,12 +26,6 @@ struct UnknownStruct_81D1ED4 /*0x355*/ u8 unk355; }; -struct Unk81D2F78_Struct -{ - u8 contestStats[4][5]; - struct UnknownSubStruct_81D1ED4 field_20[4][5]; -}; - bool8 sub_81D1C44(u8 count); u8 sub_81D1C84(u8 a0); u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); @@ -44,11 +38,7 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D3520(struct Sprite **); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); -void sub_81D354C(struct Sprite **); -void sub_81D3464(struct Sprite **arg0); -void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2); bool32 sub_81D2074(struct UnknownStruct_81D1ED4 *a0); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); @@ -60,8 +50,8 @@ void InitMoveRelearnerWindows(bool8 useContextWindow); void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst); void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); -void sub_81D2F78(struct Unk81D2F78_Struct *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); -void sub_81D3094(u8 *tilesDst, u8 *palDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); +void sub_81D2F78(struct UnknownStruct_81D1ED4 *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); +void sub_81D3094(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); bool8 sub_81D312C(s16 *var); bool8 sub_81D3150(s16 *var); bool8 sub_81D3178(struct UnknownStruct_81D1ED4 *arg0, s16 *arg1); @@ -69,5 +59,9 @@ bool8 sub_81D31A4(struct UnknownStruct_81D1ED4 *arg0, s16 *arg1); void sub_81D31D0(struct SpriteSheet *sheet, struct SpriteTemplate *template, struct SpritePalette *pal); void sub_81D321C(struct SpriteSheet *sheets, struct SpriteTemplate * template, struct SpritePalette *pals); void sub_81D32B0(struct SpriteSheet *sheet, struct SpritePalette *pal); +void sub_81D3464(struct Sprite **sprites); +void sub_81D3480(struct Sprite **sprites, u8 arg1, u8 arg2); +void sub_81D3520(struct Sprite **sprites); +void sub_81D354C(struct Sprite **sprites); #endif // GUARD_MENU_SPECIALIZED_H -- cgit v1.2.3 From 500d009b5c52345afce3dfd103113cfa77e7b262 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Mar 2019 09:05:32 -0500 Subject: Start decompiling berry_crush.c --- include/berry_crush.h | 6 ++++++ include/graphics.h | 6 +++++- include/item_icon.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 include/berry_crush.h (limited to 'include') diff --git a/include/berry_crush.h b/include/berry_crush.h new file mode 100755 index 000000000..101450a33 --- /dev/null +++ b/include/berry_crush.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BERRY_CRUSH_H +#define GUARD_BERRY_CRUSH_H + +void sub_8020C70(MainCallback callback); + +#endif // GUARD_BERRY_CRUSH_H diff --git a/include/graphics.h b/include/graphics.h index 7833d4f7d..e6d6ae350 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4917,8 +4917,12 @@ extern const u16 gLinkMiscMenu_Pal[]; extern const u32 gLinkMiscMenu_Gfx[]; extern const u32 gLinkMiscMenu_Tilemap[]; -// Pokeblock +// Use Pokeblock extern const u8 gPokenavConditionCancel_Gfx[]; extern const u16 gPokenavConditionCancel_Pal[]; +// Berry Crush +extern const u32 gUnknown_08DE34B8[]; +extern const u16 gUnknown_08DE3398[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/item_icon.h b/include/item_icon.h index b702b2045..af03473fb 100644 --- a/include/item_icon.h +++ b/include/item_icon.h @@ -10,7 +10,7 @@ bool8 AllocItemIconTemporaryBuffers(void); void FreeItemIconTemporaryBuffers(void); void CopyItemIconPicTo4x4Buffer(const void *src, void *dest); u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId); -u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId); +u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId); const void *GetItemIconPicOrPalette(u16 itemId, u8 which); #endif //GUARD_ITEM_ICON_H -- cgit v1.2.3 From 462b196abc126cd8c2a06434f9b3b9c25a0d4327 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Mar 2019 12:15:39 -0500 Subject: Give battle_anim files appropriate names --- include/battle.h | 4 +--- include/battle_anim.h | 13 +++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 38bce0e61..13c1851cf 100644 --- a/include/battle.h +++ b/include/battle.h @@ -564,9 +564,7 @@ struct BattleScripting }; // rom_80A5C6C -u8 GetBattlerSide(u8 battler); -u8 GetBattlerPosition(u8 battler); -u8 GetBattlerAtPosition(u8 position); + struct BattleSpriteInfo { diff --git a/include/battle_anim.h b/include/battle_anim.h index b3350f893..949bc236b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -73,7 +73,7 @@ void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar void HandleIntroSlide(u8 terrainId); int GetAnimBgAttribute(u8 bgId, u8 attributeId); -// battle_anim_80A5C6C.s +// battle_anim_mons.s void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite); @@ -155,6 +155,9 @@ void sub_80A6DEC(struct Sprite *sprite); void DestroyAnimVisualTaskAndDisableBlend(u8 taskId); void DestroySpriteAndFreeResources_(struct Sprite *sprite); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); +u8 GetBattlerSide(u8 battler); +u8 GetBattlerPosition(u8 battler); +u8 GetBattlerAtPosition(u8 position); enum { @@ -193,7 +196,7 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId); void sub_80A64EC(struct Sprite *sprite); void sub_80A718C(struct Sprite *sprite); -// battle_anim_80A9C70.s +// battle_anim_status_effects.s #define STAT_ANIM_PLUS1 15 #define STAT_ANIM_PLUS2 39 #define STAT_ANIM_MINUS1 22 @@ -204,13 +207,11 @@ void sub_80A718C(struct Sprite *sprite); #define STAT_ANIM_MULTIPLE_MINUS2 58 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); -// battle_anim_8170478.c -void sub_8172EF0(u8 battler, struct Pokemon *mon); - // ground.c void sub_81152DC(u8 taskId); -// battle_anim_8170478.s +// battle_anim_special.c +void sub_8172EF0(u8 battler, struct Pokemon *mon); u8 ItemIdToBallId(u16 itemId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId); -- cgit v1.2.3 From d13563b174119121964c2da62380bce44743b93f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Mar 2019 14:09:40 -0500 Subject: Document some faraway_island code --- include/faraway_island.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/faraway_island.h b/include/faraway_island.h index 89b4bcd08..4946bda8a 100755 --- a/include/faraway_island.h +++ b/include/faraway_island.h @@ -1,7 +1,7 @@ #ifndef GUARD_FARAWAY_ISLAND_H #define GUARD_FARAWAY_ISLAND_H -u32 sub_81D427C(void); +u32 GetMewMoveDirection(void); bool8 sub_81D4A58(struct EventObject*); void UpdateFarawayIslandStepCounter(void); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); -- cgit v1.2.3 From f34cda3b5209735fbf276b0f23e29549b1a1a3d9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Mar 2019 13:14:00 -0400 Subject: Start decompiling mystery gift --- include/mystery_gift.h | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 include/mystery_gift.h (limited to 'include') diff --git a/include/mystery_gift.h b/include/mystery_gift.h new file mode 100644 index 000000000..b83239bc7 --- /dev/null +++ b/include/mystery_gift.h @@ -0,0 +1,4 @@ +#ifndef GUARD_MYSTERY_GIFT_H +#define GUARD_MYSTERY_GIFT_H + +#endif //GUARD_MYSTERY_GIFT_H -- cgit v1.2.3 From aafe9df454f42c77146d76676cc477e876d6540b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Mar 2019 14:36:52 -0400 Subject: through sub_8018798 --- include/mevent2.h | 6 ++ include/mystery_gift.h | 4 ++ include/rom_8011DC0.h | 171 ------------------------------------------------ include/strings.h | 20 ++++++ include/union_room.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 199 insertions(+), 174 deletions(-) create mode 100644 include/mevent2.h (limited to 'include') diff --git a/include/mevent2.h b/include/mevent2.h new file mode 100644 index 000000000..80b1fd51b --- /dev/null +++ b/include/mevent2.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MEVENT2_H +#define GUARD_MEVENT2_H + +void sub_801B990(u32, u32); + +#endif //GUARD_MEVENT2_H diff --git a/include/mystery_gift.h b/include/mystery_gift.h index b83239bc7..b43fbe9a9 100644 --- a/include/mystery_gift.h +++ b/include/mystery_gift.h @@ -1,4 +1,8 @@ #ifndef GUARD_MYSTERY_GIFT_H #define GUARD_MYSTERY_GIFT_H +void sub_8018438(void); +void sub_80186EC(bool8 isJapanese, bool32 usePickOkCancel); +void sub_8018798(u32 bg); + #endif //GUARD_MYSTERY_GIFT_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index fa54fca66..ee7397320 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -1,175 +1,4 @@ #ifndef GUARD_rom_8011DC0_H #define GUARD_rom_8011DC0_H -#include "librfu.h" - -// Exported type declarations - -struct UnkStruct_Shared -{ - struct UnkLinkRfuStruct_02022B14 field_0; - u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1]; -}; - -struct UnkStruct_x1C -{ - struct UnkStruct_Shared unk0; - u8 unk18:1; -}; - -struct UnkStruct_x20 -{ - struct UnkStruct_Shared unk; - u16 field_18; - u8 field_1A_0:2; - u8 field_1A_1:1; - u8 field_1B; - u8 field_1D; - u8 field_1E; - u8 field_1F; -}; - -struct UnkStruct_Main0 -{ - struct UnkStruct_x20 arr[8]; -}; - -struct UnkStruct_Main4 -{ - struct UnkStruct_x1C arr[5]; -}; - -struct UnkStruct_Main8 -{ - struct UnkStruct_x20 arr[5]; -}; - -struct UnkStruct_Leader -{ - struct UnkStruct_Main0 *field_0; - struct UnkStruct_Main4 *field_4; - struct UnkStruct_Main8 *field_8; - u8 state; - u8 textState; - u8 field_E; - u8 listWindowId; - u8 field_10; - u8 field_11; - u8 listTaskId; - u8 field_13; - u8 field_14; - u8 field_15; - u8 field_16; - u8 field_17; - u8 field_18; - u8 field_19; - u16 field_1A; -}; - -struct UnkStruct_Group -{ - struct UnkStruct_Main0 *field_0; - struct UnkStruct_Main4 *field_4; - u8 state; - u8 textState; - u8 field_A; - u8 listWindowId; - u8 field_C; - u8 field_D; - u8 listTaskId; - u8 field_F; - u8 field_10; - u8 field_11; - u8 field_12; - u8 field_13; - u8 field_14; - u8 field_15; -}; - -struct UnkStruct_8019BA8 -{ - u8 field_0; - u8 field_1; - u8 field_2; - u8 field_3; -}; - -struct UnkStruct_URoom -{ - struct UnkStruct_Main0 *field_0; - struct UnkStruct_Main4 *field_4; - struct UnkStruct_Main0 *field_8; - struct UnkStruct_Main4 *field_C; - u16 field_10; - u16 field_12; - u8 state; - u8 stateAfterPrint; - u8 textState; - u8 field_17; - u8 field_18; - u8 field_19; - u8 field_1A; - u8 field_1B; - u8 field_1C; - u8 field_1D; - u8 field_1E; - u8 field_1F; - u8 field_20; - u8 spriteIds[40]; - u8 field_49; - u8 field_4A; - u16 field_4C[6]; - u8 field_58[0x98 - 0x58]; - u16 field_98; - u16 field_9A[3]; - struct UnkStruct_8019BA8 field_A0[8]; - u8 field_C0[12][15]; - u8 field_174[48]; - u8 field_1A4[200]; -}; - -union UnkUnion_Main -{ - struct UnkStruct_Leader *leader; - struct UnkStruct_Group *group; - struct UnkStruct_URoom *uRoom; -}; - -struct TradeUnkStruct -{ - u16 field_0; - u16 type; - u32 playerPersonality; - u8 field_8; - u8 field_9; - u16 playerSpecies; - u16 playerLevel; - u16 species; - u16 level; - u16 field_12; - u32 personality; -}; - -// Exported RAM declarations - -extern u8 gUnknown_02022C2C; -extern union UnkUnion_Main gUnknown_02022C30; -extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; - -extern u16 gUnknown_02022C3C; -extern u8 gUnknown_02022C3E; - -// Exported ROM declarations - -void sub_8018438(void); -void sub_801B990(u32, u32); -u8 sub_8013F78(void); -bool32 sub_802C908(u16); -void nullsub_89(u8 taskId); -void var_800D_set_xB(void); - -bool32 mevent_0814257C(u8 *textState, const u8 *str); -void sub_8018884(const u8 *src); -void sub_80186A4(void); - #endif //GUARD_rom_8011DC0_H diff --git a/include/strings.h b/include/strings.h index c762ebd45..2f9a64af1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2607,4 +2607,24 @@ extern const u8 gText_YayUnkF9F9[]; extern const u8 gText_ThankYou[]; extern const u8 gText_ByeBye[]; +// Mystery Gift +extern const u8 gText_MysteryGift[]; +extern const u8 gText_PickOKCancel[]; +extern const u8 gText_PickOKExit[]; +extern const u8 gJPText_MysteryGift[]; +extern const u8 gJPText_DecideStop[]; +extern const u8 gText_WonderCards[]; +extern const u8 gText_WonderNews[]; +extern const u8 gText_Exit3[]; +extern const u8 gText_WirelessCommunication[]; +extern const u8 gText_Friend2[]; +extern const u8 gText_Cancel2[]; +extern const u8 gText_Receive[]; +extern const u8 gText_Send[]; +extern const u8 gText_Toss[]; +extern const u8 gText_VarietyOfEventsImportedWireless[]; +extern const u8 gText_WonderCardsInPossession[]; +extern const u8 gText_ReadNewsThatArrived[]; +extern const u8 gText_ReturnToTitle[]; + #endif // GUARD_STRINGS_H diff --git a/include/union_room.h b/include/union_room.h index 7634e4763..84a7f1f2b 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -1,9 +1,175 @@ #ifndef GUARD_UNION_ROOM_H #define GUARD_UNION_ROOM_H -extern bool8 gUnknown_02022C60; +#include "librfu.h" + +// Exported type declarations + +struct UnkStruct_Shared +{ + struct UnkLinkRfuStruct_02022B14 field_0; + u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1]; +}; + +struct UnkStruct_x1C +{ + struct UnkStruct_Shared unk0; + u8 unk18:1; +}; + +struct UnkStruct_x20 +{ + struct UnkStruct_Shared unk; + u16 field_18; + u8 field_1A_0:2; + u8 field_1A_1:1; + u8 field_1B; + u8 field_1D; + u8 field_1E; + u8 field_1F; +}; + +struct UnkStruct_Main0 +{ + struct UnkStruct_x20 arr[8]; +}; + +struct UnkStruct_Main4 +{ + struct UnkStruct_x1C arr[5]; +}; + +struct UnkStruct_Main8 +{ + struct UnkStruct_x20 arr[5]; +}; + +struct UnkStruct_Leader +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main8 *field_8; + u8 state; + u8 textState; + u8 field_E; + u8 listWindowId; + u8 field_10; + u8 field_11; + u8 listTaskId; + u8 field_13; + u8 field_14; + u8 field_15; + u8 field_16; + u8 field_17; + u8 field_18; + u8 field_19; + u16 field_1A; +}; + +struct UnkStruct_Group +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + u8 state; + u8 textState; + u8 field_A; + u8 listWindowId; + u8 field_C; + u8 field_D; + u8 listTaskId; + u8 field_F; + u8 field_10; + u8 field_11; + u8 field_12; + u8 field_13; + u8 field_14; + u8 field_15; +}; + +struct UnkStruct_8019BA8 +{ + u8 field_0; + u8 field_1; + u8 field_2; + u8 field_3; +}; -void sub_8018798(u8); -void sub_80186EC(bool8, bool32); +struct UnkStruct_URoom +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main0 *field_8; + struct UnkStruct_Main4 *field_C; + u16 field_10; + u16 field_12; + u8 state; + u8 stateAfterPrint; + u8 textState; + u8 field_17; + u8 field_18; + u8 field_19; + u8 field_1A; + u8 field_1B; + u8 field_1C; + u8 field_1D; + u8 field_1E; + u8 field_1F; + u8 field_20; + u8 spriteIds[40]; + u8 field_49; + u8 field_4A; + u16 field_4C[6]; + u8 field_58[0x98 - 0x58]; + u16 field_98; + u16 field_9A[3]; + struct UnkStruct_8019BA8 field_A0[8]; + u8 field_C0[12][15]; + u8 field_174[48]; + u8 field_1A4[200]; +}; + +union UnkUnion_Main +{ + struct UnkStruct_Leader *leader; + struct UnkStruct_Group *group; + struct UnkStruct_URoom *uRoom; +}; + +struct TradeUnkStruct +{ + u16 field_0; + u16 type; + u32 playerPersonality; + u8 field_8; + u8 field_9; + u16 playerSpecies; + u16 playerLevel; + u16 species; + u16 level; + u16 field_12; + u32 personality; +}; + +// Exported RAM declarations + +extern u8 gUnknown_02022C2C; +extern union UnkUnion_Main gUnknown_02022C30; +extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; + +extern u16 gUnknown_02022C3C; +extern u8 gUnknown_02022C3E; + +// Exported ROM declarations + +u8 sub_8013F78(void); +bool32 sub_802C908(u16); +void nullsub_89(u8 taskId); +void var_800D_set_xB(void); + +bool32 mevent_0814257C(u8 *textState, const u8 *str); +void sub_8018884(const u8 *src); +void sub_80186A4(void); + +extern bool8 gUnknown_02022C60; #endif //GUARD_UNION_ROOM_H -- cgit v1.2.3 From f88f815cff272f4cd19759f2df24f85bc5f02ae1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 11:16:19 -0400 Subject: WIP sub_8018DAC --- include/list_menu.h | 2 +- include/mevent_801BAAC.h | 9 +++++++++ include/strings.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 include/mevent_801BAAC.h (limited to 'include') diff --git a/include/list_menu.h b/include/list_menu.h index a301e5b32..0a54a069a 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -98,7 +98,7 @@ struct CursorStruct extern struct ScrollArrowsTemplate gTempScrollArrowTemplate; extern struct ListMenuTemplate gMultiuseListMenuTemplate; -s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); +s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow); s32 ListMenu_ProcessInput(u8 listTaskId); diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h new file mode 100644 index 000000000..db1bb0571 --- /dev/null +++ b/include/mevent_801BAAC.h @@ -0,0 +1,9 @@ +#ifndef GUARD_MEVENT_801BAAC_H +#define GUARD_MEVENT_801BAAC_H + +bool32 sub_801BAAC(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6); +bool32 sub_801C6C8(const struct MEventBuffer_3120_Sub * a0); +s32 sub_801BB74(void); +s32 sub_801C758(void); + +#endif //GUARD_MEVENT_801BAAC_H diff --git a/include/strings.h b/include/strings.h index 2f9a64af1..2ef8411c7 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2626,5 +2626,7 @@ extern const u8 gText_VarietyOfEventsImportedWireless[]; extern const u8 gText_WonderCardsInPossession[]; extern const u8 gText_ReadNewsThatArrived[]; extern const u8 gText_ReturnToTitle[]; +extern const u8 gText_WhatToDoWithCards[]; +extern const u8 gText_WhatToDoWithNews[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 813de11154ac9ac6d561ef820d2a13995ce5bb35 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 12:27:36 -0400 Subject: Through mevent_save_game --- include/mevent_801BAAC.h | 4 ++++ include/strings.h | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h index db1bb0571..d747b389c 100644 --- a/include/mevent_801BAAC.h +++ b/include/mevent_801BAAC.h @@ -5,5 +5,9 @@ bool32 sub_801BAAC(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_S bool32 sub_801C6C8(const struct MEventBuffer_3120_Sub * a0); s32 sub_801BB74(void); s32 sub_801C758(void); +s32 sub_801BDA4(bool32 flag); +void sub_801BB48(void); +s32 sub_801CA50(bool32 flag); +void sub_801C72C(void); #endif //GUARD_MEVENT_801BAAC_H diff --git a/include/strings.h b/include/strings.h index 2ef8411c7..36c4e36d9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2628,5 +2628,11 @@ extern const u8 gText_ReadNewsThatArrived[]; extern const u8 gText_ReturnToTitle[]; extern const u8 gText_WhatToDoWithCards[]; extern const u8 gText_WhatToDoWithNews[]; +extern const u8 gText_IfThrowAwayCardEventWontHappen[]; +extern const u8 gText_OkayToDiscardNews[]; +extern const u8 gText_WonderNewsThrownAway[]; +extern const u8 gText_WonderCardThrownAway[]; +extern const u8 gText_DataWillBeSaved[]; +extern const u8 gText_SaveCompletedPressA[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From fb5c19a33bf314f4976ae56ce13f4dc9d9ed0fe0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 12:36:48 -0400 Subject: through mevent_message --- include/strings.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 36c4e36d9..4a07d4efb 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2634,5 +2634,21 @@ extern const u8 gText_WonderNewsThrownAway[]; extern const u8 gText_WonderCardThrownAway[]; extern const u8 gText_DataWillBeSaved[]; extern const u8 gText_SaveCompletedPressA[]; +extern const u8 gText_NothingSentOver[]; +extern const u8 gText_RecordUploadedViaWireless[]; +extern const u8 gText_WonderCardReceivedFrom[]; +extern const u8 gText_WonderCardReceived[]; +extern const u8 gText_WonderNewsReceivedFrom[]; +extern const u8 gText_WonderNewsReceived[]; +extern const u8 gText_NewStampReceived[]; +extern const u8 gText_AlreadyHadCard[]; +extern const u8 gText_AlreadyHadStamp[]; +extern const u8 gText_AlreadyHadNews[]; +extern const u8 gText_NoMoreRoomForStamps[]; +extern const u8 gText_CommunicationCanceled[]; +extern const u8 gText_CantAcceptNewsFromTrainer[]; +extern const u8 gText_CantAcceptCardFromTrainer[]; +extern const u8 gText_CommunicationError[]; +extern const u8 gText_NewTrainerReceived[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 90fb329b70433e75cfd571d8b33df2593d2b7656 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 12:55:27 -0400 Subject: through task_add_00_mystery_gift --- include/strings.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 4a07d4efb..0e6b2f31c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2650,5 +2650,16 @@ extern const u8 gText_CantAcceptNewsFromTrainer[]; extern const u8 gText_CantAcceptCardFromTrainer[]; extern const u8 gText_CommunicationError[]; extern const u8 gText_NewTrainerReceived[]; +extern const u8 gText_RecordUploadedViaWireless[]; +extern const u8 gText_WonderCardSentTo[]; +extern const u8 gText_WonderNewsSentTo[]; +extern const u8 gText_StampSentTo[]; +extern const u8 gText_OtherTrainerHasCard[]; +extern const u8 gText_OtherTrainerHasStamp[]; +extern const u8 gText_OtherTrainerHasNews[]; +extern const u8 gText_NoMoreRoomForStamps[]; +extern const u8 gText_OtherTrainerCanceled[]; +extern const u8 gText_GiftSentTo[]; +extern const u8 gText_CantSendGiftToTrainer[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 0a8427c8effeefc58c542f249d7384648585ff4a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 15:50:25 -0400 Subject: fakematching task00_mystery_gift --- include/mevent_801BAAC.h | 3 +++ include/mevent_news.h | 1 + include/mevent_server.h | 8 ++++++++ include/mevent_server_ish.h | 10 ++++++++++ include/strings.h | 11 +++++++++++ include/union_room.h | 3 +++ 6 files changed, 36 insertions(+) create mode 100644 include/mevent_server.h create mode 100644 include/mevent_server_ish.h (limited to 'include') diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h index d747b389c..2259d3b6d 100644 --- a/include/mevent_801BAAC.h +++ b/include/mevent_801BAAC.h @@ -9,5 +9,8 @@ s32 sub_801BDA4(bool32 flag); void sub_801BB48(void); s32 sub_801CA50(bool32 flag); void sub_801C72C(void); +u32 sub_801CCD0(u16 input); +void sub_801CC80(void); +void sub_801CC38(void); #endif //GUARD_MEVENT_801BAAC_H diff --git a/include/mevent_news.h b/include/mevent_news.h index 698d7148c..4632edd38 100755 --- a/include/mevent_news.h +++ b/include/mevent_news.h @@ -2,5 +2,6 @@ #define GUARD_MEVENT_NEWS_H void sub_801DBC0(void); +void sub_801DB68(u32 a0); #endif //GUARD_MEVENT_NEWS_H diff --git a/include/mevent_server.h b/include/mevent_server.h new file mode 100644 index 000000000..ca3b7091b --- /dev/null +++ b/include/mevent_server.h @@ -0,0 +1,8 @@ +#ifndef GUARD_MEVENT_SERVER_H +#define GUARD_MEVENT_SERVER_H + +void mevent_srv_new_wcard(); +void mevent_srv_init_wnews(); +u32 sub_801D0C4(u16 * a0); + +#endif //GUARD_MEVENT_SERVER_H diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h new file mode 100644 index 000000000..76f5080dc --- /dev/null +++ b/include/mevent_server_ish.h @@ -0,0 +1,10 @@ +#ifndef GUARD_MEVENT_SERVER_ISH_H +#define GUARD_MEVENT_SERVER_ISH_H + +void sub_801D484(u32 arg); +u32 sub_801D4A8(u16 * a0); +void sub_801D4E4(void); +void * sub_801D4F4(void); +void sub_801D500(u32 a0); + +#endif //GUARD_MEVENT_SERVER_ISH_H diff --git a/include/strings.h b/include/strings.h index 0e6b2f31c..1561da26d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2661,5 +2661,16 @@ extern const u8 gText_NoMoreRoomForStamps[]; extern const u8 gText_OtherTrainerCanceled[]; extern const u8 gText_GiftSentTo[]; extern const u8 gText_CantSendGiftToTrainer[]; +extern const u8 gText_DontHaveCardNewOneInput[]; +extern const u8 gText_DontHaveNewsNewOneInput[]; +extern const u8 gText_WhereShouldCardBeAccessed[]; +extern const u8 gText_WhereShouldNewsBeAccessed[]; +extern const u8 gText_Communicating[]; +extern const u8 gText_ThrowAwayWonderCard[]; +extern const u8 gText_HaventReceivedCardsGift[]; +extern const u8 gText_CommunicationCompleted[]; +extern const u8 gText_HaventReceivedGiftOkayToDiscard[]; +extern const u8 gText_SendingWonderCard[]; +extern const u8 gText_SendingWonderNews[]; #endif // GUARD_STRINGS_H diff --git a/include/union_room.h b/include/union_room.h index 84a7f1f2b..3d60e1432 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -169,6 +169,9 @@ void var_800D_set_xB(void); bool32 mevent_0814257C(u8 *textState, const u8 *str); void sub_8018884(const u8 *src); void sub_80186A4(void); +void sub_8014EFC(u32 arg0); +void sub_80152A8(u32 arg0); +void sub_8014A00(u32 arg0); extern bool8 gUnknown_02022C60; -- cgit v1.2.3 From ade01833781ee8a8057f2b2945095bababb2e639 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Mar 2019 18:59:52 -0400 Subject: Document mystery_gift --- include/ereader_screen.h | 2 +- include/international_string_util.h | 2 +- include/link.h | 2 -- include/link_rfu.h | 2 +- include/menu.h | 2 +- include/mevent.h | 18 +++++++++--------- include/mevent_801BAAC.h | 22 +++++++++++----------- include/mevent_news.h | 2 +- include/mevent_server.h | 2 +- include/mevent_server_ish.h | 10 +++++----- include/mystery_gift.h | 14 +++++++++++--- include/text_window.h | 4 ++-- include/union_room.h | 12 +++--------- 13 files changed, 47 insertions(+), 47 deletions(-) (limited to 'include') diff --git a/include/ereader_screen.h b/include/ereader_screen.h index 0e3e51c76..1daea4be0 100755 --- a/include/ereader_screen.h +++ b/include/ereader_screen.h @@ -1,6 +1,6 @@ #ifndef GUARD_EREADER_SCREEN_H #define GUARD_EREADER_SCREEN_H -void sub_81D5014(void); +void task_add_00_ereader(void); #endif // GUARD_EREADER_SCREEN_H diff --git a/include/international_string_util.h b/include/international_string_util.h index 2d5b1c871..911cd6935 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -12,7 +12,7 @@ int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing); int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1); int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2); -int sub_81DB41C(const struct ListMenuTemplate *listMenu); +int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu); void CopyMonCategoryText(int dexNum, u8 *dest); u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth); void PadNameString(u8 *dest, u8 padChar); diff --git a/include/link.h b/include/link.h index 719b0f067..62ae7761c 100644 --- a/include/link.h +++ b/include/link.h @@ -200,8 +200,6 @@ extern bool8 gLinkVSyncDisabled; extern u32 gLinkStatus; -void c2_mystery_gift(void); -void sub_801867C(void); bool8 IsWirelessAdapterConnected(void); void Task_DestroySelf(u8 taskId); void OpenLink(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index d8f374ff9..b8ba1a927 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -260,7 +260,7 @@ u32 sub_8010714(u16 a0, const u8 *a1); void sub_8011DC0(const u8 *a0, u16 a1); bool8 sub_800EF1C(void); bool32 sub_800EF58(bool32 a0); -void sub_800E084(void); +void DestroyWirelessStatusIndicatorSprite(void); void sub_801103C(void); void sub_8011C5C(void); void sub_80106D4(void); diff --git a/include/menu.h b/include/menu.h index b4c3cb2b5..4f3c4a3cc 100644 --- a/include/menu.h +++ b/include/menu.h @@ -35,7 +35,7 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void DisplayYesNoMenuDefaultYes(void); u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); -void sub_81978B0(u16 arg0); +void Menu_LoadStdPalAt(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); void sub_8199DF0(u32 bg, u8 a1, int a2, int a3); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); diff --git a/include/mevent.h b/include/mevent.h index 7f12f3501..9c5d559bf 100755 --- a/include/mevent.h +++ b/include/mevent.h @@ -32,23 +32,23 @@ struct MEventStruct_Unk1442CC }; void sub_801AFD8(void); -struct MEventBuffer_3120_Sub *sub_801B00C(void); +struct MEventBuffer_3120_Sub *sav1_get_mevent_buffer_0(void); struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void); struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void); struct MysteryEventStruct *sub_801B044(void); u16 *sub_801B058(void); -void sub_801B06C(void); +void DestroyWonderNews(void); bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src); -bool32 sub_801B0CC(void); -bool32 sub_801B128(void); +bool32 ValidateReceivedWonderNews(void); +bool32 WonderNews_Test_Unk_02(void); bool32 sub_801B1A4(const u8 *src); -void sub_801B1E8(void); +void DestroyWonderCard(void); bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data); -bool32 sub_801B27C(void); -bool32 sub_801B308(void); -u16 sub_801B39C(void); +bool32 ValidateReceivedWonderCard(void); +bool32 WonderCard_Test_Unk_08_6(void); +u16 GetWonderCardFlagID(void); void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer); -bool32 sub_801B3F8(void); +bool32 CheckReceivedGiftFromWonderCard(void); bool32 sub_801B508(const u16 *data); void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1); bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1); diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h index 2259d3b6d..547d5237b 100644 --- a/include/mevent_801BAAC.h +++ b/include/mevent_801BAAC.h @@ -1,16 +1,16 @@ #ifndef GUARD_MEVENT_801BAAC_H #define GUARD_MEVENT_801BAAC_H -bool32 sub_801BAAC(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6); -bool32 sub_801C6C8(const struct MEventBuffer_3120_Sub * a0); -s32 sub_801BB74(void); -s32 sub_801C758(void); -s32 sub_801BDA4(bool32 flag); -void sub_801BB48(void); -s32 sub_801CA50(bool32 flag); -void sub_801C72C(void); -u32 sub_801CCD0(u16 input); -void sub_801CC80(void); -void sub_801CC38(void); +bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6); +bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0); +s32 FadeToWonderCardMenu(void); +s32 FadeToWonderNewsMenu(void); +s32 FadeOutFromWonderCard(bool32 flag); +void DestroyWonderCardResources(void); +s32 FadeOutFromWonderNews(bool32 flag); +void DestroyWonderNewsResources(void); +u32 MENews_GetInput(u16 input); +void MENews_AddScrollIndicatorArrowPair(void); +void MENews_RemoveScrollIndicatorArrowPair(void); #endif //GUARD_MEVENT_801BAAC_H diff --git a/include/mevent_news.h b/include/mevent_news.h index 4632edd38..5fa009499 100755 --- a/include/mevent_news.h +++ b/include/mevent_news.h @@ -2,6 +2,6 @@ #define GUARD_MEVENT_NEWS_H void sub_801DBC0(void); -void sub_801DB68(u32 a0); +void GenerateRandomNews(u32 a0); #endif //GUARD_MEVENT_NEWS_H diff --git a/include/mevent_server.h b/include/mevent_server.h index ca3b7091b..d7657b270 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -3,6 +3,6 @@ void mevent_srv_new_wcard(); void mevent_srv_init_wnews(); -u32 sub_801D0C4(u16 * a0); +u32 mevent_srv_common_do_exec(u16 * a0); #endif //GUARD_MEVENT_SERVER_H diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h index 76f5080dc..31f98ed52 100644 --- a/include/mevent_server_ish.h +++ b/include/mevent_server_ish.h @@ -1,10 +1,10 @@ #ifndef GUARD_MEVENT_SERVER_ISH_H #define GUARD_MEVENT_SERVER_ISH_H -void sub_801D484(u32 arg); -u32 sub_801D4A8(u16 * a0); -void sub_801D4E4(void); -void * sub_801D4F4(void); -void sub_801D500(u32 a0); +void mevent_srv_ish_do_init(u32 arg); +u32 mevent_srv_ish_do_exec(u16 * a0); +void mevent_srv_ish_inc_flag(void); +void * mevent_srv_ish_get_buffer(void); +void mevent_srv_ish_set_param(u32 a0); #endif //GUARD_MEVENT_SERVER_ISH_H diff --git a/include/mystery_gift.h b/include/mystery_gift.h index b43fbe9a9..243895a67 100644 --- a/include/mystery_gift.h +++ b/include/mystery_gift.h @@ -1,8 +1,16 @@ #ifndef GUARD_MYSTERY_GIFT_H #define GUARD_MYSTERY_GIFT_H -void sub_8018438(void); -void sub_80186EC(bool8 isJapanese, bool32 usePickOkCancel); -void sub_8018798(u32 bg); +extern bool8 gGiftIsFromEReader; + +u16 GetMysteryGiftBaseBlock(void); +void c2_mystery_gift_e_reader_run(void); +void PrintMysteryGiftOrEReaderTopMenu(bool8 isJapanese, bool32 usePickOkCancel); +void MG_DrawCheckerboardPattern(u32 bg); +void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void); +bool32 MG_PrintTextOnWindow1AndWaitButton(u8 *textState, const u8 *str); +void AddTextPrinterToWindow1(const u8 *src); +void c2_ereader(void); +void c2_mystery_gift(void); #endif //GUARD_MYSTERY_GIFT_H diff --git a/include/text_window.h b/include/text_window.h index 53a6df2e9..501597aa2 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -17,8 +17,8 @@ void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset); void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset); void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset); -void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); -void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); +void DrawTextBorderOuter(u8 windowId, u16 tileNum, u8 palNum); +void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum); void rbox_fill_rectangle(u8 windowId); const u16 *stdpal_get(u8 id); const u16 *GetOverworldTextboxPalettePtr(void); diff --git a/include/union_room.h b/include/union_room.h index 3d60e1432..ca3c87ab1 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -165,14 +165,8 @@ u8 sub_8013F78(void); bool32 sub_802C908(u16); void nullsub_89(u8 taskId); void var_800D_set_xB(void); - -bool32 mevent_0814257C(u8 *textState, const u8 *str); -void sub_8018884(const u8 *src); -void sub_80186A4(void); -void sub_8014EFC(u32 arg0); -void sub_80152A8(u32 arg0); -void sub_8014A00(u32 arg0); - -extern bool8 gUnknown_02022C60; +void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0); +void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0); +void MEvent_CreateTask_Leader(u32 arg0); #endif //GUARD_UNION_ROOM_H -- cgit v1.2.3 From 207a54393c533e073e54365a8069753536fefa3c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 31 Mar 2019 20:07:24 -0400 Subject: Fix mistakes and use EVENT_OBJ_GFX_* macros --- include/contest.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index 5c299bee5..a0b1a6b34 100644 --- a/include/contest.h +++ b/include/contest.h @@ -216,7 +216,6 @@ struct ContestPokemon /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x15*/ u8 trainerGfxId; - // Temp note: 2 bytes of padding /*0x18*/ u32 flags; /*0x1C*/ u8 whichRank:2; // 0x1 0x2 u8 aiPool_Cool:1; // 0x4 @@ -224,7 +223,6 @@ struct ContestPokemon u8 aiPool_Cute:1; // 0x10 u8 aiPool_Smart:1; // 0x20 u8 aiPool_Tough:1; // 0x40 - // Temp note: 1 byte of padding /*0x1E*/ u16 moves[4]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty -- cgit v1.2.3 From 23ac2cc94e2914a427e97467103c0160af6f1be0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 31 Mar 2019 20:15:44 -0400 Subject: Prep for merge --- include/sprite.h | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'include') diff --git a/include/sprite.h b/include/sprite.h index 10c4145b0..32bdd9c55 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -151,26 +151,6 @@ enum SUBSPRITES_IGNORE_PRIORITY, // on but priority is ignored }; -#define OAM_SIZE_0 (0) -#define OAM_SIZE_1 (1 << 0) -#define OAM_SIZE_2 (1 << 1) -#define OAM_SIZE_3 (1 << 2) - -#define SPRITE_SIZE_8x8 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_0 -#define SPRITE_SIZE_16x16 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_1 -#define SPRITE_SIZE_32x32 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_2 -#define SPRITE_SIZE_64x64 .shape = ST_OAM_SQUARE, .size = OAM_SIZE_3 - -#define SPRITE_SIZE_16x8 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_0 -#define SPRITE_SIZE_32x8 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_1 -#define SPRITE_SIZE_32x16 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_2 -#define SPRITE_SIZE_64x32 .shape = ST_OAM_H_RECTANGLE, .size = OAM_SIZE_3 - -#define SPRITE_SIZE_8x16 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_0 -#define SPRITE_SIZE_8x32 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_1 -#define SPRITE_SIZE_16x32 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_2 -#define SPRITE_SIZE_32x64 .shape = ST_OAM_V_RECTANGLE, .size = OAM_SIZE_3 - struct Subsprite { s8 x; // was u16 in R/S -- cgit v1.2.3 From 3181c64c64afa47b3adc04f325ad3798c8c324ec Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 31 Mar 2019 20:40:14 -0400 Subject: Change names from MAP_AREA_ to MAP_GROUP_ --- include/constants/maps.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/constants/maps.h b/include/constants/maps.h index 93291f29e..b849749a9 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -11,8 +11,8 @@ // These groups are used by pokedex_area_screen.c to find wild // pokemon locations. -#define MAP_AREA_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY) -#define MAP_AREA_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R) -#define MAP_AREA_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST) +#define MAP_GROUP_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY) +#define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R) +#define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST) #endif // GUARD_CONSTANTS_MAPS_H -- cgit v1.2.3 From 099ea89b77fdde1a6b31c7ef3e1975e57a175dd9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Mar 2019 21:07:29 -0500 Subject: Document rain weather effect --- include/field_weather.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/field_weather.h b/include/field_weather.h index 76399200d..38fba68f1 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -3,6 +3,8 @@ #include "sprite.h" +#define MAX_RAIN_SPRITES 24 + // Controls how the weather should be changing the screen palettes. enum { @@ -27,7 +29,7 @@ struct Weather { struct { - struct Sprite *rainSprites[24]; + struct Sprite *rainSprites[MAX_RAIN_SPRITES]; struct Sprite *snowflakeSprites[101]; struct Sprite *cloudSprites[3]; } s1; @@ -62,12 +64,12 @@ struct Weather bool8 weatherChangeComplete; u8 weatherPicSpritePalIndex; u8 altGammaSpritePalIndex; - u16 unknown_6D6; - u8 unknown_6D8; - u8 unknown_6D9; + u16 rainSpriteVisibleCounter; + u8 curRainSpriteIndex; + u8 maxRainSprites; u8 rainSpriteCount; - u8 unknown_6DB; - u8 unknown_6DC; + u8 rainSpriteVisibleDelay; + u8 isHeavyRain; u8 rainStrength; /*0x6DE*/ u8 cloudSpritesCreated; u8 filler_6DF[1]; -- cgit v1.2.3 From 1fe52085606ccd9258eea5a037c43b30fc04d7c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Apr 2019 12:05:58 -0400 Subject: through sub_801A02C --- .../constants/event_object_movement_constants.h | 2 ++ include/event_object_movement.h | 4 ++++ include/field_player_avatar.h | 12 +--------- include/fieldmap.h | 1 + include/global.fieldmap.h | 27 +++++++++++++++------- include/union_room.h | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) (limited to 'include') diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h index 2a80f9a09..b1f9b4cb5 100755 --- a/include/constants/event_object_movement_constants.h +++ b/include/constants/event_object_movement_constants.h @@ -242,4 +242,6 @@ #define MOVEMENT_ACTION_FLY_UP 0x9C #define MOVEMENT_ACTION_FLY_DOWN 0x9D +#define MOVEMENT_ACTION_STEP_END 0xFE + #endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 63ac09f2d..4a8e0d373 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -413,5 +413,9 @@ u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); +void sub_8097C44(u8 var, bool32 var2); +bool32 sub_8097C8C(u8 var); +void sub_8097BB4(u8 var1, u8 graphicsId); +void sub_8097CC4(u8 var1, u8 var2); #endif //GUARD_FIELD_EVENT_OBJ_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index ca3d41546..8d87779e6 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -1,17 +1,6 @@ #ifndef GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H -enum { - PLAYER_AVATAR_STATE_NORMAL, - PLAYER_AVATAR_STATE_MACH_BIKE, - PLAYER_AVATAR_STATE_ACRO_BIKE, - PLAYER_AVATAR_STATE_SURFING, - PLAYER_AVATAR_STATE_UNDERWATER, - PLAYER_AVATAR_STATE_FIELD_MOVE, - PLAYER_AVATAR_STATE_FISHING, - PLAYER_AVATAR_STATE_WATERING, -}; - void player_step(u8 a, u16 b, u16 c); void ClearPlayerAvatarInfo(void); void SetPlayerAvatarExtraStateTransition(u8, u8); @@ -73,5 +62,6 @@ void sub_808D1C8(void); bool32 sub_808D1B4(void); bool32 sub_808D1E8(void); void sub_808C0A8(u8 a); +u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/fieldmap.h b/include/fieldmap.h index bb5b0e290..2384ed46a 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -50,5 +50,6 @@ void SpriteCB_HallOfFameMonitor(struct Sprite *); // field_region_map.c void FieldInitRegionMap(MainCallback callback); +void sub_8088B94(int x, int y, int a2); #endif //GUARD_FIELDMAP_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e35d900d8..3aa44ec9a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -232,14 +232,25 @@ struct EventObjectGraphicsInfo /*0x20*/ const union AffineAnimCmd *const *affineAnims; }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) -#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) -#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) -#define PLAYER_AVATAR_FLAG_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_6 (1 << 6) -#define PLAYER_AVATAR_FLAG_DASH (1 << 7) +enum { + PLAYER_AVATAR_STATE_NORMAL, + PLAYER_AVATAR_STATE_MACH_BIKE, + PLAYER_AVATAR_STATE_ACRO_BIKE, + PLAYER_AVATAR_STATE_SURFING, + PLAYER_AVATAR_STATE_UNDERWATER, + PLAYER_AVATAR_STATE_FIELD_MOVE, + PLAYER_AVATAR_STATE_FISHING, + PLAYER_AVATAR_STATE_WATERING, +}; + +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) +#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) +#define PLAYER_AVATAR_FLAG_5 (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) +#define PLAYER_AVATAR_FLAG_6 (1 << PLAYER_AVATAR_STATE_FISHING) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) enum { diff --git a/include/union_room.h b/include/union_room.h index ca3c87ab1..538d37716 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -90,7 +90,7 @@ struct UnkStruct_8019BA8 { u8 field_0; u8 field_1; - u8 field_2; + s8 field_2; u8 field_3; }; -- cgit v1.2.3 From ce89cf6f75a94e08d02cc8c60147469c91ea99c9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Apr 2019 14:09:56 -0400 Subject: through sub_801A3D0 --- include/event_object_movement.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4a8e0d373..817dc78df 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -417,5 +417,6 @@ void sub_8097C44(u8 var, bool32 var2); bool32 sub_8097C8C(u8 var); void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097CC4(u8 var1, u8 var2); +bool32 sub_8097D9C(u8 var); #endif //GUARD_FIELD_EVENT_OBJ_H -- cgit v1.2.3 From 9f1d1219cec0643bb6e58cb2cdba07ca6f8587ed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Apr 2019 14:20:34 -0400 Subject: create header and fix prototypes --- include/union_room_player_avatar.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 include/union_room_player_avatar.h (limited to 'include') diff --git a/include/union_room_player_avatar.h b/include/union_room_player_avatar.h new file mode 100644 index 000000000..9870d0981 --- /dev/null +++ b/include/union_room_player_avatar.h @@ -0,0 +1,14 @@ +#ifndef GUARD_UNION_ROOM_PLAYER_AVATAR_H +#define GUARD_UNION_ROOM_PLAYER_AVATAR_H + +u8 sub_8019BA8(struct UnkStruct_8019BA8 * ptr); +void sub_8019E3C(void); +void sub_8019E70(u8 *arg0, s32 arg1); +void sub_8019F04(u8 *spriteIds); +void sub_8019F2C(void); +void sub_801A274(struct UnkStruct_URoom *arg0); +void sub_801A284(struct UnkStruct_URoom *arg0); +bool32 sub_801A2A8(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3); +void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2); + +#endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H -- cgit v1.2.3 From c429e6d69c3df23687e2336039b676b8927c238e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 1 Apr 2019 20:30:41 -0400 Subject: Move gPlayerFacingPosition out of sym_ewram.txt (#617) * Move gPlayerFacingPosition out of sym_ewram.txt * Fix tabs in sym_ewram.txt * Remove redundant faraway island extern --- include/fldeff.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/fldeff.h b/include/fldeff.h index e095396a4..ff6c9823f 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -10,6 +10,7 @@ void FixLongGrassMetatilesWindowTop(s16 x, s16 y); void FixLongGrassMetatilesWindowBottom(s16 x, s16 y); extern const struct SpritePalette gFieldEffectObjectPaletteInfo6; +extern struct MapPosition gPlayerFacingPosition; // groundshake bool8 sub_81BE66C(void); -- cgit v1.2.3 From 35505c7f5b421b7589d1d761dcbd41a1c40affb6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Apr 2019 20:04:23 -0500 Subject: Document somre more weather effects --- include/event_object_movement.h | 2 +- include/field_weather.h | 33 ++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 63ac09f2d..23a3ffa49 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -89,7 +89,7 @@ u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subprio u8 show_sprite(u8, u8, u8); u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); u8 SpawnSpecialEventObject(struct EventObjectTemplate *); -void sub_8093038(s16, s16, s16 *, s16 *); +void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); void EventObjectTurn(struct EventObject *, u8); diff --git a/include/field_weather.h b/include/field_weather.h index 38fba68f1..7a4864075 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -3,7 +3,10 @@ #include "sprite.h" -#define MAX_RAIN_SPRITES 24 +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG_SPRITES 20 +#define NUM_ASH_SPRITES 20 // Controls how the weather should be changing the screen palettes. enum @@ -31,13 +34,13 @@ struct Weather { struct Sprite *rainSprites[MAX_RAIN_SPRITES]; struct Sprite *snowflakeSprites[101]; - struct Sprite *cloudSprites[3]; + struct Sprite *cloudSprites[NUM_CLOUD_SPRITES]; } s1; struct { u8 filler0[0xA0]; - struct Sprite *fog1Sprites[20]; - struct Sprite *ashSprites[20]; + struct Sprite *fog1Sprites[NUM_FOG_SPRITES]; + struct Sprite *ashSprites[NUM_ASH_SPRITES]; struct Sprite *fog2Sprites[20]; struct Sprite *sandstormSprites1[20]; struct Sprite *sandstormSprites2[5]; @@ -66,30 +69,30 @@ struct Weather u8 altGammaSpritePalIndex; u16 rainSpriteVisibleCounter; u8 curRainSpriteIndex; - u8 maxRainSprites; + u8 targetRainSpriteCount; u8 rainSpriteCount; u8 rainSpriteVisibleDelay; u8 isHeavyRain; u8 rainStrength; /*0x6DE*/ u8 cloudSpritesCreated; u8 filler_6DF[1]; - u16 unknown_6E0; + u16 snowflakeVisibleCounter; u16 unknown_6E2; u8 snowflakeSpriteCount; - u8 unknown_6E5; + u8 targetSnowflakeSpriteCount; u16 unknown_6E6; u16 thunderCounter; u8 unknown_6EA; u8 unknown_6EB; u8 unknown_6EC; - u8 unknown_6ED; + u8 thunderTriggered; u16 fog1ScrollPosX; - u16 unknown_6F0; - u16 unknown_6F2; + u16 fog1ScrollCounter; + u16 fog1ScrollOffset; u8 lightenedFogSpritePals[6]; u8 lightenedFogSpritePalsCount; u8 fog1SpritesCreated; - u16 unknown_6FC; + u16 baseAshSpritesX; u16 unknown_6FE; u8 ashSpritesCreated; u8 filler_701[3]; @@ -176,10 +179,10 @@ void Clouds_InitVars(void); void Clouds_Main(void); void Clouds_InitAll(void); bool8 Clouds_Finish(void); -void Weather2_InitVars(void); -void Weather2_Main(void); -void Weather2_InitAll(void); -bool8 Weather2_Finish(void); +void Sunny_InitVars(void); +void Sunny_Main(void); +void Sunny_InitAll(void); +bool8 Sunny_Finish(void); void LightRain_InitVars(void); void LightRain_Main(void); void LightRain_InitAll(void); -- cgit v1.2.3 From 4be97b2dc691d5215ae402a345708b3e207ceb9f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Apr 2019 18:42:57 -0400 Subject: through sub_801A960 --- include/strings.h | 5 +++++ include/union_room_battle.h | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 include/union_room_battle.h (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 1561da26d..99c9ce73c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2672,5 +2672,10 @@ extern const u8 gText_CommunicationCompleted[]; extern const u8 gText_HaventReceivedGiftOkayToDiscard[]; extern const u8 gText_SendingWonderCard[]; extern const u8 gText_SendingWonderNews[]; +extern const u8 gText_WirelessCommStatus[]; +extern const u8 gText_PeopleTrading[]; +extern const u8 gText_PeopleBattling[]; +extern const u8 gText_PeopleInUnionRoom[]; +extern const u8 gText_PeopleCommunicating[]; #endif // GUARD_STRINGS_H diff --git a/include/union_room_battle.h b/include/union_room_battle.h new file mode 100644 index 000000000..1bc9d0015 --- /dev/null +++ b/include/union_room_battle.h @@ -0,0 +1,6 @@ +#ifndef GUARD_UNION_ROOM_BATTLE_H +#define GUARD_UNION_ROOM_BATTLE_H + +u8 sub_8013C40(void); + +#endif //GUARD_UNION_ROOM_BATTLE_H -- cgit v1.2.3 From 7571969a458fefcfa242acdd4a38dce134897977 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Apr 2019 22:30:30 -0400 Subject: Finish union room battle --- include/constants/game_stat.h | 2 +- include/main.h | 2 +- include/strings.h | 3 +++ include/union_room_battle.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/constants/game_stat.h b/include/constants/game_stat.h index 7ebf3501b..e302f1345 100644 --- a/include/constants/game_stat.h +++ b/include/constants/game_stat.h @@ -51,7 +51,7 @@ #define GAME_STAT_USED_DAYCARE 47 #define GAME_STAT_RODE_CABLE_CAR 48 #define GAME_STAT_ENTERED_HOT_SPRINGS 49 -#define GAME_STAT_50 50 +#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50 #define GAME_STAT_51 51 #define NUM_USED_GAME_STATS 52 diff --git a/include/main.h b/include/main.h index 6c67fbe9f..16ac31df2 100644 --- a/include/main.h +++ b/include/main.h @@ -71,6 +71,6 @@ void RestoreSerialTimer3IntrHandlers(void); void StartTimer1(void); void SeedRngAndSetTrainerId(void); u16 GetGeneratedTrainerIdLower(void); - +void sub_819789C(void); #endif // GUARD_MAIN_H diff --git a/include/strings.h b/include/strings.h index 99c9ce73c..8aa296eb1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2677,5 +2677,8 @@ extern const u8 gText_PeopleTrading[]; extern const u8 gText_PeopleBattling[]; extern const u8 gText_PeopleInUnionRoom[]; extern const u8 gText_PeopleCommunicating[]; +extern const u8 gText_CommStandbyAwaitingOtherPlayer[]; +extern const u8 gText_RefusedBattle[]; +extern const u8 gText_BattleWasRefused[]; #endif // GUARD_STRINGS_H diff --git a/include/union_room_battle.h b/include/union_room_battle.h index 1bc9d0015..2f5086008 100644 --- a/include/union_room_battle.h +++ b/include/union_room_battle.h @@ -2,5 +2,6 @@ #define GUARD_UNION_ROOM_BATTLE_H u8 sub_8013C40(void); +void sub_8014210(u16 battleFlags); #endif //GUARD_UNION_ROOM_BATTLE_H -- cgit v1.2.3 From 6916f09cd5cdb508e270bfba40f1bd165a16762f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 2 Apr 2019 03:22:07 -0400 Subject: Expand MatchCallStruct defs, use REMATCH_* enum --- include/battle_setup.h | 5 +++-- include/constants/flags.h | 15 ++++++++------- include/gym_leader_rematch.h | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/battle_setup.h b/include/battle_setup.h index 3b327e3f7..e3faa5dcf 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,10 +1,11 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H +#include "gym_leader_rematch.h" + #define REMATCHES_COUNT 5 #define REMATCH_TABLE_ENTRIES 78 -#define REMATCH_WALLY_ENTRY 64 -#define REMATCH_ELITE_FOUR_ENTRIES 73 +#define REMATCH_ELITE_FOUR_ENTRIES REMATCH_SIDNEY struct RematchTrainer { diff --git a/include/constants/flags.h b/include/constants/flags.h index f28af3278..0450e988d 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -445,13 +445,14 @@ #define FLAG_REMATCH_NORMAN 0x1A2 #define FLAG_REMATCH_WINONA 0x1A3 #define FLAG_REMATCH_TATE_AND_LIZA 0x1A4 -#define FLAG_REMATCH_JUAN 0x1A5 -#define FLAG_REMATCH_SIDNEY 0x1A6 -#define FLAG_REMATCH_PHOEBE 0x1A7 -#define FLAG_REMATCH_GLACIA 0x1A8 -#define FLAG_REMATCH_DRAKE 0x1A9 -#define FLAG_REMATCH_WALLACE 0x1AA - +// Note: FLAG_REMATCH_JUAN is handled by FLAG_ENABLE_JUAN_MATCH_CALL instead. +#define FLAG_REMATCH_SIDNEY 0x1A5 +#define FLAG_REMATCH_PHOEBE 0x1A6 +#define FLAG_REMATCH_GLACIA 0x1A7 +#define FLAG_REMATCH_DRAKE 0x1A8 +#define FLAG_REMATCH_WALLACE 0x1A9 + +#define FLAG_UNUSED_0x1AA 0x1AA // Unused Flag #define FLAG_UNUSED_0x1AB 0x1AB // Unused Flag #define FLAG_DEFEATED_DEOXYS 0x1AC diff --git a/include/gym_leader_rematch.h b/include/gym_leader_rematch.h index ef0e5fef1..ed1143db5 100644 --- a/include/gym_leader_rematch.h +++ b/include/gym_leader_rematch.h @@ -75,6 +75,8 @@ enum { REMATCH_WINONA, REMATCH_TATE_AND_LIZA, REMATCH_JUAN, + + // Entries below SIDNEY are considered part of REMATCH_ELITE_FOUR_ENTRIES. REMATCH_SIDNEY, REMATCH_PHOEBE, REMATCH_GLACIA, -- cgit v1.2.3 From 9f44ebc5cd2b3088469f188c355db4fe905d299a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 2 Apr 2019 03:27:05 -0400 Subject: Automatically calculate REMATCH_TABLE_ENTRIES Uses the standard C way of calculating the length of an enum. --- include/battle_setup.h | 1 - include/gym_leader_rematch.h | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_setup.h b/include/battle_setup.h index e3faa5dcf..984c820bb 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -4,7 +4,6 @@ #include "gym_leader_rematch.h" #define REMATCHES_COUNT 5 -#define REMATCH_TABLE_ENTRIES 78 #define REMATCH_ELITE_FOUR_ENTRIES REMATCH_SIDNEY struct RematchTrainer diff --git a/include/gym_leader_rematch.h b/include/gym_leader_rematch.h index ed1143db5..778d7a1e8 100644 --- a/include/gym_leader_rematch.h +++ b/include/gym_leader_rematch.h @@ -81,7 +81,11 @@ enum { REMATCH_PHOEBE, REMATCH_GLACIA, REMATCH_DRAKE, - REMATCH_WALLACE + REMATCH_WALLACE, + + // The total number of rematch entries. This must be the last element + // in the enum. + REMATCH_TABLE_ENTRIES }; void UpdateGymLeaderRematch(void); -- cgit v1.2.3 From baa187665b102b0210ecd7296aaaf0de512d3e87 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Apr 2019 13:35:52 +0200 Subject: Document a bit of script menu and battle anims --- include/menu.h | 2 +- include/script_menu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index 4f3c4a3cc..2392de703 100644 --- a/include/menu.h +++ b/include/menu.h @@ -91,7 +91,7 @@ void sub_8199C30(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); -void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs); +void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, const struct MenuAction *strs); s8 Menu_ProcessInputGridLayout(void); u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted); s8 Menu_ProcessInputNoWrapAround_other(void); diff --git a/include/script_menu.h b/include/script_menu.h index 1f4e549fe..efb51870b 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -11,7 +11,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); int convert_pixel_width_to_tile_width(int); u8 CreateWindowFromRect(u8, u8, u8, u8); -void sub_80E2A78(u8); +void ClearToTransparentAndRemoveWindow(u8); int display_text_and_get_width(const u8*, int); int sub_80E2D5C(int arg0, int tileWidth); bool16 ScrSpecial_CreatePCMenu(void); -- cgit v1.2.3 From d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Apr 2019 15:06:44 +0200 Subject: Rows and columns --- include/menu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index 2392de703..4d55fc955 100644 --- a/include/menu.h +++ b/include/menu.h @@ -69,7 +69,7 @@ u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8); void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8); -u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, u8 initialCursorPos); +u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCursorPos); u8 sub_8199134(s8, s8); u8 GetStartMenuWindowId(void); void sub_819A2BC(u8, u8); @@ -91,7 +91,7 @@ void sub_8199C30(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); -void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, const struct MenuAction *strs); +void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *strs); s8 Menu_ProcessInputGridLayout(void); u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted); s8 Menu_ProcessInputNoWrapAround_other(void); -- cgit v1.2.3 From 1241700b204b9f450221299c6e837c0f522f60b2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 2 Apr 2019 18:28:56 -0500 Subject: Finish documenting the other weather effects --- include/field_weather.h | 59 ++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/field_weather.h b/include/field_weather.h index 7a4864075..3a84a8a73 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -3,10 +3,13 @@ #include "sprite.h" -#define MAX_RAIN_SPRITES 24 -#define NUM_CLOUD_SPRITES 3 -#define NUM_FOG_SPRITES 20 -#define NUM_ASH_SPRITES 20 +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG1_SPRITES 20 +#define NUM_ASH_SPRITES 20 +#define NUM_FOG2_SPRITES 20 +#define NUM_SANDSTORM_SPRITES 20 +#define NUM_SWIRL_SANDSTORM_SPRITES 5 // Controls how the weather should be changing the screen palettes. enum @@ -39,11 +42,11 @@ struct Weather struct { u8 filler0[0xA0]; - struct Sprite *fog1Sprites[NUM_FOG_SPRITES]; + struct Sprite *fog1Sprites[NUM_FOG1_SPRITES]; struct Sprite *ashSprites[NUM_ASH_SPRITES]; - struct Sprite *fog2Sprites[20]; - struct Sprite *sandstormSprites1[20]; - struct Sprite *sandstormSprites2[5]; + struct Sprite *fog2Sprites[NUM_FOG2_SPRITES]; + struct Sprite *sandstormSprites1[NUM_SANDSTORM_SPRITES]; + struct Sprite *sandstormSprites2[NUM_SWIRL_SANDSTORM_SPRITES]; } s2; } sprites; u8 gammaShifts[19][32]; @@ -92,32 +95,32 @@ struct Weather u8 lightenedFogSpritePals[6]; u8 lightenedFogSpritePalsCount; u8 fog1SpritesCreated; - u16 baseAshSpritesX; + u16 ashBaseSpritesX; u16 unknown_6FE; u8 ashSpritesCreated; u8 filler_701[3]; - u32 unknown_704; - u32 unknown_708; + u32 sandstormXOffset; + u32 sandstormYOffset; u8 filler_70C[2]; - u16 unknown_70E; - u16 unknown_710; - u16 unknown_712; - u16 unknown_714; - u8 sandstormSprites1Created; - u8 sandstormSprites2Created; - u16 unknown_718; - u16 unknown_71A; - u16 unknown_71C; - u16 unknown_71E; - u16 unknown_720; - u16 unknown_722; + u16 sandstormBaseSpritesX; + u16 sandstormPosY; + u16 sandstormWaveIndex; + u16 sandstormWaveCounter; + u8 sandstormSpritesCreated; + u8 sandstormSwirlSpritesCreated; + u16 fog2BaseSpritesX; + u16 fog2PosY; + u16 fog2ScrollXCounter; + u16 fog2ScrollYCounter; + u16 fog2XOffset; + u16 fog2YOffset; u8 fog2SpritesCreated; u8 filler_725[1]; - u16 unknown_726; - u16 unknown_728; - u16 unknown_72A; - u16 unknown_72C; - u8 unknown_72E; + u16 bubblesDelayCounter; + u16 bubblesDelayIndex; + u16 bubblesCoordsIndex; + u16 bubblesSpriteCount; + u8 bubblesSpritesCreated; u8 filler_72F; u16 currBlendEVA; u16 currBlendEVB; -- cgit v1.2.3 From 02651f6177032baad32efdddeee54a9af624812b Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 2 Apr 2019 19:18:36 -0700 Subject: Attempt to decompile menu_specialized. 2 NONMATCHING --- include/menu_specialized.h | 6 +++--- include/strings.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index d29ac5751..fb23e7ce6 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -32,8 +32,8 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1EC0(void); void sub_81D1D04(u8 a0); -void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void DrawLevelUpWindowPg1(u16 arg0, u16* statStoreLocation1, u16* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, u16* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); @@ -47,7 +47,7 @@ bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); -void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); +void GetMonLevelUpWindowStats(struct Pokemon* mon, u16* statStoreLocation); s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst); void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); void sub_81D2F78(struct UnknownStruct_81D1ED4 *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); diff --git a/include/strings.h b/include/strings.h index 8aa296eb1..fc5724af3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -471,6 +471,8 @@ extern const u8 gText_EggCantBattle[]; extern const u8 gText_PkmnAlreadySelected[]; extern const u8 gText_PkmnAlreadyInBattle[]; extern const u8 gText_PkmnCantSwitchOut[]; +extern const u8 gText_Dash[]; +extern const u8 gText_UnkCtrlF904[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From a455d98385cdeadc65ee3df992fc8d6be36495b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 08:43:16 -0400 Subject: start porting mevent_server from firered --- include/mevent_server.h | 74 +++++++++++++++++++++++++++++++++++++++++ include/mevent_server_helpers.h | 6 ++++ 2 files changed, 80 insertions(+) create mode 100644 include/mevent_server_helpers.h (limited to 'include') diff --git a/include/mevent_server.h b/include/mevent_server.h index d7657b270..772aae6b1 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -1,6 +1,80 @@ #ifndef GUARD_MEVENT_SERVER_H #define GUARD_MEVENT_SERVER_H +#define ME_SEND_BUF_SIZE 0x400 + +struct mevent_srv_sub +{ + s32 seqno; + u8 sendPlayerNo; + u8 recvPlayerNo; + u16 recvIdent; + u16 recvCounter; + u16 recvCRC; + u16 recvSize; + u16 sendIdent; + u16 sendCounter; + u16 sendCRC; + u16 sendSize; + void * recvBfr; + const void * sendBfr; + u32 (*recvFunc)(struct mevent_srv_sub *); + u32 (*sendFunc)(struct mevent_srv_sub *); +}; + +struct send_recv_header +{ + u16 ident; + u16 crc; + u16 size; +}; + +struct mevent_cmd_ish +{ + u32 instr; + u32 parameter; +}; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 param; + u32 mainseqno; + u32 flag; + u32 cmdidx; + void * sendBuffer; + void * recvBuffer; + struct mevent_cmd_ish * cmdBuffer; + void * buffer; + struct mevent_srv_sub manager; +}; + +struct mevent_cmd +{ + u32 instr; + bool32 flag; + void * parameter; +}; + +struct mevent_srv_common +{ + u32 unk_00; + u32 param; + u32 mainseqno; + u32 cmdidx; + const struct mevent_cmd * cmdBuffer; + void * recvBuffer; + struct MEventBuffer_32E0_Sub * mevent_32e0; + struct MEventBuffer_3120_Sub * mevent_3120; + struct MEventStruct_Unk1442CC * mevent_unk1442cc; + void * sendBuffer1; + u32 sendBuffer1Size; + void * sendBuffer2; + u32 sendBuffer2Size; + u32 sendWord; + struct mevent_srv_sub manager; +}; + void mevent_srv_new_wcard(); void mevent_srv_init_wnews(); u32 mevent_srv_common_do_exec(u16 * a0); diff --git a/include/mevent_server_helpers.h b/include/mevent_server_helpers.h new file mode 100644 index 000000000..d2b4608fb --- /dev/null +++ b/include/mevent_server_helpers.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MEVENT_SERVER_HELPERS_H +#define GUARD_MEVENT_SERVER_HELPERS_H + +void mevent_srv_sub_init(struct mevent_srv_sub *, u32, u32); + +#endif //GUARD_MEVENT_SERVER_HELPERS_H -- cgit v1.2.3 From dabd1f6177ee6e2f65553d3fe43efcf023e0c3fe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 10:54:51 -0400 Subject: finish mevent_server.s --- include/mevent_server_helpers.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/mevent_server_helpers.h b/include/mevent_server_helpers.h index d2b4608fb..f682e362d 100644 --- a/include/mevent_server_helpers.h +++ b/include/mevent_server_helpers.h @@ -2,5 +2,9 @@ #define GUARD_MEVENT_SERVER_HELPERS_H void mevent_srv_sub_init(struct mevent_srv_sub *, u32, u32); +void mevent_srv_sub_init_send(struct mevent_srv_sub * manager, u32 ident, const void * src, u32 size); +bool32 mevent_srv_sub_recv(struct mevent_srv_sub * manager); +bool32 mevent_srv_sub_send(struct mevent_srv_sub * manager); +void mevent_srv_sub_init_recv(struct mevent_srv_sub *, u32, void *); #endif //GUARD_MEVENT_SERVER_HELPERS_H -- cgit v1.2.3 From 03badd9c40de5d50562376d39348fb5c85f8340b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 11:43:29 -0400 Subject: mevent_server_ish --- include/mevent_server.h | 48 +---------------------------------------- include/mevent_server_helpers.h | 28 ++++++++++++++++++++++++ include/mevent_server_ish.h | 23 ++++++++++++++++++++ 3 files changed, 52 insertions(+), 47 deletions(-) (limited to 'include') diff --git a/include/mevent_server.h b/include/mevent_server.h index 772aae6b1..ed9812d8a 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -1,53 +1,7 @@ #ifndef GUARD_MEVENT_SERVER_H #define GUARD_MEVENT_SERVER_H -#define ME_SEND_BUF_SIZE 0x400 - -struct mevent_srv_sub -{ - s32 seqno; - u8 sendPlayerNo; - u8 recvPlayerNo; - u16 recvIdent; - u16 recvCounter; - u16 recvCRC; - u16 recvSize; - u16 sendIdent; - u16 sendCounter; - u16 sendCRC; - u16 sendSize; - void * recvBfr; - const void * sendBfr; - u32 (*recvFunc)(struct mevent_srv_sub *); - u32 (*sendFunc)(struct mevent_srv_sub *); -}; - -struct send_recv_header -{ - u16 ident; - u16 crc; - u16 size; -}; - -struct mevent_cmd_ish -{ - u32 instr; - u32 parameter; -}; - -struct mevent_srv_ish -{ - u32 unk_00; - u32 param; - u32 mainseqno; - u32 flag; - u32 cmdidx; - void * sendBuffer; - void * recvBuffer; - struct mevent_cmd_ish * cmdBuffer; - void * buffer; - struct mevent_srv_sub manager; -}; +#include "mevent_server_helpers.h" struct mevent_cmd { diff --git a/include/mevent_server_helpers.h b/include/mevent_server_helpers.h index f682e362d..e4e409862 100644 --- a/include/mevent_server_helpers.h +++ b/include/mevent_server_helpers.h @@ -1,6 +1,34 @@ #ifndef GUARD_MEVENT_SERVER_HELPERS_H #define GUARD_MEVENT_SERVER_HELPERS_H +#define ME_SEND_BUF_SIZE 0x400 + +struct mevent_srv_sub +{ + s32 seqno; + u8 sendPlayerNo; + u8 recvPlayerNo; + u16 recvIdent; + u16 recvCounter; + u16 recvCRC; + u16 recvSize; + u16 sendIdent; + u16 sendCounter; + u16 sendCRC; + u16 sendSize; + void * recvBfr; + const void * sendBfr; + u32 (*recvFunc)(struct mevent_srv_sub *); + u32 (*sendFunc)(struct mevent_srv_sub *); +}; + +struct send_recv_header +{ + u16 ident; + u16 crc; + u16 size; +}; + void mevent_srv_sub_init(struct mevent_srv_sub *, u32, u32); void mevent_srv_sub_init_send(struct mevent_srv_sub * manager, u32 ident, const void * src, u32 size); bool32 mevent_srv_sub_recv(struct mevent_srv_sub * manager); diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h index 31f98ed52..35833ea12 100644 --- a/include/mevent_server_ish.h +++ b/include/mevent_server_ish.h @@ -1,6 +1,29 @@ #ifndef GUARD_MEVENT_SERVER_ISH_H #define GUARD_MEVENT_SERVER_ISH_H +#include "mevent_server_helpers.h" + +struct mevent_cmd_ish +{ + u32 instr; + u32 parameter; +}; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 param; + u32 mainseqno; + u32 flag; + u32 cmdidx; + void * sendBuffer; + void * recvBuffer; + struct mevent_cmd_ish * cmdBuffer; + void * buffer; + struct mevent_srv_sub manager; + u32 unk_4C; +}; + void mevent_srv_ish_do_init(u32 arg); u32 mevent_srv_ish_do_exec(u16 * a0); void mevent_srv_ish_inc_flag(void); -- cgit v1.2.3 From 6c12d154e7a6a0bc60c988497b3daa4f8126a5b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 12:22:39 -0400 Subject: Reformat mevent server and client scripts --- include/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/util.h b/include/util.h index 56c89359a..77062de96 100644 --- a/include/util.h +++ b/include/util.h @@ -10,8 +10,8 @@ u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); int CountTrailingZeroBits(u32 value); -u16 CalcCRC16(u8 *data, s32 length); -u16 CalcCRC16WithTable(u8 *data, u32 length); +u16 CalcCRC16(const u8 *data, s32 length); +u16 CalcCRC16WithTable(const u8 *data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length); void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha); -- cgit v1.2.3 From 28646ea64ea628596dc1cd9496febf6f46cc9e41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 13:26:06 -0400 Subject: Decompile mevent server scripts --- include/mevent.h | 4 ++-- include/mevent_server.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/mevent.h b/include/mevent.h index 9c5d559bf..68c19abfc 100755 --- a/include/mevent.h +++ b/include/mevent.h @@ -52,8 +52,8 @@ bool32 CheckReceivedGiftFromWonderCard(void); bool32 sub_801B508(const u16 *data); void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1); bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1); -u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); -u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); +u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused); +u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused); bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1); u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command); u16 mevent_081445C0(u32 command); diff --git a/include/mevent_server.h b/include/mevent_server.h index ed9812d8a..019f3c685 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -7,7 +7,7 @@ struct mevent_cmd { u32 instr; bool32 flag; - void * parameter; + const void * parameter; }; struct mevent_srv_common @@ -21,9 +21,9 @@ struct mevent_srv_common struct MEventBuffer_32E0_Sub * mevent_32e0; struct MEventBuffer_3120_Sub * mevent_3120; struct MEventStruct_Unk1442CC * mevent_unk1442cc; - void * sendBuffer1; + const void * sendBuffer1; u32 sendBuffer1Size; - void * sendBuffer2; + const void * sendBuffer2; u32 sendBuffer2Size; u32 sendWord; struct mevent_srv_sub manager; -- cgit v1.2.3 From d220f876fc9e7281075419ce6bbb5bf9e8dbef8f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 13:57:03 -0400 Subject: Some symbol documentation --- include/global.h | 16 ++++++++-------- include/mevent.h | 14 +++++++------- include/mevent_801BAAC.h | 4 ++-- include/mevent_server.h | 4 ++-- include/script.h | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 0506c036e..7b570d72e 100644 --- a/include/global.h +++ b/include/global.h @@ -816,7 +816,7 @@ struct MysteryEventStruct u8 unk_1; }; - struct MEventBuffer_3120_Sub + struct WonderNews { u16 unk_00; u8 unk_02; @@ -825,13 +825,13 @@ struct MysteryEventStruct u8 unk_2C[10][40]; }; - struct MEventBuffer_3120 + struct WonderNewsSaveStruct { u32 crc; - struct MEventBuffer_3120_Sub data; + struct WonderNews data; }; - struct MEventBuffer_32E0_Sub + struct WonderCard { u16 unk_00; u16 unk_02; @@ -847,10 +847,10 @@ struct MysteryEventStruct u8 unk_122[40]; }; - struct MEventBuffer_32E0 + struct WonderCardSaveStruct { u32 crc; - struct MEventBuffer_32E0_Sub data; + struct WonderCard data; }; struct MEventBuffer_3430_Sub @@ -870,8 +870,8 @@ struct MysteryEventStruct struct MEventBuffers { - /*0x000 0x322C*/ struct MEventBuffer_3120 buffer_000; - /*0x1c0 0x33EC*/ struct MEventBuffer_32E0 buffer_1c0; + /*0x000 0x322C*/ struct WonderNewsSaveStruct wonderNews; + /*0x1c0 0x33EC*/ struct WonderCardSaveStruct wonderCard; /*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310; /*0x338 0x3564*/ u16 unk_338[4]; /*0x340 0x356C*/ struct MysteryEventStruct unk_340; diff --git a/include/mevent.h b/include/mevent.h index 68c19abfc..a34ca355c 100755 --- a/include/mevent.h +++ b/include/mevent.h @@ -32,30 +32,30 @@ struct MEventStruct_Unk1442CC }; void sub_801AFD8(void); -struct MEventBuffer_3120_Sub *sav1_get_mevent_buffer_0(void); -struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void); +struct WonderNews *GetSavedWonderNews(void); +struct WonderCard *GetSavedWonderCard(void); struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void); struct MysteryEventStruct *sub_801B044(void); u16 *sub_801B058(void); void DestroyWonderNews(void); -bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src); +bool32 sub_801B078(const struct WonderNews *src); bool32 ValidateReceivedWonderNews(void); bool32 WonderNews_Test_Unk_02(void); bool32 sub_801B1A4(const u8 *src); void DestroyWonderCard(void); -bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data); +bool32 sub_801B21C(const struct WonderCard *data); bool32 ValidateReceivedWonderCard(void); bool32 WonderCard_Test_Unk_08_6(void); u16 GetWonderCardFlagID(void); -void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer); +void WonderCard_ResetInternalReceivedFlag(struct WonderCard *buffer); bool32 CheckReceivedGiftFromWonderCard(void); bool32 sub_801B508(const u16 *data); void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1); bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1); u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused); u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused); -bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1); -u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command); +bool32 MEventStruct_Unk1442CC_CompareField_unk_16(const struct MEventStruct_Unk1442CC *a0, const u16 *a1); +u16 MEventStruct_Unk1442CC_GetValueNFrom_unk_20(const struct MEventStruct_Unk1442CC *a0, u32 command); u16 mevent_081445C0(u32 command); void sub_801B940(void); bool32 sub_801B94C(u16 a0); diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h index 547d5237b..d76bc92c2 100644 --- a/include/mevent_801BAAC.h +++ b/include/mevent_801BAAC.h @@ -1,8 +1,8 @@ #ifndef GUARD_MEVENT_801BAAC_H #define GUARD_MEVENT_801BAAC_H -bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6); -bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0); +bool32 InitWonderCardResources(struct WonderCard * r5, struct MEventBuffer_3430_Sub * r6); +bool32 InitWonderNewsResources(const struct WonderNews * a0); s32 FadeToWonderCardMenu(void); s32 FadeToWonderNewsMenu(void); s32 FadeOutFromWonderCard(bool32 flag); diff --git a/include/mevent_server.h b/include/mevent_server.h index 019f3c685..e74337cf6 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -18,8 +18,8 @@ struct mevent_srv_common u32 cmdidx; const struct mevent_cmd * cmdBuffer; void * recvBuffer; - struct MEventBuffer_32E0_Sub * mevent_32e0; - struct MEventBuffer_3120_Sub * mevent_3120; + struct WonderCard * wonder_card; + struct WonderNews * wonder_news; struct MEventStruct_Unk1442CC * mevent_unk1442cc; const void * sendBuffer1; u32 sendBuffer1Size; diff --git a/include/script.h b/include/script.h index 34f4635bb..cfe493479 100644 --- a/include/script.h +++ b/include/script.h @@ -57,9 +57,9 @@ u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); const u8 *GetRamScript(u8 objectId, const u8 *script); -bool32 sub_80991F8(void); -u8 *sub_8099244(void); -void sub_80992A0(u8 *script, u16 scriptSize); +bool32 ValidateSavedRamScript(void); +u8 *GetSavedRamScriptIfValid(void); +void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); // srccmd.h void sub_809BE48(u16 npcId); -- cgit v1.2.3 From d0384ee95e124f16e33cdfbf1d18d02ef97145b4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Apr 2019 14:02:13 -0400 Subject: mevent_server_ish --> mevent_client --- include/mevent_client.h | 33 +++++++++++++++++++++++++++++++++ include/mevent_server_ish.h | 33 --------------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 include/mevent_client.h delete mode 100644 include/mevent_server_ish.h (limited to 'include') diff --git a/include/mevent_client.h b/include/mevent_client.h new file mode 100644 index 000000000..58893794e --- /dev/null +++ b/include/mevent_client.h @@ -0,0 +1,33 @@ +#ifndef GUARD_MEVENT_SERVER_ISH_H +#define GUARD_MEVENT_SERVER_ISH_H + +#include "mevent_server_helpers.h" + +struct mevent_client_cmd +{ + u32 instr; + u32 parameter; +}; + +struct mevent_client +{ + u32 unk_00; + u32 param; + u32 mainseqno; + u32 flag; + u32 cmdidx; + void * sendBuffer; + void * recvBuffer; + struct mevent_client_cmd * cmdBuffer; + void * buffer; + struct mevent_srv_sub manager; + u32 unk_4C; +}; + +void mevent_client_do_init(u32 arg); +u32 mevent_client_do_exec(u16 * a0); +void mevent_client_inc_flag(void); +void * mevent_client_get_buffer(void); +void mevent_client_set_param(u32 a0); + +#endif //GUARD_MEVENT_SERVER_ISH_H diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h deleted file mode 100644 index 35833ea12..000000000 --- a/include/mevent_server_ish.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef GUARD_MEVENT_SERVER_ISH_H -#define GUARD_MEVENT_SERVER_ISH_H - -#include "mevent_server_helpers.h" - -struct mevent_cmd_ish -{ - u32 instr; - u32 parameter; -}; - -struct mevent_srv_ish -{ - u32 unk_00; - u32 param; - u32 mainseqno; - u32 flag; - u32 cmdidx; - void * sendBuffer; - void * recvBuffer; - struct mevent_cmd_ish * cmdBuffer; - void * buffer; - struct mevent_srv_sub manager; - u32 unk_4C; -}; - -void mevent_srv_ish_do_init(u32 arg); -u32 mevent_srv_ish_do_exec(u16 * a0); -void mevent_srv_ish_inc_flag(void); -void * mevent_srv_ish_get_buffer(void); -void mevent_srv_ish_set_param(u32 a0); - -#endif //GUARD_MEVENT_SERVER_ISH_H -- cgit v1.2.3 From 4fadbaf16153c0160f6ad38dc0053e7ff6db7472 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 3 Apr 2019 09:55:17 -0400 Subject: Minor fixes gotoram --> returnram cmdCF/execram --> gotoram fix indentation in sym_ewram.txt fix mevent_client.h guard name --- include/link_rfu.h | 2 +- include/mevent_client.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index b8ba1a927..edfd0ed20 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -284,7 +284,7 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); -void sub_8010198(void); +void LinkRfu_FatalError(void); bool32 sub_8011A9C(void); void sub_80104B0(void); void sub_8011A50(void); diff --git a/include/mevent_client.h b/include/mevent_client.h index 58893794e..c32d14d7a 100644 --- a/include/mevent_client.h +++ b/include/mevent_client.h @@ -1,5 +1,5 @@ -#ifndef GUARD_MEVENT_SERVER_ISH_H -#define GUARD_MEVENT_SERVER_ISH_H +#ifndef GUARD_MEVENT_CLIENT_H +#define GUARD_MEVENT_CLIENT_H #include "mevent_server_helpers.h" @@ -30,4 +30,4 @@ void mevent_client_inc_flag(void); void * mevent_client_get_buffer(void); void mevent_client_set_param(u32 a0); -#endif //GUARD_MEVENT_SERVER_ISH_H +#endif //GUARD_MEVENT_CLIENT_H -- cgit v1.2.3 From 48d27c035ae194419317884f64ddf4beec001e7c Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 3 Apr 2019 15:15:08 -0700 Subject: Remove pokemon_3.h --- include/pokemon_3.h | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 include/pokemon_3.h (limited to 'include') diff --git a/include/pokemon_3.h b/include/pokemon_3.h deleted file mode 100644 index 263839b19..000000000 --- a/include/pokemon_3.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GUARD_POKEMON_3_H -#define GUARD_POKEMON_3_H - -u16 sub_806EFF0(u16); -const u8* GetTrainerClassNameFromId(u16 trainerId); -const u8* GetTrainerNameFromId(u16 trainerId); -void PlayMapChosenOrBattleBGM(u16 song); -u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); - -#endif // GUARD_POKEMON_3_H -- cgit v1.2.3 From 91a94a0ca1f2df00a776c85b40d76c193977d13a Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 3 Apr 2019 21:13:26 -0700 Subject: Try to get closer to matching. --- include/menu_specialized.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/menu_specialized.h b/include/menu_specialized.h index fb23e7ce6..405d78830 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -32,8 +32,8 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1EC0(void); void sub_81D1D04(u8 a0); -void DrawLevelUpWindowPg1(u16 arg0, u16* statStoreLocation1, u16* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, u16* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void DrawLevelUpWindowPg1(u16 arg0, u16 *statStoreLocation1, u16 *statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, u16 *statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); @@ -47,7 +47,7 @@ bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); -void GetMonLevelUpWindowStats(struct Pokemon* mon, u16* statStoreLocation); +void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *statStoreLocation); s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst); void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); void sub_81D2F78(struct UnknownStruct_81D1ED4 *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); -- cgit v1.2.3 From a47abb3949f8d1050379f51005368a5093c15113 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 3 Apr 2019 21:46:59 -0400 Subject: union_room_chat data, 1 --- include/global.h | 13 +++++++------ include/graphics.h | 1 + include/strings.h | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 7b570d72e..864a7fa55 100644 --- a/include/global.h +++ b/include/global.h @@ -18,12 +18,13 @@ #if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER) #define _(x) x #define __(x) x -#define INCBIN_U8 {0} -#define INCBIN_U16 {0} -#define INCBIN_U32 {0} -#define INCBIN_S8 {0} -#define INCBIN_S16 {0} -#define INCBIN_S32 {0} +// CLion is an idiot +#define INCBIN_U8(x) {0} +#define INCBIN_U16(x) {0} +#define INCBIN_U32(x) {0} +#define INCBIN_S8(x) {0} +#define INCBIN_S16(x) {0} +#define INCBIN_S32(x) {0} #endif // IDE support #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) diff --git a/include/graphics.h b/include/graphics.h index 2584e713e..30ca2af82 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4921,6 +4921,7 @@ extern const u16 gUnknown_08DD4BB0[]; extern const u16 gUnknown_08DD4BD0[]; extern const u32 gUnknown_08DD4BF0[]; extern const u32 gUnknown_08DD4C4C[]; +extern const u32 gUnknown_08DD4CF8[]; extern const u16 gLinkMiscMenu_Pal[]; extern const u32 gLinkMiscMenu_Gfx[]; extern const u32 gLinkMiscMenu_Tilemap[]; diff --git a/include/strings.h b/include/strings.h index fc5724af3..cb54afb13 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2682,5 +2682,21 @@ extern const u8 gText_PeopleCommunicating[]; extern const u8 gText_CommStandbyAwaitingOtherPlayer[]; extern const u8 gText_RefusedBattle[]; extern const u8 gText_BattleWasRefused[]; +extern const u8 gText_QuitChatting[]; +extern const u8 gText_RegisterTextWhere[]; +extern const u8 gText_RegisterTextHere[]; +extern const u8 gText_InputText[]; +extern const u8 gText_ExitingChat[]; +extern const u8 gText_LeaderLeftEndingChat[]; +extern const u8 gText_RegisteredTextChanged[]; +extern const u8 gText_AlreadySavedFile_Unused[]; +extern const u8 gText_SavingDontTurnOff_Unused[]; +extern const u8 gText_PlayerSavedGame_Unused[]; +extern const u8 gText_IfLeaderLeavesChatEnds[]; +extern const u8 gText_Upper[]; +extern const u8 gText_Lower[]; +extern const u8 gText_Symbols[]; +extern const u8 gText_Register2[]; +extern const u8 gText_Exit2[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 53efbe2832f5e7a6973c3c5a6a6d7240ea5ecbdd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Apr 2019 08:49:01 -0400 Subject: Finish decomp of union_room_chat --- include/global.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 864a7fa55..7b570d72e 100644 --- a/include/global.h +++ b/include/global.h @@ -18,13 +18,12 @@ #if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER) #define _(x) x #define __(x) x -// CLion is an idiot -#define INCBIN_U8(x) {0} -#define INCBIN_U16(x) {0} -#define INCBIN_U32(x) {0} -#define INCBIN_S8(x) {0} -#define INCBIN_S16(x) {0} -#define INCBIN_S32(x) {0} +#define INCBIN_U8 {0} +#define INCBIN_U16 {0} +#define INCBIN_U32 {0} +#define INCBIN_S8 {0} +#define INCBIN_S16 {0} +#define INCBIN_S32 {0} #endif // IDE support #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) -- cgit v1.2.3 From c46f271f676812b7292560f36f890010c71ef5d1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Apr 2019 11:55:18 -0400 Subject: Documentation of ereader_helpers, 1 --- include/ereader_helpers.h | 38 ++++++++++++++++++++++++++++++++++---- include/save.h | 5 +++-- 2 files changed, 37 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h index 54b36ef0f..95079ff50 100755 --- a/include/ereader_helpers.h +++ b/include/ereader_helpers.h @@ -3,13 +3,43 @@ struct Unk81D38FC { - u8 unk0[0x270]; + u8 unk0[12]; + u8 unkC[0x148]; + u8 unk154[0x11C]; int checksum; }; -bool8 sub_81D3920(u8 *buffer); -bool32 sub_81D3AB0(struct Unk81D38FC *arg0); -bool32 sub_81D3B34(void); +struct EReaderTrainerHillSet +{ + u8 unk_0; + u8 unk_1; + u8 unk_2; + u8 unk_3; + int checksum; + struct Unk81D38FC unk_8[6]; + u8 unk_ec0[40]; +}; + +struct Unk81D3998Sub +{ + u8 unk_000[4]; + u8 unk_004[0x148]; + u8 unk_14C[0x148]; + u8 unk_294[0x124]; +}; + +struct Unk81D3998 +{ + u8 unk_000; + u8 unk_001; + u8 unk_002; + int checksum; + struct Unk81D3998Sub unk_008[4]; +}; + +bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer); +bool32 TryWriteTrainerHill(struct Unk81D38FC *arg0); +bool32 ReadTrainerHillAndValidate(void); int sub_81D3D70(u8, u32, u32*, u32*); void sub_81D3F9C(void); void sub_81D3FAC(void); diff --git a/include/save.h b/include/save.h index 88e5f2280..5e2cf7267 100644 --- a/include/save.h +++ b/include/save.h @@ -33,6 +33,7 @@ struct SaveSectionOffsets #define NUM_SECTORS_PER_SLOT 16 #define UNKNOWN_CHECK_VALUE 0x8012025 +#define SPECIAL_SECTION_SENTINEL 0xB39D // SetDamagedSectorBits states enum @@ -88,8 +89,8 @@ bool8 CheckSaveFile(void); u8 Save_LoadGameData(u8 a1); u16 sub_815355C(void); u8 sub_81534D0(u8); -u32 TryCopySpecialSaveSection(u8 sector, u8* dst); -u32 sub_8153634(u8 sector, u8* src); +u32 TryReadSpecialSaveSection(u8 sector, u8* dst); +u32 TryWriteSpecialSaveSection(u8 sector, u8* src); void sub_8153688(u8 taskId); // save_failed_screen.c -- cgit v1.2.3 From 8db03ba6fab0d335d6141f1a9289122c1477a7b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Apr 2019 13:44:43 -0400 Subject: Documentation of ereader helpers, 2 --- include/ereader_helpers.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h index 95079ff50..bcbb68d4f 100755 --- a/include/ereader_helpers.h +++ b/include/ereader_helpers.h @@ -3,9 +3,10 @@ struct Unk81D38FC { - u8 unk0[12]; - u8 unkC[0x148]; - u8 unk154[0x11C]; + u8 unk0; + u8 filler_1[3]; + u8 unk4[0x148]; + u8 unk14C[0x124]; int checksum; }; @@ -38,7 +39,7 @@ struct Unk81D3998 }; bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer); -bool32 TryWriteTrainerHill(struct Unk81D38FC *arg0); +bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0); bool32 ReadTrainerHillAndValidate(void); int sub_81D3D70(u8, u32, u32*, u32*); void sub_81D3F9C(void); -- cgit v1.2.3 From 9e74409bb2032e25d431dda116462759e5b51fe0 Mon Sep 17 00:00:00 2001 From: Fontbane Date: Thu, 4 Apr 2019 19:28:37 -0400 Subject: Fix labels, label more scripts --- include/bard_music.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/bard_music.h b/include/bard_music.h index 488205405..882606b27 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -38,7 +38,7 @@ struct BardSong // Exported ROM declarations -extern const u16 gUnknown_085F5490; +extern const u16 gNumSpeciesNames; extern const u16 gUnknown_085FA1D4; const struct BardSound *GetWordSounds(u16 word); void GetWordPhonemes(struct BardSong *song, u16 word); -- cgit v1.2.3 From dd24597d529cd5d9c06aa4699526dbe13d7c9b8e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 4 Apr 2019 21:24:21 +0200 Subject: Finish up menu specialised --- include/battle.h | 9 ++------- include/menu_specialized.h | 6 +++--- include/strings.h | 6 ++++++ 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 13c1851cf..0274e4d9f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -276,12 +276,7 @@ struct BattleCallbacksStack struct StatsArray { - u16 hp; - u16 atk; - u16 def; - u16 spd; - u16 spAtk; - u16 spDef; + u16 stats[NUM_STATS]; }; struct BattleResources @@ -290,7 +285,7 @@ struct BattleResources struct UnknownFlags *flags; struct BattleScriptsStack* battleScriptsStack; struct BattleCallbacksStack* battleCallbackStack; - struct StatsArray* statsBeforeLvlUp; + struct StatsArray* beforeLvlUp; struct AI_ThinkingStruct *ai; struct BattleHistory *battleHistory; struct BattleScriptsStack *AI_ScriptsStack; diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 405d78830..014ee2585 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -32,8 +32,6 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1EC0(void); void sub_81D1D04(u8 a0); -void DrawLevelUpWindowPg1(u16 arg0, u16 *statStoreLocation1, u16 *statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, u16 *statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); @@ -47,7 +45,6 @@ bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); -void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *statStoreLocation); s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst); void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6, bool8 arg7); void sub_81D2F78(struct UnknownStruct_81D1ED4 *arg0, u8 *sheen, u16 boxId, u16 monId, u16 arg5, u16 id, u16 arg7, bool8 arg8); @@ -63,5 +60,8 @@ void sub_81D3464(struct Sprite **sprites); void sub_81D3480(struct Sprite **sprites, u8 arg1, u8 arg2); void sub_81D3520(struct Sprite **sprites); void sub_81D354C(struct Sprite **sprites); +void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr); +void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr); +void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats); #endif // GUARD_MENU_SPECIALIZED_H diff --git a/include/strings.h b/include/strings.h index cb54afb13..c279cf75c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -471,6 +471,12 @@ extern const u8 gText_EggCantBattle[]; extern const u8 gText_PkmnAlreadySelected[]; extern const u8 gText_PkmnAlreadyInBattle[]; extern const u8 gText_PkmnCantSwitchOut[]; +extern const u8 gUnknown_085EEA46[]; +extern const u8 gUnknown_085EEA4E[]; +extern const u8 gUnknown_085EEA55[]; +extern const u8 gUnknown_085EEA63[]; +extern const u8 gUnknown_085EEA6B[]; +extern const u8 gUnknown_085EEA5D[]; extern const u8 gText_Dash[]; extern const u8 gText_UnkCtrlF904[]; -- cgit v1.2.3 From c36476af852b303fbb051b126023059ed5340a1c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 4 Apr 2019 23:08:53 +0200 Subject: Clean up data2b.c --- include/data.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/data2.h | 22 -------------------- 2 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 include/data.h delete mode 100644 include/data2.h (limited to 'include') diff --git a/include/data.h b/include/data.h new file mode 100644 index 000000000..a8ba573fe --- /dev/null +++ b/include/data.h @@ -0,0 +1,63 @@ +#ifndef GUARD_DATA_H +#define GUARD_DATA_H + +#include "constants/moves.h" +#include "constants/species.h" + +#define SPECIES_SHINY_TAG 500 + +struct MonCoords +{ + // This would use a bitfield, but some function + // uses it as a u8 and casting won't match. + u8 size; // u8 width:4, height:4; + u8 y_offset; +}; + +extern const u16 gUnknown_082FF1D8[]; +extern const u32 gUnknown_082FF1F8[]; + +extern const struct SpriteFrameImage gUnknown_082FF3A8[]; +extern const struct SpriteFrameImage gUnknown_082FF3C8[]; +extern const struct SpriteFrameImage gUnknown_082FF3E8[]; +extern const struct SpriteFrameImage gUnknown_082FF408[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Brendan[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_May[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Red[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Wally[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[]; + +extern const union AffineAnimCmd *const gUnknown_082FF618[]; +extern const union AffineAnimCmd *const gUnknown_082FF694[]; +extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; + +extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; +extern const struct MonCoords gMonFrontPicCoords[]; +extern const struct CompressedSpriteSheet gMonStillFrontPicTable[]; +extern const struct MonCoords gMonBackPicCoords[]; +extern const struct CompressedSpriteSheet gMonBackPicTable[]; +extern const struct CompressedSpritePalette gMonPaletteTable[]; +extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; +extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; +extern const struct MonCoords gTrainerFrontPicCoords[]; +extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; +extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; +extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; +extern const struct MonCoords gTrainerBackPicCoords[]; +extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused +extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; + +extern const u8 gEnemyMonElevation[NUM_SPECIES]; + +extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; + +extern const struct Trainer gTrainers[]; +extern const u8 gTrainerClassNames[][13]; +extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; +extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1]; + +#endif // GUARD_DATA_H diff --git a/include/data2.h b/include/data2.h deleted file mode 100644 index c1a2608ae..000000000 --- a/include/data2.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef GUARD_DATA2_H -#define GUARD_DATA2_H - -struct MonCoords -{ - // This would use a bitfield, but some function - // uses it as a u8 and casting won't match. - u8 size; // u8 width:4, height:4; - u8 y_offset; -}; - -extern const struct MonCoords gTrainerBackPicCoords[]; -extern const struct MonCoords gTrainerFrontPicCoords[]; - -extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; -extern const u8 gMoveNames[][MOVE_NAME_LENGTH + 1]; -extern struct CompressedSpriteSheet gUnknown_0831C620; -extern struct CompressedSpritePalette gUnknown_0831C628; -extern const struct SpriteTemplate gUnknown_0831C688; -extern const struct CompressedSpriteSheet gMonBackPicTable[]; - -#endif // GUARD_DATA2_H -- cgit v1.2.3 From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 4 Apr 2019 23:53:06 +0200 Subject: Clean up data headers --- include/battle.h | 65 ++-------------------------------------- include/data.h | 60 +++++++++++++++++++++++++++++++++++-- include/field_effect.h | 4 +-- include/field_specials.h | 3 ++ include/pokemon_summary_screen.h | 2 ++ 5 files changed, 67 insertions(+), 67 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 0274e4d9f..e3c37aa99 100644 --- a/include/battle.h +++ b/include/battle.h @@ -62,70 +62,12 @@ #define BATTLE_BUFFER_LINK_SIZE 0x1000 -struct TrainerMonNoItemDefaultMoves -{ - u16 iv; - u8 lvl; - u16 species; -}; - -struct TrainerMonItemDefaultMoves -{ - u16 iv; - u8 lvl; - u16 species; - u16 heldItem; -}; - -struct TrainerMonNoItemCustomMoves -{ - u16 iv; - u8 lvl; - u16 species; - u16 moves[4]; -}; - -struct TrainerMonItemCustomMoves -{ - u16 iv; - u8 lvl; - u16 species; - u16 heldItem; - u16 moves[4]; -}; - -union TrainerMonPtr -{ - const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; - const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; - const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; - const struct TrainerMonItemCustomMoves *ItemCustomMoves; -}; - -struct Trainer -{ - /*0x00*/ u8 partyFlags; - /*0x01*/ u8 trainerClass; - /*0x02*/ u8 encounterMusic_gender; // last bit is gender - /*0x03*/ u8 trainerPic; - /*0x04*/ u8 trainerName[12]; - /*0x10*/ u16 items[4]; - /*0x18*/ bool8 doubleBattle; - /*0x1C*/ u32 aiFlags; - /*0x20*/ u8 partySize; - /*0x24*/ union TrainerMonPtr party; -}; - -extern const struct Trainer gTrainers[]; - -#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) - -struct UnknownFlags +struct ResourceFlags { u32 flags[4]; }; -#define UNKNOWN_FLAG_FLASH_FIRE 1 +#define RESOURCE_FLAG_FLASH_FIRE 1 struct DisableStruct { @@ -282,7 +224,7 @@ struct StatsArray struct BattleResources { struct SecretBaseRecord* secretBase; - struct UnknownFlags *flags; + struct ResourceFlags *flags; struct BattleScriptsStack* battleScriptsStack; struct BattleCallbacksStack* battleCallbackStack; struct StatsArray* beforeLvlUp; @@ -769,6 +711,5 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; -extern const u8 gTrainerClassNames[][13]; #endif // GUARD_BATTLE_H diff --git a/include/data.h b/include/data.h index a8ba573fe..f1a4caa6a 100644 --- a/include/data.h +++ b/include/data.h @@ -14,6 +14,62 @@ struct MonCoords u8 y_offset; }; +struct TrainerMonNoItemDefaultMoves +{ + u16 iv; + u8 lvl; + u16 species; +}; + +struct TrainerMonItemDefaultMoves +{ + u16 iv; + u8 lvl; + u16 species; + u16 heldItem; +}; + +struct TrainerMonNoItemCustomMoves +{ + u16 iv; + u8 lvl; + u16 species; + u16 moves[4]; +}; + +struct TrainerMonItemCustomMoves +{ + u16 iv; + u8 lvl; + u16 species; + u16 heldItem; + u16 moves[4]; +}; + +union TrainerMonPtr +{ + const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; + const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; + const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; + const struct TrainerMonItemCustomMoves *ItemCustomMoves; +}; + +struct Trainer +{ + /*0x00*/ u8 partyFlags; + /*0x01*/ u8 trainerClass; + /*0x02*/ u8 encounterMusic_gender; // last bit is gender + /*0x03*/ u8 trainerPic; + /*0x04*/ u8 trainerName[12]; + /*0x10*/ u16 items[4]; + /*0x18*/ bool8 doubleBattle; + /*0x1C*/ u32 aiFlags; + /*0x20*/ u8 partySize; + /*0x24*/ union TrainerMonPtr party; +}; + +#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) + extern const u16 gUnknown_082FF1D8[]; extern const u32 gUnknown_082FF1F8[]; @@ -34,7 +90,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; -extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; +extern const union AnimCmd *const gUnknown_082FF70C[]; extern const struct MonCoords gMonFrontPicCoords[]; extern const struct CompressedSpriteSheet gMonStillFrontPicTable[]; extern const struct MonCoords gMonBackPicCoords[]; @@ -52,7 +108,7 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const u8 gEnemyMonElevation[NUM_SPECIES]; -extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; +extern const union AnimCmd *const *const gMonFrontAnimsPtrTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct Trainer gTrainers[]; diff --git a/include/field_effect.h b/include/field_effect.h index 1f5f4ee29..0dbe600d3 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,9 +1,7 @@ #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2]; extern const struct SpritePalette gNewGameBirchObjectPaletteInfo; -extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2]; extern const struct SpriteTemplate gNewGameBirchObjectTemplate; extern const struct OamData gNewGameBirchOamAttributes; @@ -53,4 +51,4 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); void StartEscapeRopeFieldEffect(void); -#endif //GUARD_FIELD_EFFECTS_H +#endif // GUARD_FIELD_EFFECTS_H diff --git a/include/field_specials.h b/include/field_specials.h index 68b233074..b1a50c811 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -1,6 +1,9 @@ #ifndef GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H +extern bool8 gBikeCyclingChallenge; +extern u8 gBikeCollisions; + u8 GetLeadMonIndex(void); u8 sub_813B260(void); u16 get_unknown_box_id(void); diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 19994b77f..20d881702 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -4,7 +4,9 @@ #include "main.h" extern u8 gLastViewedMonIndex; + extern const u8 *const gMoveDescriptionPointers[]; +extern const u8 *const gNatureNamePointers[]; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); -- cgit v1.2.3 From 70569e7ebc428bebe42709c18f13a9df5399045e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 5 Apr 2019 00:07:39 +0200 Subject: Use shiny species tag --- include/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 60ccb27f4..150486c0e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -487,7 +487,7 @@ u8 GetDefaultMoveTarget(u8 battlerId); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality); -void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition); +void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition); void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition); void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition); -- cgit v1.2.3 From 033580da9623d6519c35efcb3594552d3389772d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Apr 2019 16:11:24 -0500 Subject: Document secret base --- include/battle.h | 2 +- include/constants/event_objects.h | 2 ++ include/constants/flags.h | 2 +- include/constants/metatile_behaviors.h | 4 +-- include/constants/vars.h | 2 -- include/decoration.h | 4 +-- include/event_object_movement.h | 10 ++++---- include/event_scripts.h | 6 ++--- include/global.h | 14 +++++------ include/metatile_behavior.h | 4 +-- include/pokemon.h | 2 +- include/secret_base.h | 46 +++++++++++++--------------------- include/strings.h | 2 +- 13 files changed, 44 insertions(+), 56 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index e3c37aa99..0f4087c90 100644 --- a/include/battle.h +++ b/include/battle.h @@ -223,7 +223,7 @@ struct StatsArray struct BattleResources { - struct SecretBaseRecord* secretBase; + struct SecretBase* secretBase; struct ResourceFlags *flags; struct BattleScriptsStack* battleScriptsStack; struct BattleCallbacksStack* battleCallbackStack; diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 9973477da..07ed2d40c 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -274,6 +274,8 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 +#define FIRST_DECORATION_SPRITE_GFX EVENT_OBJ_GFX_PICHU_DOLL + #define EVENT_OBJ_ID_PLAYER 0xFF #define EVENT_OBJ_ID_CAMERA 0x7F diff --git a/include/constants/flags.h b/include/constants/flags.h index 0450e988d..c56e9013d 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -287,7 +287,7 @@ #define FLAG_RECEIVED_TM41 0x109 #define FLAG_RECEIVED_LAVARIDGE_EGG 0x10A #define FLAG_RECEIVED_REVIVED_FOSSIL_MON 0x10B -#define FLAG_DECORATION_16 0x10C +#define FLAG_SECRET_BASE_REGISTRY_ENABLED 0x10C #define FLAG_RECEIVED_TM46 0x10D #define FLAG_CONTEST_SKETCH_CREATED 0x10E #define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE 0x10F diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index d8d75066c..44bbd9729 100755 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -182,7 +182,7 @@ #define MB_SECRET_BASE_UNUSED 0xB2 #define MB_BLOCK_DECORATION 0xB3 #define MB_SECRET_BASE_DECORATION 0xB4 -#define MB_SECRET_BASE_LARGE_MAT_EDGE 0xB5 +#define MB_HOLDS_SMALL_DECORATION 0xB5 #define MB_UNUSED_B6 0xB6 #define MB_SECRET_BASE_NORTH_WALL 0xB7 #define MB_SECRET_BASE_BALLOON 0xB8 @@ -196,7 +196,7 @@ #define MB_IMPASSABLE_SOUTH_AND_NORTH 0xC0 #define MB_IMPASSABLE_WEST_AND_EAST 0xC1 #define MB_SECRET_BASE_HOLE 0xC2 -#define MB_LARGE_MAT_CENTER 0xC3 +#define MB_HOLDS_LARGE_DECORATION 0xC3 #define MB_SECRET_BASE_TV_SHIELD 0xC4 #define MB_PLAYER_ROOM_PC_ON 0xC5 #define MB_C6 0xC6 diff --git a/include/constants/vars.h b/include/constants/vars.h index 20524611b..6fd1c16dd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -1,8 +1,6 @@ #ifndef GUARD_CONSTANTS_VARS_H #define GUARD_CONSTANTS_VARS_H -#define UNKNOWN_VAR_OFFSET_3F20 0x3F20 - #define VARS_START 0x4000 // temporary vars diff --git a/include/decoration.h b/include/decoration.h index f613c25d2..0e6d6cfdd 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -9,7 +9,7 @@ enum DecorPerm { DECORPERM_PASS_FLOOR, DECORPERM_BEHIND_FLOOR, DECORPERM_NA_WALL, - DECORPERM_SOLID_MAT + DECORPERM_SPRITE }; enum DecorShape { @@ -68,7 +68,7 @@ extern EWRAM_DATA u8 gCurDecorationIndex; void sub_8126968(void); void sub_8126AD8(u8 taskId); -void sub_8127D38(u16 mapX, u16 mapY, u16 decor); +void ShowDecorationOnMap(u16 mapX, u16 mapY, u16 decor); void sub_8126B2C(u8 taskId); void sub_8127208(u8 taskId); void sub_8127250(u8 *dest, u8 decorCat); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index ab555fda0..4f3f99cd1 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -74,10 +74,10 @@ u8 GetFirstInactiveEventObjectId(void); void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void sub_808EBA8(u8, u8, u8, s16, s16); +void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); void sub_808E16C(s16, s16); -void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); +void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); void sub_80930E0(s16 *, s16 *, s16, s16); @@ -86,7 +86,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *); void TrySpawnEventObjects(s16, s16); u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); -u8 show_sprite(u8, u8, u8); +u8 TrySpawnEventObject(u8, u8, u8); u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); u8 SpawnSpecialEventObject(struct EventObjectTemplate *); void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); @@ -103,8 +103,8 @@ void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); void ShiftEventObjectCoords(struct EventObject *, s16, s16); -void sub_808EB08(struct EventObject *, s16, s16); -void sub_808F254(u8, u8, u8); +void MoveEventObjectToMapCoords(struct EventObject *, s16, s16); +void TryOverrideEventObjectTemplateCoords(u8, u8, u8); void InitEventObjectPalettes(u8 palSlot); void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); diff --git a/include/event_scripts.h b/include/event_scripts.h index bf7084326..d35bf962d 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -15,8 +15,8 @@ extern const u8 EventScript_TryDoDoubleTrainerBattle[]; extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; extern const u8 EventScript_TryDoRematchBattle[]; -extern const u8 EventScript_SecretPower1[]; -extern const u8 EventScript_SecretPower2[]; +extern const u8 SecretBase_EventScript_DollInteract[]; +extern const u8 SecretBase_EventScript_CushionInteract[]; extern const u8 gTVBravoTrainerText00[]; @@ -528,8 +528,6 @@ extern const u8 EventScript_PlayerPCMale[]; extern const u8 EventScript_PlayerPCFemale[]; extern const u8 EventScript_SecretBasePC[]; extern const u8 EventScript_RecordMixingSecretBasePC[]; -extern const u8 EventScript_SecretPower1[]; -extern const u8 EventScript_SecretPower2[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_HiddenItemScript[]; diff --git a/include/global.h b/include/global.h index 7b570d72e..4523ece21 100644 --- a/include/global.h +++ b/include/global.h @@ -471,21 +471,21 @@ struct SecretBaseParty u8 EVs[PARTY_SIZE]; }; -struct SecretBaseRecord +struct SecretBase { /*0x1A9C*/ u8 secretBaseId; /*0x1A9D*/ u8 sbr_field_1_0:4; /*0x1A9D*/ u8 gender:1; - /*0x1A9D*/ u8 sbr_field_1_5:1; - /*0x1A9D*/ u8 sbr_field_1_6:2; + /*0x1A9D*/ u8 battledOwnerToday:1; + /*0x1A9D*/ u8 registryStatus:2; /*0x1A9E*/ u8 trainerName[PLAYER_NAME_LENGTH]; /*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class /*0x1AA9*/ u8 language; - /*0x1AAA*/ u16 sbr_field_e; - /*0x1AAC*/ u8 sbr_field_10; + /*0x1AAA*/ u16 numSecretBasesReceived; + /*0x1AAC*/ u8 numTimesEntered; /*0x1AAD*/ u8 sbr_field_11; /*0x1AAE*/ u8 decorations[16]; - /*0x1ABE*/ u8 decorationPos[16]; + /*0x1ABE*/ u8 decorationPositions[16]; /*0x1AD0*/ struct SecretBaseParty party; }; @@ -915,7 +915,7 @@ struct SaveBlock1 /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; /*0x169C*/ struct BerryTree berryTrees[BERRY_TREES_COUNT]; - /*0x1A9C*/ struct SecretBaseRecord secretBases[SECRET_BASES_COUNT]; + /*0x1A9C*/ struct SecretBase secretBases[SECRET_BASES_COUNT]; /*0x271C*/ u8 playerRoomDecor[12]; /*0x2728*/ u8 playerRoomDecorPos[12]; /*0x2734*/ u8 decorDesk[10]; diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index e18639faf..7fd1d1301 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -59,8 +59,8 @@ bool8 MetatileBehavior_IsSecretBasePoster(u8); bool8 MetatileBehavior_IsNormal(u8); bool8 MetatileBehavior_IsSecretBaseNorthWall(u8); bool8 MetatileBehavior_IsMB_B2_Duplicate(u8); -bool8 MetatileBehavior_IsSecretBaseLargeMatEdge(u8); -bool8 MetatileBehavior_IsLargeMatCenter(u8); +bool8 MetatileBehavior_HoldsSmallDecoration(u8); +bool8 MetatileBehavior_HoldsLargeDecoration(u8); bool8 MetatileBehavior_IsSecretBaseHole(u8); bool8 MetatileBehavior_IsSecretBaseBalloon(u8); bool8 MetatileBehavior_IsSecretBaseBreakableDoor(u8); diff --git a/include/pokemon.h b/include/pokemon.h index 150486c0e..26d715d89 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -509,7 +509,7 @@ u8 GetMonsStateToDoubles(void); u8 GetMonsStateToDoubles_2(void); u8 GetAbilityBySpecies(u16 species, bool8 altAbility); u8 GetMonAbility(struct Pokemon *mon); -void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord); +void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord); u8 GetSecretBaseTrainerPicIndex(void); u8 GetSecretBaseTrainerClass(void); bool8 IsPlayerPartyAndPokemonStorageFull(void); diff --git a/include/secret_base.h b/include/secret_base.h index 17efc314d..4e323b0c6 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -1,40 +1,30 @@ #ifndef GUARD_SECRET_BASE_H #define GUARD_SECRET_BASE_H -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations -void sub_80E9578(void); -void sub_80E980C(void); -void sub_80EB18C(struct SecretBaseRecord *dest); -void sub_80E9914(void); +void HideSecretBaseDecorationSprites(void); +void CopyCurSecretBaseOwnerName_StrVar1(void); +void ClearJapaneseSecretBases(struct SecretBase *dest); +void SetPlayerSecretBaseParty(void); u8 *GetSecretBaseMapName(u8 *dest); const u8 *GetSecretBaseTrainerLoseText(void); -void sub_80E8EE0(struct MapEvents const *events); -void sub_80E9238(u8 flagIn); -bool8 CurrentMapIsSecretBase(void); +void SetOccupiedSecretBaseEntranceMetatiles(struct MapEvents const *events); +void InitSecretBaseAppearance(bool8 hidePC); +bool8 CurMapIsSecretBase(void); void SecretBasePerStepCallback(u8 taskId); -bool8 sub_80E9680(void); -void sub_80EB498(void); -void sub_80EB56C(void); -void sub_80EB9E0(void); -void sub_80EBB28(void); +bool8 TrySetCurSecretBase(void); +void SetSecretBaseSecretsTvFlags_Poster(void); +void SetSecretBaseSecretsTvFlags_MiscFurnature(void); +void SetSecretBaseSecretsTvFlags_LargeDecorationSpot(void); +void SetSecretBaseSecretsTvFlags_SmallDecorationSpot(void); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); -bool8 sub_80E909C(void); +bool8 SecretBaseMapPopupEnabled(void); void sub_80EB218(void); -void ResetSecretBases(void); - -// SetCurrentSecretBaseFromPosition -void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events); -// SetCurrentSecretBaseVar -void sub_80E8B6C(void); -void sub_80E8BC8(void); -void sub_80E8D4C(void); +void ClearSecretBases(void); +void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const struct MapEvents *events); +void TrySetCurSecretBaseIndex(void); +void CheckPlayerHasSecretBase(void); +void ToggleSecretBaseEntranceMetatile(void); void EnableBothScriptContexts(void); void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx); - - #endif //GUARD_SECRET_BASE_H diff --git a/include/strings.h b/include/strings.h index c279cf75c..74e364232 100644 --- a/include/strings.h +++ b/include/strings.h @@ -132,7 +132,7 @@ extern const u8 gText_ApostropheSBase[]; extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; -extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_DelRegist[]; extern const u8 gText_CommErrorEllipsis[]; extern const u8 gText_MoveCloserToLinkPartner[]; extern const u8 gText_CommErrorCheckConnections[]; -- cgit v1.2.3 From 311c1b9cba09507ce7d4d99cd58735c8d0363164 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 14:34:13 +0200 Subject: Change anim tag names --- include/constants/battle_anim.h | 240 ++++++++++++++++++++-------------------- 1 file changed, 120 insertions(+), 120 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 34a45395c..f66013389 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -11,137 +11,137 @@ #define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) #define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) #define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) // unused #define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) #define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) -#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) // unused +#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused #define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) #define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) #define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused #define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) #define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) #define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) #define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) #define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) #define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) -#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) +#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused #define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) -#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) -#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) -#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) -#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) -#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) +#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) // unused +#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) // unused +#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused +#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused +#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused +#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused #define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) -#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) +#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused #define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) #define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) #define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) // unused #define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) -#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) +#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused #define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) -#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) +#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused #define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) -#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) +#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused #define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) -#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) -#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) -#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused +#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused +#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused #define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) -#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) -#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) -#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) -#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused +#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused +#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused +#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused #define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) -#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) -#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) +#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) // unused +#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused #define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) -#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) -#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) +#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused +#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused #define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) -#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) +#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused #define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) -#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) -#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) -#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) -#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) +#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused +#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused +#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused +#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused #define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) #define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) #define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) -#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) +#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused #define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) #define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) -#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) +#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused #define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) #define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) #define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) #define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) #define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) #define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) -#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) -#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) -#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) +#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused +#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused +#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused #define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) -#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) -#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) -#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) -#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) -#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) -#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) +#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused +#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused +#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused +#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused +#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused +#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused #define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) #define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) -#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) -#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) -#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) -#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) +#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused +#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused +#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused +#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused +#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused #define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) -#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) -#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) -#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) +#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused +#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused +#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused #define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) +#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) #define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) -#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) -#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) -#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) -#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) -#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) -#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) -#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) -#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) -#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) -#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) -#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) -#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) -#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) -#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) +#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused +#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused +#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused +#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused +#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused +#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused +#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused +#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused +#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused +#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused +#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused +#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused +#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused +#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused #define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) -#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) -#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) -#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) -#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) -#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) -#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) -#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) -#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) -#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) -#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) -#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) -#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) -#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) -#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) -#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) -#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) -#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) -#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) -#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused +#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused +#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused +#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused +#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused +#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused +#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused +#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused +#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused +#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused +#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused +#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused +#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused +#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused +#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused +#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused +#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused +#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused +#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused #define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) #define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) #define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) @@ -185,11 +185,11 @@ #define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) #define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) #define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) -#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) // unused #define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) #define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) #define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) -#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) +#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused #define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) #define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) #define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) @@ -211,7 +211,7 @@ #define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) #define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) -#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) +#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) #define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) #define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) @@ -276,17 +276,17 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) // unused #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) #define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) -#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) -#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) -#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused +#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused +#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused #define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) #define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) +#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused #define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) #define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) #define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) @@ -313,7 +313,7 @@ // . . // . . // 127 -// +// #define SOUND_PAN_ATTACKER -64 #define SOUND_PAN_TARGET 63 @@ -411,32 +411,32 @@ #define ANIM_WEATHER_HAIL 4 // Battle mon back animations. -#define BACK_ANIM_NONE 0x00 -#define BACK_ANIM_H_SLIDE_QUICK 0x01 -#define BACK_ANIM_H_SLIDE 0x02 -#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03 -#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04 -#define BACK_ANIM_SHRINK_GROW_1 0x05 -#define BACK_ANIM_GROW_1 0x06 -#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07 -#define BACK_ANIM_HORIZONTAL_SHAKE 0x08 -#define BACK_ANIM_VERTICAL_SHAKE 0x09 -#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a -#define BACK_ANIM_VERTICAL_STRETCH 0x0b -#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c -#define BACK_ANIM_GROW_2 0x0d -#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e -#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f -#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10 -#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11 -#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12 -#define BACK_ANIM_DIP_RIGHT_SIDE 0x13 -#define BACK_ANIM_SHRINK_GROW_2 0x14 -#define BACK_ANIM_JOLT_RIGHT 0x15 -#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16 -#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17 -#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18 -#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19 +#define BACK_ANIM_NONE 0x00 +#define BACK_ANIM_H_SLIDE_QUICK 0x01 +#define BACK_ANIM_H_SLIDE 0x02 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04 +#define BACK_ANIM_SHRINK_GROW_1 0x05 +#define BACK_ANIM_GROW_1 0x06 +#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07 +#define BACK_ANIM_HORIZONTAL_SHAKE 0x08 +#define BACK_ANIM_VERTICAL_SHAKE 0x09 +#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a +#define BACK_ANIM_VERTICAL_STRETCH 0x0b +#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c +#define BACK_ANIM_GROW_2 0x0d +#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e +#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10 +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11 +#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12 +#define BACK_ANIM_DIP_RIGHT_SIDE 0x13 +#define BACK_ANIM_SHRINK_GROW_2 0x14 +#define BACK_ANIM_JOLT_RIGHT 0x15 +#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16 +#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17 +#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18 +#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19 #endif // GUARD_CONSTANTS_BATTLE_ANIM_H -- cgit v1.2.3 From b93581b519134e24c71a9d54135c7df1fcce6b0a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 16:32:02 +0200 Subject: Rename battle anim sprites --- include/constants/battle_anim.h | 16 +- include/graphics.h | 1092 +++++++++++++++++++-------------------- 2 files changed, 554 insertions(+), 554 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index f66013389..6909d836b 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -11,10 +11,10 @@ #define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) #define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) #define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) // unused +#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) #define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) #define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) // unused +#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) #define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused #define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) #define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) @@ -28,8 +28,8 @@ #define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) #define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused #define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) // unused -#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) // unused +#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) +#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) #define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused #define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused #define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused @@ -39,7 +39,7 @@ #define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) #define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) #define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) // unused +#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) #define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) #define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused #define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) @@ -58,7 +58,7 @@ #define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) -#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) // unused +#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) #define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused #define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) #define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused @@ -185,7 +185,7 @@ #define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) #define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) #define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) -#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) // unused +#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) #define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) #define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) #define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) @@ -276,7 +276,7 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) // unused +#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) diff --git a/include/graphics.h b/include/graphics.h index 30ca2af82..c7d278668 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4122,568 +4122,568 @@ extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gContest2Pal[]; -extern const u32 gBattleAnimSpriteSheet_000[]; -extern const u32 gBattleAnimSpriteSheet_001[]; -extern const u32 gBattleAnimSpriteSheet_002[]; -extern const u32 gBattleAnimSpriteSheet_003[]; -extern const u32 gBattleAnimSpriteSheet_004[]; -extern const u32 gBattleAnimSpriteSheet_005[]; -extern const u32 gBattleAnimSpriteSheet_006[]; -extern const u32 gBattleAnimSpriteSheet_007[]; -extern const u32 gBattleAnimSpriteSheet_008[]; -extern const u32 gBattleAnimSpriteSheet_009[]; -extern const u32 gBattleAnimSpriteSheet_010[]; -extern const u32 gBattleAnimSpriteSheet_011[]; -extern const u32 gBattleAnimSpriteSheet_012[]; -extern const u32 gBattleAnimSpriteSheet_013[]; -extern const u32 gBattleAnimSpriteSheet_014[]; -extern const u32 gBattleAnimSpriteSheet_015[]; -extern const u32 gBattleAnimSpriteSheet_016[]; -extern const u32 gBattleAnimSpriteSheet_017[]; -extern const u32 gBattleAnimSpriteSheet_018[]; -extern const u32 gBattleAnimSpriteSheet_019[]; -extern const u32 gBattleAnimSpriteSheet_020[]; -extern const u32 gBattleAnimSpriteSheet_021[]; -extern const u32 gBattleAnimSpriteSheet_021[]; -extern const u32 gBattleAnimSpriteSheet_023[]; -extern const u32 gBattleAnimSpriteSheet_024[]; -extern const u32 gBattleAnimSpriteSheet_025[]; -extern const u32 gBattleAnimSpriteSheet_026[]; -extern const u32 gBattleAnimSpriteSheet_027[]; -extern const u32 gBattleAnimSpriteSheet_028[]; -extern const u32 gBattleAnimSpriteSheet_029[]; -extern const u32 gBattleAnimSpriteSheet_030[]; -extern const u32 gBattleAnimSpriteSheet_031[]; -extern const u32 gBattleAnimSpriteSheet_032[]; -extern const u32 gBattleAnimSpriteSheet_033[]; -extern const u32 gBattleAnimSpriteSheet_034[]; -extern const u32 gBattleAnimSpriteSheet_035[]; -extern const u32 gBattleAnimSpriteSheet_036[]; -extern const u32 gBattleAnimSpriteSheet_037[]; -extern const u32 gBattleAnimSpriteSheet_038[]; -extern const u32 gBattleAnimSpriteSheet_039[]; -extern const u32 gBattleAnimSpriteSheet_040[]; -extern const u32 gBattleAnimSpriteSheet_041[]; -extern const u32 gBattleAnimSpriteSheet_042[]; -extern const u32 gBattleAnimSpriteSheet_043[]; -extern const u32 gBattleAnimSpriteSheet_044[]; -extern const u32 gBattleAnimSpriteSheet_045[]; -extern const u32 gBattleAnimSpriteSheet_046[]; -extern const u32 gBattleAnimSpriteSheet_046[]; -extern const u32 gBattleAnimSpriteSheet_048[]; -extern const u32 gBattleAnimSpriteSheet_048[]; -extern const u32 gBattleAnimSpriteSheet_050[]; -extern const u32 gBattleAnimSpriteSheet_051[]; -extern const u32 gBattleAnimSpriteSheet_052[]; -extern const u32 gBattleAnimSpriteSheet_053[]; +extern const u32 gBattleAnimSpriteSheet_Bone[]; +extern const u32 gBattleAnimSpriteSheet_Spark[]; +extern const u32 gBattleAnimSpriteSheet_Pencil[]; +extern const u32 gBattleAnimSpriteSheet_AirWave[]; +extern const u32 gBattleAnimSpriteSheet_Orb[]; +extern const u32 gBattleAnimSpriteSheet_Sword[]; +extern const u32 gBattleAnimSpriteSheet_Seed[]; +extern const u32 gBattleAnimSpriteSheet_Explosion6[]; +extern const u32 gBattleAnimSpriteSheet_PinkOrb[]; +extern const u32 gBattleAnimSpriteSheet_Gust[]; +extern const u32 gBattleAnimSpriteSheet_IceCube[]; +extern const u32 gBattleAnimSpriteSheet_Spark2[]; +extern const u32 gBattleAnimSpriteSheet_Orange[]; +extern const u32 gBattleAnimSpriteSheet_YellowBall[]; +extern const u32 gBattleAnimSpriteSheet_LockOn[]; +extern const u32 gBattleAnimSpriteSheet_TiedBag[]; +extern const u32 gBattleAnimSpriteSheet_BlackSmoke[]; +extern const u32 gBattleAnimSpriteSheet_BlackBall[]; +extern const u32 gBattleAnimSpriteSheet_Conversion[]; +extern const u32 gBattleAnimSpriteSheet_Glass[]; +extern const u32 gBattleAnimSpriteSheet_HornHit[]; +extern const u32 gBattleAnimSpriteSheet_Hit[]; +extern const u32 gBattleAnimSpriteSheet_Hit[]; +extern const u32 gBattleAnimSpriteSheet_BlueShards[]; +extern const u32 gBattleAnimSpriteSheet_ClosingEye[]; +extern const u32 gBattleAnimSpriteSheet_WavingHand[]; +extern const u32 gBattleAnimSpriteSheet_HitDuplicate[]; +extern const u32 gBattleAnimSpriteSheet_Leer[]; +extern const u32 gBattleAnimSpriteSheet_BlueBurst[]; +extern const u32 gBattleAnimSpriteSheet_SmallEmber[]; +extern const u32 gBattleAnimSpriteSheet_GraySmoke[]; +extern const u32 gBattleAnimSpriteSheet_BlueStar[]; +extern const u32 gBattleAnimSpriteSheet_BubbleBurst[]; +extern const u32 gBattleAnimSpriteSheet_Fire[]; +extern const u32 gBattleAnimSpriteSheet_SpinningFire[]; +extern const u32 gBattleAnimSpriteSheet_FirePlume[]; +extern const u32 gBattleAnimSpriteSheet_Lightning2[]; +extern const u32 gBattleAnimSpriteSheet_Lightning[]; +extern const u32 gBattleAnimSpriteSheet_ClawSlash2[]; +extern const u32 gBattleAnimSpriteSheet_ClawSlash[]; +extern const u32 gBattleAnimSpriteSheet_Scratch3[]; +extern const u32 gBattleAnimSpriteSheet_Scratch2[]; +extern const u32 gBattleAnimSpriteSheet_BubbleBurst2[]; +extern const u32 gBattleAnimSpriteSheet_IceChunk[]; +extern const u32 gBattleAnimSpriteSheet_Glass2[]; +extern const u32 gBattleAnimSpriteSheet_PinkHeart2[]; +extern const u32 gBattleAnimSpriteSheet_SapDrip[]; +extern const u32 gBattleAnimSpriteSheet_SapDrip[]; +extern const u32 gBattleAnimSpriteSheet_Sparkle1[]; +extern const u32 gBattleAnimSpriteSheet_Sparkle1[]; +extern const u32 gBattleAnimSpriteSheet_HumanoidFoot[]; +extern const u32 gBattleAnimSpriteSheet_MonsterFoot[]; +extern const u32 gBattleAnimSpriteSheet_HumanoidHand[]; +extern const u32 gBattleAnimSpriteSheet_NoiseLine[]; extern const u32 gUnknown_08C2EA50[]; extern const u32 gUnknown_08C2EA9C[]; -extern const u32 gBattleAnimSpriteSheet_054[]; -extern const u32 gBattleAnimSpriteSheet_055[]; -extern const u32 gBattleAnimSpriteSheet_056[]; -extern const u32 gBattleAnimSpriteSheet_057[]; -extern const u32 gBattleAnimSpriteSheet_058[]; -extern const u32 gBattleAnimSpriteSheet_059[]; -extern const u32 gBattleAnimSpriteSheet_060[]; -extern const u32 gBattleAnimSpriteSheet_061[]; -extern const u32 gBattleAnimSpriteSheet_062[]; -extern const u32 gBattleAnimSpriteSheet_063[]; -extern const u32 gBattleAnimSpriteSheet_064[]; -extern const u32 gBattleAnimSpriteSheet_065[]; -extern const u32 gBattleAnimSpriteSheet_066[]; -extern const u32 gBattleAnimSpriteSheet_070[]; -extern const u32 gBattleAnimSpriteSheet_071[]; -extern const u32 gBattleAnimSpriteSheet_072[]; -extern const u32 gBattleAnimSpriteSheet_073[]; -extern const u32 gBattleAnimSpriteSheet_074[]; -extern const u32 gBattleAnimSpriteSheet_075[]; -extern const u32 gBattleAnimSpriteSheet_076[]; -extern const u32 gBattleAnimSpriteSheet_077[]; -extern const u32 gBattleAnimSpriteSheet_078[]; -extern const u32 gBattleAnimSpriteSheet_079[]; -extern const u32 gBattleAnimSpriteSheet_080[]; -extern const u32 gBattleAnimSpriteSheet_081[]; -extern const u32 gBattleAnimSpriteSheet_082[]; -extern const u32 gBattleAnimSpriteSheet_083[]; -extern const u32 gBattleAnimSpriteSheet_084[]; -extern const u32 gBattleAnimSpriteSheet_085[]; -extern const u32 gBattleAnimSpriteSheet_086[]; -extern const u32 gBattleAnimSpriteSheet_087[]; -extern const u32 gBattleAnimSpriteSheet_088[]; -extern const u32 gBattleAnimSpriteSheet_089[]; -extern const u32 gBattleAnimSpriteSheet_090[]; -extern const u32 gBattleAnimSpriteSheet_091[]; -extern const u32 gBattleAnimSpriteSheet_092[]; -extern const u32 gBattleAnimSpriteSheet_093[]; -extern const u32 gBattleAnimSpriteSheet_094[]; -extern const u32 gBattleAnimSpriteSheet_095[]; -extern const u32 gBattleAnimSpriteSheet_096[]; -extern const u32 gBattleAnimSpriteSheet_097[]; -extern const u32 gBattleAnimSpriteSheet_098[]; -extern const u32 gBattleAnimSpriteSheet_099[]; -extern const u32 gBattleAnimSpriteSheet_100[]; -extern const u32 gBattleAnimSpriteSheet_101[]; -extern const u32 gBattleAnimSpriteSheet_102[]; -extern const u32 gBattleAnimSpriteSheet_103[]; -extern const u32 gBattleAnimSpriteSheet_104[]; -extern const u32 gBattleAnimSpriteSheet_105[]; -extern const u32 gBattleAnimSpriteSheet_106[]; -extern const u32 gBattleAnimSpriteSheet_107[]; -extern const u32 gBattleAnimSpriteSheet_108[]; -extern const u32 gBattleAnimSpriteSheet_109[]; -extern const u32 gBattleAnimSpriteSheet_110[]; -extern const u32 gBattleAnimSpriteSheet_111[]; -extern const u32 gBattleAnimSpriteSheet_112[]; -extern const u32 gBattleAnimSpriteSheet_113[]; -extern const u32 gBattleAnimSpriteSheet_114[]; -extern const u32 gBattleAnimSpriteSheet_115[]; -extern const u32 gBattleAnimSpriteSheet_116[]; -extern const u32 gBattleAnimSpriteSheet_117[]; -extern const u32 gBattleAnimSpriteSheet_118[]; -extern const u32 gBattleAnimSpriteSheet_119[]; -extern const u32 gBattleAnimSpriteSheet_120[]; -extern const u32 gBattleAnimSpriteSheet_121[]; -extern const u32 gBattleAnimSpriteSheet_122[]; -extern const u32 gBattleAnimSpriteSheet_123[]; -extern const u32 gBattleAnimSpriteSheet_124[]; -extern const u32 gBattleAnimSpriteSheet_125[]; -extern const u32 gBattleAnimSpriteSheet_126[]; -extern const u32 gBattleAnimSpriteSheet_127[]; -extern const u32 gBattleAnimSpriteSheet_128[]; -extern const u32 gBattleAnimSpriteSheet_129[]; -extern const u32 gBattleAnimSpriteSheet_130[]; -extern const u32 gBattleAnimSpriteSheet_131[]; -extern const u32 gBattleAnimSpriteSheet_132[]; -extern const u32 gBattleAnimSpriteSheet_133[]; -extern const u32 gBattleAnimSpriteSheet_134[]; -extern const u32 gBattleAnimSpriteSheet_135[]; +extern const u32 gBattleAnimSpriteSheet_YellowUnk[]; +extern const u32 gBattleAnimSpriteSheet_RedFist[]; +extern const u32 gBattleAnimSpriteSheet_SlamHit[]; +extern const u32 gBattleAnimSpriteSheet_Ring[]; +extern const u32 gBattleAnimSpriteSheet_Rocks[]; +extern const u32 gBattleAnimSpriteSheet_Z[]; +extern const u32 gBattleAnimSpriteSheet_YellowUnk2[]; +extern const u32 gBattleAnimSpriteSheet_AirSlash[]; +extern const u32 gBattleAnimSpriteSheet_SpinningGreenOrbs[]; +extern const u32 gBattleAnimSpriteSheet_Leaf[]; +extern const u32 gBattleAnimSpriteSheet_Finger[]; +extern const u32 gBattleAnimSpriteSheet_PoisonPowder[]; +extern const u32 gBattleAnimSpriteSheet_BrownTriangle[]; +extern const u32 gBattleAnimSpriteSheet_Sparkle3[]; +extern const u32 gBattleAnimSpriteSheet_Sparkle4[]; +extern const u32 gBattleAnimSpriteSheet_MusicNotes[]; +extern const u32 gBattleAnimSpriteSheet_Duck[]; +extern const u32 gBattleAnimSpriteSheet_MudSand[]; +extern const u32 gBattleAnimSpriteSheet_Alert[]; +extern const u32 gBattleAnimSpriteSheet_BlueFlames[]; +extern const u32 gBattleAnimSpriteSheet_BlueFlames2[]; +extern const u32 gBattleAnimSpriteSheet_Shock4[]; +extern const u32 gBattleAnimSpriteSheet_Shock[]; +extern const u32 gBattleAnimSpriteSheet_Bell2[]; +extern const u32 gBattleAnimSpriteSheet_PinkGlove[]; +extern const u32 gBattleAnimSpriteSheet_BlueLines[]; +extern const u32 gBattleAnimSpriteSheet_Impact3[]; +extern const u32 gBattleAnimSpriteSheet_Impact2[]; +extern const u32 gBattleAnimSpriteSheet_Reticle[]; +extern const u32 gBattleAnimSpriteSheet_Breath[]; +extern const u32 gBattleAnimSpriteSheet_Anger[]; +extern const u32 gBattleAnimSpriteSheet_Snowball[]; +extern const u32 gBattleAnimSpriteSheet_Vine[]; +extern const u32 gBattleAnimSpriteSheet_Sword2[]; +extern const u32 gBattleAnimSpriteSheet_Clapping[]; +extern const u32 gBattleAnimSpriteSheet_RedTube[]; +extern const u32 gBattleAnimSpriteSheet_Amnesia[]; +extern const u32 gBattleAnimSpriteSheet_String2[]; +extern const u32 gBattleAnimSpriteSheet_Pencil2[]; +extern const u32 gBattleAnimSpriteSheet_Petal[]; +extern const u32 gBattleAnimSpriteSheet_BentSpoon[]; +extern const u32 gBattleAnimSpriteSheet_Web[]; +extern const u32 gBattleAnimSpriteSheet_MilkBottle[]; +extern const u32 gBattleAnimSpriteSheet_Coin[]; +extern const u32 gBattleAnimSpriteSheet_CrackedEgg[]; +extern const u32 gBattleAnimSpriteSheet_HatchedEgg[]; +extern const u32 gBattleAnimSpriteSheet_FreshEgg[]; +extern const u32 gBattleAnimSpriteSheet_Fangs[]; +extern const u32 gBattleAnimSpriteSheet_Explosion2[]; +extern const u32 gBattleAnimSpriteSheet_Explosion3[]; +extern const u32 gBattleAnimSpriteSheet_WaterDroplet[]; +extern const u32 gBattleAnimSpriteSheet_WaterDroplet2[]; +extern const u32 gBattleAnimSpriteSheet_Seed2[]; +extern const u32 gBattleAnimSpriteSheet_Sprout[]; +extern const u32 gBattleAnimSpriteSheet_RedWand[]; +extern const u32 gBattleAnimSpriteSheet_PurpleGreenUnk[]; +extern const u32 gBattleAnimSpriteSheet_WaterColumn[]; +extern const u32 gBattleAnimSpriteSheet_MudUnk[]; +extern const u32 gBattleAnimSpriteSheet_RainDrops[]; +extern const u32 gBattleAnimSpriteSheet_FurySwipes[]; +extern const u32 gBattleAnimSpriteSheet_Vine2[]; +extern const u32 gBattleAnimSpriteSheet_Teeth[]; +extern const u32 gBattleAnimSpriteSheet_Bone2[]; +extern const u32 gBattleAnimSpriteSheet_WhiteBag[]; +extern const u32 gBattleAnimSpriteSheet_Unknown[]; +extern const u32 gBattleAnimSpriteSheet_PurpleCoral[]; +extern const u32 gBattleAnimSpriteSheet_PurpleDroplet[]; +extern const u32 gBattleAnimSpriteSheet_Shock2[]; +extern const u32 gBattleAnimSpriteSheet_ClosingEye2[]; +extern const u32 gBattleAnimSpriteSheet_MetalBall[]; +extern const u32 gBattleAnimSpriteSheet_MonsterDoll[]; +extern const u32 gBattleAnimSpriteSheet_Whirlwind[]; +extern const u32 gBattleAnimSpriteSheet_Whirlwind2[]; +extern const u32 gBattleAnimSpriteSheet_Explosion4[]; +extern const u32 gBattleAnimSpriteSheet_Explosion5[]; +extern const u32 gBattleAnimSpriteSheet_Tongue[]; +extern const u32 gBattleAnimSpriteSheet_Smoke[]; +extern const u32 gBattleAnimSpriteSheet_Smoke2[]; +extern const u32 gBattleAnimSpriteSheet_Impact[]; extern const u32 gBattleAnimSpriteSheet_Particles[]; -extern const u32 gBattleAnimSpriteSheet_136[]; -extern const u32 gBattleAnimSpriteSheet_137[]; -extern const u32 gBattleAnimSpriteSheet_138[]; -extern const u32 gBattleAnimSpriteSheet_139[]; -extern const u32 gBattleAnimSpriteSheet_140[]; -extern const u32 gBattleAnimSpriteSheet_141[]; -extern const u32 gBattleAnimSpriteSheet_142[]; -extern const u32 gBattleAnimSpriteSheet_143[]; -extern const u32 gBattleAnimSpriteSheet_144[]; -extern const u32 gBattleAnimSpriteSheet_145[]; +extern const u32 gBattleAnimSpriteSheet_CircleImpact[]; +extern const u32 gBattleAnimSpriteSheet_Scratch[]; +extern const u32 gBattleAnimSpriteSheet_Cut[]; +extern const u32 gBattleAnimSpriteSheet_SharpTeeth[]; +extern const u32 gBattleAnimSpriteSheet_RainbowRings[]; +extern const u32 gBattleAnimSpriteSheet_IceCrystals[]; +extern const u32 gBattleAnimSpriteSheet_IceSpikes[]; +extern const u32 gBattleAnimSpriteSheet_HandsAndFeet[]; +extern const u32 gBattleAnimSpriteSheet_MistCloud[]; +extern const u32 gBattleAnimSpriteSheet_Clamp[]; //extern const struct CompressedSpriteSheet gBattleAnimSpriteSheet_146[]; -extern const u32 gBattleAnimSpriteSheet_146[]; -extern const u32 gBattleAnimSpriteSheet_147[]; -extern const u32 gBattleAnimSpriteSheet_148[]; -extern const u32 gBattleAnimSpriteSheet_149[]; -extern const u32 gBattleAnimSpriteSheet_150[]; -extern const u32 gBattleAnimSpriteSheet_151[]; -extern const u32 gBattleAnimSpriteSheet_152[]; -extern const u32 gBattleAnimSpriteSheet_153[]; -extern const u32 gBattleAnimSpriteSheet_154[]; -extern const u32 gBattleAnimSpriteSheet_155[]; -extern const u32 gBattleAnimSpriteSheet_156[]; -extern const u32 gBattleAnimSpriteSheet_157[]; -extern const u32 gBattleAnimSpriteSheet_158[]; -extern const u32 gBattleAnimSpriteSheet_159[]; -extern const u32 gBattleAnimSpriteSheet_160[]; -extern const u32 gBattleAnimSpriteSheet_161[]; -extern const u32 gBattleAnimSpriteSheet_162[]; -extern const u32 gBattleAnimSpriteSheet_163[]; -extern const u32 gBattleAnimSpriteSheet_166[]; -extern const u32 gBattleAnimSpriteSheet_171[]; -extern const u32 gBattleAnimSpriteSheet_173[]; -extern const u32 gBattleAnimSpriteSheet_174[]; -extern const u32 gBattleAnimSpriteSheet_175[]; -extern const u32 gBattleAnimSpriteSheet_176[]; -extern const u32 gBattleAnimSpriteSheet_177[]; -extern const u32 gBattleAnimSpriteSheet_178[]; -extern const u32 gBattleAnimSpriteSheet_179[]; -extern const u32 gBattleAnimSpriteSheet_180[]; -extern const u32 gBattleAnimSpriteSheet_181[]; -extern const u32 gBattleAnimSpriteSheet_182[]; -extern const u32 gBattleAnimSpriteSheet_183[]; -extern const u32 gBattleAnimSpriteSheet_184[]; -extern const u32 gBattleAnimSpriteSheet_185[]; -extern const u32 gBattleAnimSpriteSheet_186[]; -extern const u32 gBattleAnimSpriteSheet_187[]; -extern const u32 gBattleAnimSpriteSheet_188[]; -extern const u32 gBattleAnimSpriteSheet_189[]; -extern const u32 gBattleAnimSpriteSheet_190[]; -extern const u32 gBattleAnimSpriteSheet_191[]; -extern const u32 gBattleAnimSpriteSheet_192[]; -extern const u32 gBattleAnimSpriteSheet_193[]; -extern const u32 gBattleAnimSpriteSheet_194[]; -extern const u32 gBattleAnimSpriteSheet_195[]; -extern const u32 gBattleAnimSpriteSheet_196[]; -extern const u32 gBattleAnimSpriteSheet_197[]; -extern const u32 gBattleAnimSpriteSheet_198[]; -extern const u32 gBattleAnimSpriteSheet_199[]; -extern const u32 gBattleAnimSpriteSheet_200[]; -extern const u32 gBattleAnimSpriteSheet_201[]; -extern const u32 gBattleAnimSpriteSheet_202[]; -extern const u32 gBattleAnimSpriteSheet_203[]; -extern const u32 gBattleAnimSpriteSheet_204[]; -extern const u32 gBattleAnimSpriteSheet_205[]; -extern const u32 gBattleAnimSpriteSheet_206[]; -extern const u32 gBattleAnimSpriteSheet_207[]; -extern const u32 gBattleAnimSpriteSheet_208[]; -extern const u32 gBattleAnimSpriteSheet_209[]; -extern const u32 gBattleAnimSpriteSheet_210[]; -extern const u32 gBattleAnimSpriteSheet_211[]; -extern const u32 gBattleAnimSpriteSheet_212[]; -extern const u32 gBattleAnimSpriteSheet_213[]; -extern const u32 gBattleAnimSpriteSheet_214[]; -extern const u32 gBattleAnimSpriteSheet_215[]; -extern const u32 gBattleAnimSpriteSheet_210[]; -extern const u32 gBattleAnimSpriteSheet_217[]; -extern const u32 gBattleAnimSpriteSheet_218[]; -extern const u32 gBattleAnimSpriteSheet_210[]; -extern const u32 gBattleAnimSpriteSheet_220[]; -extern const u32 gBattleAnimSpriteSheet_221[]; -extern const u32 gBattleAnimSpriteSheet_222[]; -extern const u32 gBattleAnimSpriteSheet_223[]; -extern const u32 gBattleAnimSpriteSheet_224[]; -extern const u32 gBattleAnimSpriteSheet_225[]; -extern const u32 gBattleAnimSpriteSheet_226[]; -extern const u32 gBattleAnimSpriteSheet_227[]; -extern const u32 gBattleAnimSpriteSheet_228[]; -extern const u32 gBattleAnimSpriteSheet_229[]; -extern const u32 gBattleAnimSpriteSheet_230[]; -extern const u32 gBattleAnimSpriteSheet_231[]; -extern const u32 gBattleAnimSpriteSheet_232[]; -extern const u32 gBattleAnimSpriteSheet_233[]; -extern const u32 gBattleAnimSpriteSheet_234[]; -extern const u32 gBattleAnimSpriteSheet_235[]; -extern const u32 gBattleAnimSpriteSheet_235[]; -extern const u32 gBattleAnimSpriteSheet_235[]; -extern const u32 gBattleAnimSpriteSheet_238[]; -extern const u32 gBattleAnimSpriteSheet_239[]; -extern const u32 gBattleAnimSpriteSheet_240[]; -extern const u32 gBattleAnimSpriteSheet_241[]; -extern const u32 gBattleAnimSpriteSheet_242[]; -extern const u32 gBattleAnimSpriteSheet_243[]; -extern const u32 gBattleAnimSpriteSheet_244[]; -extern const u32 gBattleAnimSpriteSheet_245[]; -extern const u32 gBattleAnimSpriteSheet_246[]; -extern const u32 gBattleAnimSpriteSheet_247[]; -extern const u32 gBattleAnimSpriteSheet_248[]; -extern const u32 gBattleAnimSpriteSheet_249[]; -extern const u32 gBattleAnimSpriteSheet_250[]; -extern const u32 gBattleAnimSpriteSheet_251[]; -extern const u32 gBattleAnimSpriteSheet_252[]; -extern const u32 gBattleAnimSpriteSheet_253[]; -extern const u32 gBattleAnimSpriteSheet_254[]; -extern const u32 gBattleAnimSpriteSheet_255[]; -extern const u32 gBattleAnimSpriteSheet_256[]; -extern const u32 gBattleAnimSpriteSheet_257[]; -extern const u32 gBattleAnimSpriteSheet_258[]; -extern const u32 gBattleAnimSpriteSheet_260[]; -extern const u32 gBattleAnimSpriteSheet_261[]; -extern const u32 gBattleAnimSpriteSheet_262[]; -extern const u32 gBattleAnimSpriteSheet_263[]; -extern const u32 gBattleAnimSpriteSheet_264[]; -extern const u32 gBattleAnimSpriteSheet_266[]; -extern const u32 gBattleAnimSpriteSheet_269[]; -extern const u32 gBattleAnimSpriteSheet_270[]; -extern const u32 gBattleAnimSpriteSheet_271[]; -extern const u32 gBattleAnimSpriteSheet_272[]; -extern const u32 gBattleAnimSpriteSheet_273[]; -extern const u32 gBattleAnimSpriteSheet_274[]; -extern const u32 gBattleAnimSpriteSheet_275[]; -extern const u32 gBattleAnimSpriteSheet_276[]; -extern const u32 gBattleAnimSpriteSheet_277[]; -extern const u32 gBattleAnimSpriteSheet_278[]; -extern const u32 gBattleAnimSpriteSheet_279[]; -extern const u32 gBattleAnimSpriteSheet_280[]; -extern const u32 gBattleAnimSpriteSheet_281[]; -extern const u32 gBattleAnimSpriteSheet_282[]; -extern const u32 gBattleAnimSpriteSheet_283[]; +extern const u32 gBattleAnimSpriteSheet_Bubble[]; +extern const u32 gBattleAnimSpriteSheet_Orbs[]; +extern const u32 gBattleAnimSpriteSheet_WaterImpact[]; +extern const u32 gBattleAnimSpriteSheet_WaterOrb[]; +extern const u32 gBattleAnimSpriteSheet_PoisonBubble[]; +extern const u32 gBattleAnimSpriteSheet_ToxicBubble[]; +extern const u32 gBattleAnimSpriteSheet_Spikes[]; +extern const u32 gBattleAnimSpriteSheet_HornHit2[]; +extern const u32 gBattleAnimSpriteSheet_AirWave2[]; +extern const u32 gBattleAnimSpriteSheet_SmallBubbles[]; +extern const u32 gBattleAnimSpriteSheet_RoundShadow[]; +extern const u32 gBattleAnimSpriteSheet_Sunlight[]; +extern const u32 gBattleAnimSpriteSheet_Spore[]; +extern const u32 gBattleAnimSpriteSheet_Flower[]; +extern const u32 gBattleAnimSpriteSheet_RazorLeaf[]; +extern const u32 gBattleAnimSpriteSheet_Needle[]; +extern const u32 gBattleAnimSpriteSheet_WhirlwindLines[]; +extern const u32 gBattleAnimSpriteSheet_GoldRing[]; +extern const u32 gBattleAnimSpriteSheet_GreenLightWall[]; +extern const u32 gBattleAnimSpriteSheet_BlackBall2[]; +extern const u32 gBattleAnimSpriteSheet_SparkH[]; +extern const u32 gBattleAnimSpriteSheet_YellowStar[]; +extern const u32 gBattleAnimSpriteSheet_LargeFreshEgg[]; +extern const u32 gBattleAnimSpriteSheet_ShadowBall[]; +extern const u32 gBattleAnimSpriteSheet_Lick[]; +extern const u32 gBattleAnimSpriteSheet_VoidLines[]; +extern const u32 gBattleAnimSpriteSheet_String[]; +extern const u32 gBattleAnimSpriteSheet_WebThread[]; +extern const u32 gBattleAnimSpriteSheet_SpiderWeb[]; +extern const u32 gBattleAnimSpriteSheet_Lightbulb[]; +extern const u32 gBattleAnimSpriteSheet_Slash[]; +extern const u32 gBattleAnimSpriteSheet_FocusEnergy[]; +extern const u32 gBattleAnimSpriteSheet_SphereToCube[]; +extern const u32 gBattleAnimSpriteSheet_Tendrils[]; +extern const u32 gBattleAnimSpriteSheet_Eye[]; +extern const u32 gBattleAnimSpriteSheet_WhiteShadow[]; +extern const u32 gBattleAnimSpriteSheet_TealAlert[]; +extern const u32 gBattleAnimSpriteSheet_OpeningEye[]; +extern const u32 gBattleAnimSpriteSheet_RoundWhiteHalo[]; +extern const u32 gBattleAnimSpriteSheet_FangAttack[]; +extern const u32 gBattleAnimSpriteSheet_PurpleHandOutline[]; +extern const u32 gBattleAnimSpriteSheet_Moon[]; +extern const u32 gBattleAnimSpriteSheet_GreenSparkle[]; +extern const u32 gBattleAnimSpriteSheet_Spiral[]; +extern const u32 gBattleAnimSpriteSheet_SnoreZ[]; +extern const u32 gBattleAnimSpriteSheet_Explosion[]; +extern const u32 gBattleAnimSpriteSheet_Nail[]; +extern const u32 gBattleAnimSpriteSheet_GhostlySpirit[]; +extern const u32 gBattleAnimSpriteSheet_WarmRock[]; +extern const u32 gBattleAnimSpriteSheet_BreakingEgg[]; +extern const u32 gBattleAnimSpriteSheet_ThinRing[]; +extern const u32 gBattleAnimSpriteSheet_PunchImpact[]; +extern const u32 gBattleAnimSpriteSheet_Bell[]; +extern const u32 gBattleAnimSpriteSheet_MusicNotes2[]; +extern const u32 gBattleAnimSpriteSheet_SpeedDust[]; +extern const u32 gBattleAnimSpriteSheet_TornMetal[]; +extern const u32 gBattleAnimSpriteSheet_ThoughtBubble[]; +extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; +extern const u32 gBattleAnimSpriteSheet_ElectricOrbs[]; +extern const u32 gBattleAnimSpriteSheet_CircleOfLight[]; +extern const u32 gBattleAnimSpriteSheet_Electricity[]; +extern const u32 gBattleAnimSpriteSheet_Finger2[]; +extern const u32 gBattleAnimSpriteSheet_MovementWaves[]; +extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; +extern const u32 gBattleAnimSpriteSheet_RedOrb[]; +extern const u32 gBattleAnimSpriteSheet_EyeSparkle[]; +extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; +extern const u32 gBattleAnimSpriteSheet_Angel[]; +extern const u32 gBattleAnimSpriteSheet_Devil[]; +extern const u32 gBattleAnimSpriteSheet_Swipe[]; +extern const u32 gBattleAnimSpriteSheet_Roots[]; +extern const u32 gBattleAnimSpriteSheet_ItemBag[]; +extern const u32 gBattleAnimSpriteSheet_JaggedMusicNote[]; +extern const u32 gBattleAnimSpriteSheet_Pokeball[]; +extern const u32 gBattleAnimSpriteSheet_Spotlight[]; +extern const u32 gBattleAnimSpriteSheet_LetterZ[]; +extern const u32 gBattleAnimSpriteSheet_RapidSpin[]; +extern const u32 gBattleAnimSpriteSheet_TriForceTriangle[]; +extern const u32 gBattleAnimSpriteSheet_WispOrb[]; +extern const u32 gBattleAnimSpriteSheet_WispFire[]; +extern const u32 gBattleAnimSpriteSheet_GoldStars[]; +extern const u32 gBattleAnimSpriteSheet_EclipsingOrb[]; +extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; +extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; +extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; +extern const u32 gBattleAnimSpriteSheet_PinkPetal[]; +extern const u32 gBattleAnimSpriteSheet_PainSplit[]; +extern const u32 gBattleAnimSpriteSheet_Confetti[]; +extern const u32 gBattleAnimSpriteSheet_GreenStar[]; +extern const u32 gBattleAnimSpriteSheet_PinkCloud[]; +extern const u32 gBattleAnimSpriteSheet_SweatDrop[]; +extern const u32 gBattleAnimSpriteSheet_GuardRing[]; +extern const u32 gBattleAnimSpriteSheet_PurpleScratch[]; +extern const u32 gBattleAnimSpriteSheet_PurpleSwipe[]; +extern const u32 gBattleAnimSpriteSheet_TagHand[]; +extern const u32 gBattleAnimSpriteSheet_SmallRedEye[]; +extern const u32 gBattleAnimSpriteSheet_HollowOrb[]; +extern const u32 gBattleAnimSpriteSheet_XSign[]; +extern const u32 gBattleAnimSpriteSheet_BluegreenOrb[]; +extern const u32 gBattleAnimSpriteSheet_PawPrint[]; +extern const u32 gBattleAnimSpriteSheet_PurpleFlame[]; +extern const u32 gBattleAnimSpriteSheet_RedBall[]; +extern const u32 gBattleAnimSpriteSheet_SmellingsaltEffect[]; +extern const u32 gBattleAnimSpriteSheet_Meteor[]; +extern const u32 gBattleAnimSpriteSheet_FlatRock[]; +extern const u32 gBattleAnimSpriteSheet_MagnifyingGlass[]; +extern const u32 gBattleAnimSpriteSheet_MetalSoundWaves[]; +extern const u32 gBattleAnimSpriteSheet_FlyingDirt[]; +extern const u32 gBattleAnimSpriteSheet_IcicleSpear[]; +extern const u32 gBattleAnimSpriteSheet_Hail[]; +extern const u32 gBattleAnimSpriteSheet_GlowyRedOrb[]; +extern const u32 gBattleAnimSpriteSheet_GreenSpike[]; +extern const u32 gBattleAnimSpriteSheet_RedBrick[]; +extern const u32 gBattleAnimSpriteSheet_WhiteFeather[]; +extern const u32 gBattleAnimSpriteSheet_Sparkle6[]; +extern const u32 gBattleAnimSpriteSheet_Splash[]; +extern const u32 gBattleAnimSpriteSheet_SweatBead[]; +extern const u32 gBattleAnimSpriteSheet_Gem1[]; +extern const u32 gBattleAnimSpriteSheet_Gem2[]; +extern const u32 gBattleAnimSpriteSheet_Gem3[]; +extern const u32 gBattleAnimSpriteSheet_SlamHit2[]; +extern const u32 gBattleAnimSpriteSheet_Recycle[]; +extern const u32 gBattleAnimSpriteSheet_RedParticles[]; +extern const u32 gBattleAnimSpriteSheet_Protect[]; +extern const u32 gBattleAnimSpriteSheet_DirtMound[]; +extern const u32 gBattleAnimSpriteSheet_Shock3[]; +extern const u32 gBattleAnimSpriteSheet_WeatherBall[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; -extern const u32 gBattleAnimSpriteSheet_284[]; -extern const u32 gBattleAnimSpriteSheet_285[]; +extern const u32 gBattleAnimSpriteSheet_Bird[]; +extern const u32 gBattleAnimSpriteSheet_CrossImpact[]; -extern const u32 gBattleAnimSpritePalette_000[]; -extern const u32 gBattleAnimSpritePalette_001[]; -extern const u32 gBattleAnimSpritePalette_002[]; -extern const u32 gBattleAnimSpritePalette_003[]; -extern const u32 gBattleAnimSpritePalette_004[]; -extern const u32 gBattleAnimSpritePalette_005[]; -extern const u32 gBattleAnimSpritePalette_006[]; -extern const u32 gBattleAnimSpritePalette_007[]; -extern const u32 gBattleAnimSpritePalette_008[]; -extern const u32 gBattleAnimSpritePalette_009[]; -extern const u32 gBattleAnimSpritePalette_010[]; -extern const u32 gBattleAnimSpritePalette_011[]; -extern const u32 gBattleAnimSpritePalette_012[]; -extern const u32 gBattleAnimSpritePalette_013[]; -extern const u32 gBattleAnimSpritePalette_014[]; -extern const u32 gBattleAnimSpritePalette_015[]; -extern const u32 gBattleAnimSpritePalette_016[]; -extern const u32 gBattleAnimSpritePalette_016[]; -extern const u32 gBattleAnimSpritePalette_018[]; -extern const u32 gBattleAnimSpritePalette_019[]; -extern const u32 gBattleAnimSpritePalette_020[]; -extern const u32 gBattleAnimSpritePalette_021[]; -extern const u32 gBattleAnimSpritePalette_022[]; -extern const u32 gBattleAnimSpritePalette_023[]; -extern const u32 gBattleAnimSpritePalette_024[]; -extern const u32 gBattleAnimSpritePalette_025[]; -extern const u32 gBattleAnimSpritePalette_026[]; -extern const u32 gBattleAnimSpritePalette_027[]; -extern const u32 gBattleAnimSpritePalette_028[]; -extern const u32 gBattleAnimSpritePalette_029[]; -extern const u32 gBattleAnimSpritePalette_030[]; -extern const u32 gBattleAnimSpritePalette_031[]; -extern const u32 gBattleAnimSpritePalette_032[]; -extern const u32 gBattleAnimSpritePalette_033[]; -extern const u32 gBattleAnimSpritePalette_033[]; -extern const u32 gBattleAnimSpritePalette_033[]; -extern const u32 gBattleAnimSpritePalette_036[]; -extern const u32 gBattleAnimSpritePalette_036[]; -extern const u32 gBattleAnimSpritePalette_038[]; -extern const u32 gBattleAnimSpritePalette_039[]; -extern const u32 gBattleAnimSpritePalette_038[]; -extern const u32 gBattleAnimSpritePalette_038[]; -extern const u32 gBattleAnimSpritePalette_042[]; -extern const u32 gBattleAnimSpritePalette_043[]; -extern const u32 gBattleAnimSpritePalette_044[]; -extern const u32 gBattleAnimSpritePalette_045[]; -extern const u32 gBattleAnimSpritePalette_046[]; -extern const u32 gBattleAnimSpritePalette_047[]; -extern const u32 gBattleAnimSpritePalette_048[]; -extern const u32 gBattleAnimSpritePalette_049[]; -extern const u32 gBattleAnimSpritePalette_050[]; -extern const u32 gBattleAnimSpritePalette_050[]; -extern const u32 gBattleAnimSpritePalette_050[]; -extern const u32 gBattleAnimSpritePalette_026[]; -extern const u32 gBattleAnimSpritePalette_054[]; -extern const u32 gBattleAnimSpritePalette_050[]; -extern const u32 gBattleAnimSpritePalette_056[]; -extern const u32 gBattleAnimSpritePalette_057[]; -extern const u32 gBattleAnimSpritePalette_058[]; -extern const u32 gBattleAnimSpritePalette_059[]; -extern const u32 gBattleAnimSpritePalette_060[]; -extern const u32 gBattleAnimSpritePalette_061[]; -extern const u32 gBattleAnimSpritePalette_062[]; -extern const u32 gBattleAnimSpritePalette_063[]; -extern const u32 gBattleAnimSpritePalette_064[]; -extern const u32 gBattleAnimSpritePalette_065[]; -extern const u32 gBattleAnimSpritePalette_066[]; -extern const u32 gBattleAnimSpritePalette_067[]; -extern const u32 gBattleAnimSpritePalette_068[]; -extern const u32 gBattleAnimSpritePalette_065[]; -extern const u32 gBattleAnimSpritePalette_070[]; -extern const u32 gBattleAnimSpritePalette_070[]; -extern const u32 gBattleAnimSpritePalette_072[]; -extern const u32 gBattleAnimSpritePalette_073[]; -extern const u32 gBattleAnimSpritePalette_074[]; -extern const u32 gBattleAnimSpritePalette_075[]; -extern const u32 gBattleAnimSpritePalette_076[]; -extern const u32 gBattleAnimSpritePalette_076[]; -extern const u32 gBattleAnimSpritePalette_078[]; -extern const u32 gBattleAnimSpritePalette_078[]; -extern const u32 gBattleAnimSpritePalette_080[]; -extern const u32 gBattleAnimSpritePalette_081[]; -extern const u32 gBattleAnimSpritePalette_082[]; -extern const u32 gBattleAnimSpritePalette_083[]; -extern const u32 gBattleAnimSpritePalette_084[]; -extern const u32 gBattleAnimSpritePalette_085[]; -extern const u32 gBattleAnimSpritePalette_086[]; -extern const u32 gBattleAnimSpritePalette_087[]; -extern const u32 gBattleAnimSpritePalette_088[]; -extern const u32 gBattleAnimSpritePalette_089[]; -extern const u32 gBattleAnimSpritePalette_090[]; -extern const u32 gBattleAnimSpritePalette_091[]; -extern const u32 gBattleAnimSpritePalette_092[]; -extern const u32 gBattleAnimSpritePalette_093[]; -extern const u32 gBattleAnimSpritePalette_094[]; -extern const u32 gBattleAnimSpritePalette_095[]; -extern const u32 gBattleAnimSpritePalette_096[]; -extern const u32 gBattleAnimSpritePalette_097[]; -extern const u32 gBattleAnimSpritePalette_094[]; -extern const u32 gBattleAnimSpritePalette_099[]; -extern const u32 gBattleAnimSpritePalette_100[]; -extern const u32 gBattleAnimSpritePalette_101[]; -extern const u32 gBattleAnimSpritePalette_101[]; -extern const u32 gBattleAnimSpritePalette_103[]; -extern const u32 gBattleAnimSpritePalette_104[]; -extern const u32 gBattleAnimSpritePalette_105[]; -extern const u32 gBattleAnimSpritePalette_105[]; -extern const u32 gBattleAnimSpritePalette_107[]; -extern const u32 gBattleAnimSpritePalette_107[]; -extern const u32 gBattleAnimSpritePalette_109[]; -extern const u32 gBattleAnimSpritePalette_109[]; -extern const u32 gBattleAnimSpritePalette_111[]; -extern const u32 gBattleAnimSpritePalette_112[]; -extern const u32 gBattleAnimSpritePalette_113[]; -extern const u32 gBattleAnimSpritePalette_114[]; -extern const u32 gBattleAnimSpritePalette_115[]; -extern const u32 gBattleAnimSpritePalette_116[]; -extern const u32 gBattleAnimSpritePalette_117[]; -extern const u32 gBattleAnimSpritePalette_118[]; -extern const u32 gBattleAnimSpritePalette_119[]; -extern const u32 gBattleAnimSpritePalette_120[]; -extern const u32 gBattleAnimSpritePalette_121[]; -extern const u32 gBattleAnimSpritePalette_122[]; -extern const u32 gBattleAnimSpritePalette_122[]; -extern const u32 gBattleAnimSpritePalette_124[]; -extern const u32 gBattleAnimSpritePalette_125[]; -extern const u32 gBattleAnimSpritePalette_126[]; -extern const u32 gBattleAnimSpritePalette_127[]; -extern const u32 gBattleAnimSpritePalette_128[]; -extern const u32 gBattleAnimSpritePalette_128[]; -extern const u32 gBattleAnimSpritePalette_130[]; -extern const u32 gBattleAnimSpritePalette_130[]; -extern const u32 gBattleAnimSpritePalette_132[]; -extern const u32 gBattleAnimSpritePalette_133[]; -extern const u32 gBattleAnimSpritePalette_133[]; -extern const u32 gBattleAnimSpritePalette_135[]; -extern const u32 gBattleAnimSpritePalette_136[]; -extern const u32 gBattleAnimSpritePalette_135[]; -extern const u32 gBattleAnimSpritePalette_135[]; -extern const u32 gBattleAnimSpritePalette_139[]; -extern const u32 gBattleAnimSpritePalette_140[]; -extern const u32 gBattleAnimSpritePalette_141[]; -extern const u32 gBattleAnimSpritePalette_141[]; -extern const u32 gBattleAnimSpritePalette_143[]; -extern const u32 gBattleAnimSpritePalette_144[]; -extern const u32 gBattleAnimSpritePalette_139[]; -extern const u32 gBattleAnimSpritePalette_115[]; -extern const u32 gBattleAnimSpritePalette_147[]; -extern const u32 gBattleAnimSpritePalette_148[]; -extern const u32 gBattleAnimSpritePalette_148[]; -extern const u32 gBattleAnimSpritePalette_150[]; -extern const u32 gBattleAnimSpritePalette_150[]; -extern const u32 gBattleAnimSpritePalette_152[]; -extern const u32 gBattleAnimSpritePalette_153[]; -extern const u32 gBattleAnimSpritePalette_154[]; -extern const u32 gBattleAnimSpritePalette_155[]; -extern const u32 gBattleAnimSpritePalette_156[]; -extern const u32 gBattleAnimSpritePalette_157[]; -extern const u32 gBattleAnimSpritePalette_158[]; -extern const u32 gBattleAnimSpritePalette_159[]; -extern const u32 gBattleAnimSpritePalette_160[]; -extern const u32 gBattleAnimSpritePalette_161[]; -extern const u32 gBattleAnimSpritePalette_162[]; -extern const u32 gBattleAnimSpritePalette_163[]; -extern const u32 gBattleAnimSpritePalette_164[]; -extern const u32 gBattleAnimSpritePalette_165[]; -extern const u32 gBattleAnimSpritePalette_166[]; -extern const u32 gBattleAnimSpritePalette_167[]; -extern const u32 gBattleAnimSpritePalette_168[]; -extern const u32 gBattleAnimSpritePalette_169[]; -extern const u32 gBattleAnimSpritePalette_170[]; -extern const u32 gBattleAnimSpritePalette_171[]; -extern const u32 gBattleAnimSpritePalette_172[]; -extern const u32 gBattleAnimSpritePalette_174[]; -extern const u32 gBattleAnimSpritePalette_175[]; -extern const u32 gBattleAnimSpritePalette_176[]; -extern const u32 gBattleAnimSpritePalette_177[]; -extern const u32 gBattleAnimSpritePalette_178[]; -extern const u32 gBattleAnimSpritePalette_179[]; -extern const u32 gBattleAnimSpritePalette_182[]; -extern const u32 gBattleAnimSpritePalette_183[]; -extern const u32 gBattleAnimSpritePalette_184[]; -extern const u32 gBattleAnimSpritePalette_185[]; -extern const u32 gBattleAnimSpritePalette_186[]; -extern const u32 gBattleAnimSpritePalette_187[]; -extern const u32 gBattleAnimSpritePalette_188[]; -extern const u32 gBattleAnimSpritePalette_189[]; -extern const u32 gBattleAnimSpritePalette_190[]; -extern const u32 gBattleAnimSpritePalette_191[]; -extern const u32 gBattleAnimSpritePalette_192[]; -extern const u32 gBattleAnimSpritePalette_193[]; -extern const u32 gBattleAnimSpritePalette_194[]; -extern const u32 gBattleAnimSpritePalette_195[]; -extern const u32 gBattleAnimSpritePalette_196[]; -extern const u32 gBattleAnimSpritePalette_197[]; -extern const u32 gBattleAnimSpritePalette_198[]; -extern const u32 gBattleAnimSpritePalette_199[]; -extern const u32 gBattleAnimSpritePalette_200[]; -extern const u32 gBattleAnimSpritePalette_201[]; -extern const u32 gBattleAnimSpritePalette_202[]; -extern const u32 gBattleAnimSpritePalette_203[]; -extern const u32 gBattleAnimSpritePalette_204[]; -extern const u32 gBattleAnimSpritePalette_205[]; -extern const u32 gBattleAnimSpritePalette_206[]; -extern const u32 gBattleAnimSpritePalette_207[]; -extern const u32 gBattleAnimSpritePalette_209[]; -extern const u32 gBattleAnimSpritePalette_210[]; -extern const u32 gBattleAnimSpritePalette_211[]; -extern const u32 gBattleAnimSpritePalette_215[]; +extern const u32 gBattleAnimSpritePalette_Bone[]; +extern const u32 gBattleAnimSpritePalette_Spark[]; +extern const u32 gBattleAnimSpritePalette_Pencil[]; +extern const u32 gBattleAnimSpritePalette_AirWave[]; +extern const u32 gBattleAnimSpritePalette_Orb[]; +extern const u32 gBattleAnimSpritePalette_Sword[]; +extern const u32 gBattleAnimSpritePalette_Seed[]; +extern const u32 gBattleAnimSpritePalette_Explosion6[]; +extern const u32 gBattleAnimSpritePalette_PinkOrb[]; +extern const u32 gBattleAnimSpritePalette_Gust[]; +extern const u32 gBattleAnimSpritePalette_IceCube[]; +extern const u32 gBattleAnimSpritePalette_Spark2[]; +extern const u32 gBattleAnimSpritePalette_Orange[]; +extern const u32 gBattleAnimSpritePalette_YellowBall[]; +extern const u32 gBattleAnimSpritePalette_LockOn[]; +extern const u32 gBattleAnimSpritePalette_TiedBag[]; +extern const u32 gBattleAnimSpritePalette_BlackSmoke[]; +extern const u32 gBattleAnimSpritePalette_BlackSmoke[]; +extern const u32 gBattleAnimSpritePalette_Conversion[]; +extern const u32 gBattleAnimSpritePalette_Glass[]; +extern const u32 gBattleAnimSpritePalette_HornHit[]; +extern const u32 gBattleAnimSpritePalette_Hit[]; +extern const u32 gBattleAnimSpritePalette_Hit2[]; +extern const u32 gBattleAnimSpritePalette_BlueShards[]; +extern const u32 gBattleAnimSpritePalette_ClosingEye[]; +extern const u32 gBattleAnimSpritePalette_WavingHand[]; +extern const u32 gBattleAnimSpritePalette_HitDuplicate[]; +extern const u32 gBattleAnimSpritePalette_Leer[]; +extern const u32 gBattleAnimSpritePalette_BlueBurst[]; +extern const u32 gBattleAnimSpritePalette_SmallEmber[]; +extern const u32 gBattleAnimSpritePalette_GraySmoke[]; +extern const u32 gBattleAnimSpritePalette_BlueStar[]; +extern const u32 gBattleAnimSpritePalette_BubbleBurst[]; +extern const u32 gBattleAnimSpritePalette_Fire[]; +extern const u32 gBattleAnimSpritePalette_Fire[]; +extern const u32 gBattleAnimSpritePalette_Fire[]; +extern const u32 gBattleAnimSpritePalette_Lightning2[]; +extern const u32 gBattleAnimSpritePalette_Lightning2[]; +extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; +extern const u32 gBattleAnimSpritePalette_ClawSlash[]; +extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; +extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; +extern const u32 gBattleAnimSpritePalette_BubbleBurst2[]; +extern const u32 gBattleAnimSpritePalette_IceChunk[]; +extern const u32 gBattleAnimSpritePalette_Glass2[]; +extern const u32 gBattleAnimSpritePalette_PinkHeart2[]; +extern const u32 gBattleAnimSpritePalette_SapDrip[]; +extern const u32 gBattleAnimSpritePalette_SapDrip2[]; +extern const u32 gBattleAnimSpritePalette_Sparkle1[]; +extern const u32 gBattleAnimSpritePalette_Sparkle2[]; +extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePalette_HitDuplicate[]; +extern const u32 gBattleAnimSpritePalette_YellowUnk[]; +extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePalette_SlamHit[]; +extern const u32 gBattleAnimSpritePalette_Ring[]; +extern const u32 gBattleAnimSpritePalette_Rocks[]; +extern const u32 gBattleAnimSpritePalette_Z[]; +extern const u32 gBattleAnimSpritePalette_YellowUnk2[]; +extern const u32 gBattleAnimSpritePalette_AirSlash[]; +extern const u32 gBattleAnimSpritePalette_SpinningGreenOrbs[]; +extern const u32 gBattleAnimSpritePalette_Leaf[]; +extern const u32 gBattleAnimSpritePalette_Finger[]; +extern const u32 gBattleAnimSpritePalette_PoisonPowder[]; +extern const u32 gBattleAnimSpritePalette_BrownTriangle[]; +extern const u32 gBattleAnimSpritePalette_SleepPowder[]; +extern const u32 gBattleAnimSpritePalette_StunSpore[]; +extern const u32 gBattleAnimSpritePalette_PoisonPowder[]; +extern const u32 gBattleAnimSpritePalette_Sparkle3[]; +extern const u32 gBattleAnimSpritePalette_Sparkle3[]; +extern const u32 gBattleAnimSpritePalette_MusicNotes[]; +extern const u32 gBattleAnimSpritePalette_Duck[]; +extern const u32 gBattleAnimSpritePalette_MudSand[]; +extern const u32 gBattleAnimSpritePalette_Alert[]; +extern const u32 gBattleAnimSpritePalette_BlueFlames[]; +extern const u32 gBattleAnimSpritePalette_BlueFlames[]; +extern const u32 gBattleAnimSpritePalette_Shock4[]; +extern const u32 gBattleAnimSpritePalette_Shock4[]; +extern const u32 gBattleAnimSpritePalette_Bell2[]; +extern const u32 gBattleAnimSpritePalette_PinkGlove[]; +extern const u32 gBattleAnimSpritePalette_BlueLines[]; +extern const u32 gBattleAnimSpritePalette_Impact3[]; +extern const u32 gBattleAnimSpritePalette_Impact2[]; +extern const u32 gBattleAnimSpritePalette_Reticle[]; +extern const u32 gBattleAnimSpritePalette_Breath[]; +extern const u32 gBattleAnimSpritePalette_Anger[]; +extern const u32 gBattleAnimSpritePalette_Snowball[]; +extern const u32 gBattleAnimSpritePalette_Vine[]; +extern const u32 gBattleAnimSpritePalette_Sword2[]; +extern const u32 gBattleAnimSpritePalette_Clapping[]; +extern const u32 gBattleAnimSpritePalette_RedTube[]; +extern const u32 gBattleAnimSpritePalette_Amnesia[]; +extern const u32 gBattleAnimSpritePalette_String2[]; +extern const u32 gBattleAnimSpritePalette_Pencil2[]; +extern const u32 gBattleAnimSpritePalette_Petal[]; +extern const u32 gBattleAnimSpritePalette_BentSpoon[]; +extern const u32 gBattleAnimSpritePalette_String2[]; +extern const u32 gBattleAnimSpritePalette_MilkBottle[]; +extern const u32 gBattleAnimSpritePalette_Coin[]; +extern const u32 gBattleAnimSpritePalette_CrackedEgg[]; +extern const u32 gBattleAnimSpritePalette_CrackedEgg[]; +extern const u32 gBattleAnimSpritePalette_FreshEgg[]; +extern const u32 gBattleAnimSpritePalette_Fangs[]; +extern const u32 gBattleAnimSpritePalette_Explosion2[]; +extern const u32 gBattleAnimSpritePalette_Explosion2[]; +extern const u32 gBattleAnimSpritePalette_WaterDroplet[]; +extern const u32 gBattleAnimSpritePalette_WaterDroplet[]; +extern const u32 gBattleAnimSpritePalette_Seed2[]; +extern const u32 gBattleAnimSpritePalette_Seed2[]; +extern const u32 gBattleAnimSpritePalette_RedWand[]; +extern const u32 gBattleAnimSpritePalette_PurpleGreenUnk[]; +extern const u32 gBattleAnimSpritePalette_WaterColumn[]; +extern const u32 gBattleAnimSpritePalette_MudUnk[]; +extern const u32 gBattleAnimSpritePalette_RainDrops[]; +extern const u32 gBattleAnimSpritePalette_FurySwipes[]; +extern const u32 gBattleAnimSpritePalette_Vine2[]; +extern const u32 gBattleAnimSpritePalette_Teeth[]; +extern const u32 gBattleAnimSpritePalette_Bone2[]; +extern const u32 gBattleAnimSpritePalette_WhiteBag[]; +extern const u32 gBattleAnimSpritePalette_Unknown[]; +extern const u32 gBattleAnimSpritePalette_PurpleCoral[]; +extern const u32 gBattleAnimSpritePalette_PurpleCoral[]; +extern const u32 gBattleAnimSpritePalette_Shock2[]; +extern const u32 gBattleAnimSpritePalette_ClosingEye2[]; +extern const u32 gBattleAnimSpritePalette_MetalBall[]; +extern const u32 gBattleAnimSpritePalette_MonsterDoll[]; +extern const u32 gBattleAnimSpritePalette_Whirlwind[]; +extern const u32 gBattleAnimSpritePalette_Whirlwind[]; +extern const u32 gBattleAnimSpritePalette_Explosion4[]; +extern const u32 gBattleAnimSpritePalette_Explosion4[]; +extern const u32 gBattleAnimSpritePalette_Tongue[]; +extern const u32 gBattleAnimSpritePalette_Smoke[]; +extern const u32 gBattleAnimSpritePalette_Smoke[]; +extern const u32 gBattleAnimSpritePalette_Impact[]; +extern const u32 gBattleAnimSpritePalette_CircleImpact[]; +extern const u32 gBattleAnimSpritePalette_Impact[]; +extern const u32 gBattleAnimSpritePalette_Impact[]; +extern const u32 gBattleAnimSpritePalette_SharpTeeth[]; +extern const u32 gBattleAnimSpritePalette_RainbowRings[]; +extern const u32 gBattleAnimSpritePalette_IceCrystals[]; +extern const u32 gBattleAnimSpritePalette_IceCrystals[]; +extern const u32 gBattleAnimSpritePalette_HandsAndFeet[]; +extern const u32 gBattleAnimSpritePalette_MistCloud[]; +extern const u32 gBattleAnimSpritePalette_SharpTeeth[]; +extern const u32 gBattleAnimSpritePalette_RainDrops[]; +extern const u32 gBattleAnimSpritePalette_Orbs[]; +extern const u32 gBattleAnimSpritePalette_WaterImpact[]; +extern const u32 gBattleAnimSpritePalette_WaterImpact[]; +extern const u32 gBattleAnimSpritePalette_PoisonBubble[]; +extern const u32 gBattleAnimSpritePalette_PoisonBubble[]; +extern const u32 gBattleAnimSpritePalette_Spikes[]; +extern const u32 gBattleAnimSpritePalette_HornHit2[]; +extern const u32 gBattleAnimSpritePalette_AirWave2[]; +extern const u32 gBattleAnimSpritePalette_SmallBubbles[]; +extern const u32 gBattleAnimSpritePalette_RoundShadow[]; +extern const u32 gBattleAnimSpritePalette_Sunlight[]; +extern const u32 gBattleAnimSpritePalette_Spore[]; +extern const u32 gBattleAnimSpritePalette_Flower[]; +extern const u32 gBattleAnimSpritePalette_RazorLeaf[]; +extern const u32 gBattleAnimSpritePalette_Needle[]; +extern const u32 gBattleAnimSpritePalette_WhirlwindLines[]; +extern const u32 gBattleAnimSpritePalette_GoldRing[]; +extern const u32 gBattleAnimSpritePalette_PurpleRing[]; +extern const u32 gBattleAnimSpritePalette_BlueRing[]; +extern const u32 gBattleAnimSpritePalette_GreenLightWall[]; +extern const u32 gBattleAnimSpritePalette_BlueLightWall[]; +extern const u32 gBattleAnimSpritePalette_RedLightWall[]; +extern const u32 gBattleAnimSpritePalette_GrayLightWall[]; +extern const u32 gBattleAnimSpritePalette_OrangeLightWall[]; +extern const u32 gBattleAnimSpritePalette_BlackBall2[]; +extern const u32 gBattleAnimSpritePalette_PurpleGasCloud[]; +extern const u32 gBattleAnimSpritePalette_YellowStar[]; +extern const u32 gBattleAnimSpritePalette_LargeFreshEgg[]; +extern const u32 gBattleAnimSpritePalette_ShadowBall[]; +extern const u32 gBattleAnimSpritePalette_Lick[]; +extern const u32 gBattleAnimSpritePalette_VoidLines[]; +extern const u32 gBattleAnimSpritePalette_String[]; +extern const u32 gBattleAnimSpritePalette_Lightbulb[]; +extern const u32 gBattleAnimSpritePalette_Slash[]; +extern const u32 gBattleAnimSpritePalette_FocusEnergy[]; +extern const u32 gBattleAnimSpritePalette_SphereToCube[]; +extern const u32 gBattleAnimSpritePalette_Tendrils[]; +extern const u32 gBattleAnimSpritePalette_Eye[]; +extern const u32 gBattleAnimSpritePalette_WhiteShadow[]; +extern const u32 gBattleAnimSpritePalette_TealAlert[]; +extern const u32 gBattleAnimSpritePalette_OpeningEye[]; +extern const u32 gBattleAnimSpritePalette_RoundWhiteHalo[]; +extern const u32 gBattleAnimSpritePalette_FangAttack[]; +extern const u32 gBattleAnimSpritePalette_PurpleHandOutline[]; +extern const u32 gBattleAnimSpritePalette_Moon[]; +extern const u32 gBattleAnimSpritePalette_GreenSparkle[]; +extern const u32 gBattleAnimSpritePalette_Spiral[]; +extern const u32 gBattleAnimSpritePalette_SnoreZ[]; +extern const u32 gBattleAnimSpritePalette_Explosion[]; +extern const u32 gBattleAnimSpritePalette_Nail[]; +extern const u32 gBattleAnimSpritePalette_GhostlySpirit[]; +extern const u32 gBattleAnimSpritePalette_WarmRock[]; +extern const u32 gBattleAnimSpritePalette_BreakingEgg[]; +extern const u32 gBattleAnimSpritePalette_ThinRing[]; +extern const u32 gBattleAnimSpritePalette_PunchImpact[]; +extern const u32 gBattleAnimSpritePalette_Bell[]; +extern const u32 gBattleAnimSpritePalette_MusicNotes2[]; +extern const u32 gBattleAnimSpritePalette_SpeedDust[]; +extern const u32 gBattleAnimSpritePalette_ThoughtBubble[]; +extern const u32 gBattleAnimSpritePalette_MagentaHeart[]; +extern const u32 gBattleAnimSpritePalette_ElectricOrbs[]; +extern const u32 gBattleAnimSpritePalette_MovementWaves[]; extern const u32 gUnknown_08C249D0[]; extern const u32 gUnknown_08C249F8[]; -extern const u32 gBattleAnimSpritePalette_216[]; -extern const u32 gBattleAnimSpritePalette_217[]; -extern const u32 gBattleAnimSpritePalette_218[]; -extern const u32 gBattleAnimSpritePalette_219[]; +extern const u32 gBattleAnimSpritePalette_RedHeart[]; +extern const u32 gBattleAnimSpritePalette_RedOrb[]; +extern const u32 gBattleAnimSpritePalette_EyeSparkle[]; +extern const u32 gBattleAnimSpritePalette_PinkHeart[]; extern const u32 gUnknown_08C232E0; extern const u32 gUnknown_08C23D50; extern const u32 gUnknown_08C23D78; -extern const u32 gBattleAnimSpritePalette_220[]; -extern const u32 gBattleAnimSpritePalette_221[]; -extern const u32 gBattleAnimSpritePalette_222[]; -extern const u32 gBattleAnimSpritePalette_223[]; -extern const u32 gBattleAnimSpritePalette_224[]; -extern const u32 gBattleAnimSpritePalette_225[]; -extern const u32 gBattleAnimSpritePalette_226[]; -extern const u32 gBattleAnimSpritePalette_228[]; -extern const u32 gBattleAnimSpritePalette_229[]; -extern const u32 gBattleAnimSpritePalette_230[]; -extern const u32 gBattleAnimSpritePalette_231[]; -extern const u32 gBattleAnimSpritePalette_233[]; -extern const u32 gBattleAnimSpritePalette_234[]; -extern const u32 gBattleAnimSpritePalette_235[]; -extern const u32 gBattleAnimSpritePalette_236[]; -extern const u32 gBattleAnimSpritePalette_237[]; -extern const u32 gBattleAnimSpritePalette_238[]; -extern const u32 gBattleAnimSpritePalette_239[]; -extern const u32 gBattleAnimSpritePalette_240[]; -extern const u32 gBattleAnimSpritePalette_241[]; -extern const u32 gBattleAnimSpritePalette_242[]; -extern const u32 gBattleAnimSpritePalette_243[]; -extern const u32 gBattleAnimSpritePalette_244[]; +extern const u32 gBattleAnimSpritePalette_Angel[]; +extern const u32 gBattleAnimSpritePalette_Devil[]; +extern const u32 gBattleAnimSpritePalette_Swipe[]; +extern const u32 gBattleAnimSpritePalette_Roots[]; +extern const u32 gBattleAnimSpritePalette_ItemBag[]; +extern const u32 gBattleAnimSpritePalette_JaggedMusicNote[]; +extern const u32 gBattleAnimSpritePalette_Pokeball[]; +extern const u32 gBattleAnimSpritePalette_LetterZ[]; +extern const u32 gBattleAnimSpritePalette_RapidSpin[]; +extern const u32 gBattleAnimSpritePalette_TriForceTriangle[]; +extern const u32 gBattleAnimSpritePalette_WispOrb[]; +extern const u32 gBattleAnimSpritePalette_GoldStars[]; +extern const u32 gBattleAnimSpritePalette_EclipsingOrb[]; +extern const u32 gBattleAnimSpritePalette_GrayOrb[]; +extern const u32 gBattleAnimSpritePalette_BlueOrb[]; +extern const u32 gBattleAnimSpritePalette_RedOrb2[]; +extern const u32 gBattleAnimSpritePalette_PinkPetal[]; +extern const u32 gBattleAnimSpritePalette_PainSplit[]; +extern const u32 gBattleAnimSpritePalette_Confetti[]; +extern const u32 gBattleAnimSpritePalette_GreenStar[]; +extern const u32 gBattleAnimSpritePalette_PinkCloud[]; +extern const u32 gBattleAnimSpritePalette_SweatDrop[]; +extern const u32 gBattleAnimSpritePalette_GuardRing[]; extern const u32 gCureBubblesGfx[]; extern const u32 gCureBubblesPal[]; extern const u32 gCureBubblesTilemap[]; -extern const u32 gBattleAnimSpritePalette_245[]; -extern const u32 gBattleAnimSpritePalette_248[]; -extern const u32 gBattleAnimSpritePalette_249[]; -extern const u32 gBattleAnimSpritePalette_251[]; -extern const u32 gBattleAnimSpritePalette_252[]; -extern const u32 gBattleAnimSpritePalette_253[]; -extern const u32 gBattleAnimSpritePalette_254[]; -extern const u32 gBattleAnimSpritePalette_255[]; -extern const u32 gBattleAnimSpritePalette_256[]; -extern const u32 gBattleAnimSpritePalette_257[]; -extern const u32 gBattleAnimSpritePalette_258[]; -extern const u32 gBattleAnimSpritePalette_259[]; -extern const u32 gBattleAnimSpritePalette_260[]; -extern const u32 gBattleAnimSpritePalette_261[]; -extern const u32 gBattleAnimSpritePalette_262[]; -extern const u32 gBattleAnimSpritePalette_263[]; -extern const u32 gBattleAnimSpritePalette_264[]; -extern const u32 gBattleAnimSpritePalette_265[]; -extern const u32 gBattleAnimSpritePalette_266[]; -extern const u32 gBattleAnimSpritePalette_267[]; -extern const u32 gBattleAnimSpritePalette_268[]; -extern const u32 gBattleAnimSpritePalette_269[]; -extern const u32 gBattleAnimSpritePalette_270[]; -extern const u32 gBattleAnimSpritePalette_271[]; -extern const u32 gBattleAnimSpritePalette_272[]; -extern const u32 gBattleAnimSpritePalette_274[]; -extern const u32 gBattleAnimSpritePalette_277[]; -extern const u32 gBattleAnimSpritePalette_278[]; -extern const u32 gBattleAnimSpritePalette_279[]; -extern const u32 gBattleAnimSpritePalette_280[]; -extern const u32 gBattleAnimSpritePalette_281[]; -extern const u32 gBattleAnimSpritePalette_282[]; -extern const u32 gBattleAnimSpritePalette_283[]; -extern const u32 gBattleAnimSpritePalette_284[]; -extern const u32 gBattleAnimSpritePalette_285[]; -extern const u32 gBattleAnimSpritePalette_286[]; -extern const u32 gBattleAnimSpritePalette_287[]; -extern const u32 gBattleAnimSpritePalette_288[]; +extern const u32 gBattleAnimSpritePalette_PurpleScratch[]; +extern const u32 gBattleAnimSpritePalette_SmallRedEye[]; +extern const u32 gBattleAnimSpritePalette_HollowOrb[]; +extern const u32 gBattleAnimSpritePalette_BluegreenOrb[]; +extern const u32 gBattleAnimSpritePalette_PawPrint[]; +extern const u32 gBattleAnimSpritePalette_PurpleFlame[]; +extern const u32 gBattleAnimSpritePalette_RedBall[]; +extern const u32 gBattleAnimSpritePalette_SmellingsaltEffect[]; +extern const u32 gBattleAnimSpritePalette_Meteor[]; +extern const u32 gBattleAnimSpritePalette_FlatRock[]; +extern const u32 gBattleAnimSpritePalette_MagnifyingGlass[]; +extern const u32 gBattleAnimSpritePalette_BrownOrb[]; +extern const u32 gBattleAnimSpritePalette_MetalSoundWaves[]; +extern const u32 gBattleAnimSpritePalette_FlyingDirt[]; +extern const u32 gBattleAnimSpritePalette_IcicleSpear[]; +extern const u32 gBattleAnimSpritePalette_Hail[]; +extern const u32 gBattleAnimSpritePalette_GlowyRedOrb[]; +extern const u32 gBattleAnimSpritePalette_GlowyGreenOrb[]; +extern const u32 gBattleAnimSpritePalette_GreenSpike[]; +extern const u32 gBattleAnimSpritePalette_WhiteCircleOfLight[]; +extern const u32 gBattleAnimSpritePalette_GlowyBlueOrb[]; +extern const u32 gBattleAnimSpritePalette_RedBrick[]; +extern const u32 gBattleAnimSpritePalette_WhiteFeather[]; +extern const u32 gBattleAnimSpritePalette_Sparkle6[]; +extern const u32 gBattleAnimSpritePalette_Splash[]; +extern const u32 gBattleAnimSpritePalette_Gem1[]; +extern const u32 gBattleAnimSpritePalette_SlamHit2[]; +extern const u32 gBattleAnimSpritePalette_Recycle[]; +extern const u32 gBattleAnimSpritePalette_RedParticles[]; +extern const u32 gBattleAnimSpritePalette_Protect[]; +extern const u32 gBattleAnimSpritePalette_DirtMound[]; +extern const u32 gBattleAnimSpritePalette_Shock3[]; +extern const u32 gBattleAnimSpritePalette_WeatherBall[]; +extern const u32 gBattleAnimSpritePalette_Bird[]; +extern const u32 gBattleAnimSpritePalette_CrossImpact[]; +extern const u32 gBattleAnimSpritePalette_Slash2[]; +extern const u32 gBattleAnimSpritePalette_WhipHit[]; +extern const u32 gBattleAnimSpritePalette_BlueRing2[]; extern const u32 gBattleAnimBackgroundImage_00[]; extern const u32 gBattleAnimBackgroundImage_02[]; -- cgit v1.2.3 From 19f151417ee0a8a158747939a850c19419ff65f8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 16:38:55 +0200 Subject: Rename sprite sheet to sprite gfx --- include/constants/battle_anim.h | 186 +++---- include/graphics.h | 1096 +++++++++++++++++++-------------------- 2 files changed, 641 insertions(+), 641 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 6909d836b..aaa3cd274 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -11,137 +11,137 @@ #define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) #define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) #define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) #define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) #define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) -#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused +#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) +#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused #define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) #define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) #define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused +#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused #define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) #define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) #define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) #define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) #define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) #define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) -#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused +#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused #define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) -#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) -#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused -#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused -#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused -#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused +#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) +#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) +#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused +#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused +#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused +#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused #define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) -#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused +#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused #define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) #define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) #define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) #define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) -#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused +#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused #define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) -#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused +#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused #define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) -#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused +#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused #define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) -#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused -#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused -#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused +#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused +#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused +#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused #define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) -#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused -#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused -#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused -#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused +#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused +#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused +#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused +#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused #define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) -#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) -#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused +#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) +#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused #define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) -#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused -#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused +#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused +#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused #define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) -#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused +#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused #define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) -#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused -#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused -#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused -#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused +#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused +#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused +#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused +#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused #define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) #define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) #define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) -#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused +#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused #define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) #define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) -#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused +#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused #define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) #define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) #define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) #define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) #define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) #define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) -#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused -#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused -#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused +#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused +#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused +#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused #define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) -#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused -#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused -#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused -#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused -#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused -#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused +#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused +#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused +#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused +#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused +#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused +#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused #define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) #define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused -#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused -#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused -#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused -#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused +#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused +#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused +#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused +#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused +#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused #define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) -#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused -#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused -#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused +#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused +#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused +#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused #define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused +#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) #define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) -#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused -#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused -#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused -#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused -#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused -#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused -#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused -#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused -#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused -#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused -#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused -#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused -#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused -#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused +#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused +#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused +#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused +#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused +#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused +#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused +#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused +#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused +#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused +#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused +#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused +#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused +#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused +#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused #define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) -#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused -#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused -#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused -#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused -#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused -#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused -#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused -#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused -#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused -#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused -#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused -#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused -#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused -#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused -#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused -#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused -#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused -#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused -#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused +#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused +#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused +#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused +#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused +#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused +#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused +#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused +#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused +#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused +#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused +#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused +#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused +#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused +#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused +#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused +#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused +#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused +#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused +#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused #define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) #define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) #define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) @@ -185,11 +185,11 @@ #define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) #define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) #define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) -#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) #define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) #define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) #define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) -#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused +#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused #define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) #define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) #define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) @@ -211,7 +211,7 @@ #define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) #define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) -#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused +#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) #define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) #define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) @@ -276,17 +276,17 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) #define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) -#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused -#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused -#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused +#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused +#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused +#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused #define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) #define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused +#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused #define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) #define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) #define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) diff --git a/include/graphics.h b/include/graphics.h index c7d278668..14b84724f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4122,568 +4122,568 @@ extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gContest2Pal[]; -extern const u32 gBattleAnimSpriteSheet_Bone[]; -extern const u32 gBattleAnimSpriteSheet_Spark[]; -extern const u32 gBattleAnimSpriteSheet_Pencil[]; -extern const u32 gBattleAnimSpriteSheet_AirWave[]; -extern const u32 gBattleAnimSpriteSheet_Orb[]; -extern const u32 gBattleAnimSpriteSheet_Sword[]; -extern const u32 gBattleAnimSpriteSheet_Seed[]; -extern const u32 gBattleAnimSpriteSheet_Explosion6[]; -extern const u32 gBattleAnimSpriteSheet_PinkOrb[]; -extern const u32 gBattleAnimSpriteSheet_Gust[]; -extern const u32 gBattleAnimSpriteSheet_IceCube[]; -extern const u32 gBattleAnimSpriteSheet_Spark2[]; -extern const u32 gBattleAnimSpriteSheet_Orange[]; -extern const u32 gBattleAnimSpriteSheet_YellowBall[]; -extern const u32 gBattleAnimSpriteSheet_LockOn[]; -extern const u32 gBattleAnimSpriteSheet_TiedBag[]; -extern const u32 gBattleAnimSpriteSheet_BlackSmoke[]; -extern const u32 gBattleAnimSpriteSheet_BlackBall[]; -extern const u32 gBattleAnimSpriteSheet_Conversion[]; -extern const u32 gBattleAnimSpriteSheet_Glass[]; -extern const u32 gBattleAnimSpriteSheet_HornHit[]; -extern const u32 gBattleAnimSpriteSheet_Hit[]; -extern const u32 gBattleAnimSpriteSheet_Hit[]; -extern const u32 gBattleAnimSpriteSheet_BlueShards[]; -extern const u32 gBattleAnimSpriteSheet_ClosingEye[]; -extern const u32 gBattleAnimSpriteSheet_WavingHand[]; -extern const u32 gBattleAnimSpriteSheet_HitDuplicate[]; -extern const u32 gBattleAnimSpriteSheet_Leer[]; -extern const u32 gBattleAnimSpriteSheet_BlueBurst[]; -extern const u32 gBattleAnimSpriteSheet_SmallEmber[]; -extern const u32 gBattleAnimSpriteSheet_GraySmoke[]; -extern const u32 gBattleAnimSpriteSheet_BlueStar[]; -extern const u32 gBattleAnimSpriteSheet_BubbleBurst[]; -extern const u32 gBattleAnimSpriteSheet_Fire[]; -extern const u32 gBattleAnimSpriteSheet_SpinningFire[]; -extern const u32 gBattleAnimSpriteSheet_FirePlume[]; -extern const u32 gBattleAnimSpriteSheet_Lightning2[]; -extern const u32 gBattleAnimSpriteSheet_Lightning[]; -extern const u32 gBattleAnimSpriteSheet_ClawSlash2[]; -extern const u32 gBattleAnimSpriteSheet_ClawSlash[]; -extern const u32 gBattleAnimSpriteSheet_Scratch3[]; -extern const u32 gBattleAnimSpriteSheet_Scratch2[]; -extern const u32 gBattleAnimSpriteSheet_BubbleBurst2[]; -extern const u32 gBattleAnimSpriteSheet_IceChunk[]; -extern const u32 gBattleAnimSpriteSheet_Glass2[]; -extern const u32 gBattleAnimSpriteSheet_PinkHeart2[]; -extern const u32 gBattleAnimSpriteSheet_SapDrip[]; -extern const u32 gBattleAnimSpriteSheet_SapDrip[]; -extern const u32 gBattleAnimSpriteSheet_Sparkle1[]; -extern const u32 gBattleAnimSpriteSheet_Sparkle1[]; -extern const u32 gBattleAnimSpriteSheet_HumanoidFoot[]; -extern const u32 gBattleAnimSpriteSheet_MonsterFoot[]; -extern const u32 gBattleAnimSpriteSheet_HumanoidHand[]; -extern const u32 gBattleAnimSpriteSheet_NoiseLine[]; +extern const u32 gBattleAnimSpriteGfx_Bone[]; +extern const u32 gBattleAnimSpriteGfx_Spark[]; +extern const u32 gBattleAnimSpriteGfx_Pencil[]; +extern const u32 gBattleAnimSpriteGfx_AirWave[]; +extern const u32 gBattleAnimSpriteGfx_Orb[]; +extern const u32 gBattleAnimSpriteGfx_Sword[]; +extern const u32 gBattleAnimSpriteGfx_Seed[]; +extern const u32 gBattleAnimSpriteGfx_Explosion6[]; +extern const u32 gBattleAnimSpriteGfx_PinkOrb[]; +extern const u32 gBattleAnimSpriteGfx_Gust[]; +extern const u32 gBattleAnimSpriteGfx_IceCube[]; +extern const u32 gBattleAnimSpriteGfx_Spark2[]; +extern const u32 gBattleAnimSpriteGfx_Orange[]; +extern const u32 gBattleAnimSpriteGfx_YellowBall[]; +extern const u32 gBattleAnimSpriteGfx_LockOn[]; +extern const u32 gBattleAnimSpriteGfx_TiedBag[]; +extern const u32 gBattleAnimSpriteGfx_BlackSmoke[]; +extern const u32 gBattleAnimSpriteGfx_BlackBall[]; +extern const u32 gBattleAnimSpriteGfx_Conversion[]; +extern const u32 gBattleAnimSpriteGfx_Glass[]; +extern const u32 gBattleAnimSpriteGfx_HornHit[]; +extern const u32 gBattleAnimSpriteGfx_Hit[]; +extern const u32 gBattleAnimSpriteGfx_Hit[]; +extern const u32 gBattleAnimSpriteGfx_BlueShards[]; +extern const u32 gBattleAnimSpriteGfx_ClosingEye[]; +extern const u32 gBattleAnimSpriteGfx_WavingHand[]; +extern const u32 gBattleAnimSpriteGfx_HitDuplicate[]; +extern const u32 gBattleAnimSpriteGfx_Leer[]; +extern const u32 gBattleAnimSpriteGfx_BlueBurst[]; +extern const u32 gBattleAnimSpriteGfx_SmallEmber[]; +extern const u32 gBattleAnimSpriteGfx_GraySmoke[]; +extern const u32 gBattleAnimSpriteGfx_BlueStar[]; +extern const u32 gBattleAnimSpriteGfx_BubbleBurst[]; +extern const u32 gBattleAnimSpriteGfx_Fire[]; +extern const u32 gBattleAnimSpriteGfx_SpinningFire[]; +extern const u32 gBattleAnimSpriteGfx_FirePlume[]; +extern const u32 gBattleAnimSpriteGfx_Lightning2[]; +extern const u32 gBattleAnimSpriteGfx_Lightning[]; +extern const u32 gBattleAnimSpriteGfx_ClawSlash2[]; +extern const u32 gBattleAnimSpriteGfx_ClawSlash[]; +extern const u32 gBattleAnimSpriteGfx_Scratch3[]; +extern const u32 gBattleAnimSpriteGfx_Scratch2[]; +extern const u32 gBattleAnimSpriteGfx_BubbleBurst2[]; +extern const u32 gBattleAnimSpriteGfx_IceChunk[]; +extern const u32 gBattleAnimSpriteGfx_Glass2[]; +extern const u32 gBattleAnimSpriteGfx_PinkHeart2[]; +extern const u32 gBattleAnimSpriteGfx_SapDrip[]; +extern const u32 gBattleAnimSpriteGfx_SapDrip[]; +extern const u32 gBattleAnimSpriteGfx_Sparkle1[]; +extern const u32 gBattleAnimSpriteGfx_Sparkle1[]; +extern const u32 gBattleAnimSpriteGfx_HumanoidFoot[]; +extern const u32 gBattleAnimSpriteGfx_MonsterFoot[]; +extern const u32 gBattleAnimSpriteGfx_HumanoidHand[]; +extern const u32 gBattleAnimSpriteGfx_NoiseLine[]; extern const u32 gUnknown_08C2EA50[]; extern const u32 gUnknown_08C2EA9C[]; -extern const u32 gBattleAnimSpriteSheet_YellowUnk[]; -extern const u32 gBattleAnimSpriteSheet_RedFist[]; -extern const u32 gBattleAnimSpriteSheet_SlamHit[]; -extern const u32 gBattleAnimSpriteSheet_Ring[]; -extern const u32 gBattleAnimSpriteSheet_Rocks[]; -extern const u32 gBattleAnimSpriteSheet_Z[]; -extern const u32 gBattleAnimSpriteSheet_YellowUnk2[]; -extern const u32 gBattleAnimSpriteSheet_AirSlash[]; -extern const u32 gBattleAnimSpriteSheet_SpinningGreenOrbs[]; -extern const u32 gBattleAnimSpriteSheet_Leaf[]; -extern const u32 gBattleAnimSpriteSheet_Finger[]; -extern const u32 gBattleAnimSpriteSheet_PoisonPowder[]; -extern const u32 gBattleAnimSpriteSheet_BrownTriangle[]; -extern const u32 gBattleAnimSpriteSheet_Sparkle3[]; -extern const u32 gBattleAnimSpriteSheet_Sparkle4[]; -extern const u32 gBattleAnimSpriteSheet_MusicNotes[]; -extern const u32 gBattleAnimSpriteSheet_Duck[]; -extern const u32 gBattleAnimSpriteSheet_MudSand[]; -extern const u32 gBattleAnimSpriteSheet_Alert[]; -extern const u32 gBattleAnimSpriteSheet_BlueFlames[]; -extern const u32 gBattleAnimSpriteSheet_BlueFlames2[]; -extern const u32 gBattleAnimSpriteSheet_Shock4[]; -extern const u32 gBattleAnimSpriteSheet_Shock[]; -extern const u32 gBattleAnimSpriteSheet_Bell2[]; -extern const u32 gBattleAnimSpriteSheet_PinkGlove[]; -extern const u32 gBattleAnimSpriteSheet_BlueLines[]; -extern const u32 gBattleAnimSpriteSheet_Impact3[]; -extern const u32 gBattleAnimSpriteSheet_Impact2[]; -extern const u32 gBattleAnimSpriteSheet_Reticle[]; -extern const u32 gBattleAnimSpriteSheet_Breath[]; -extern const u32 gBattleAnimSpriteSheet_Anger[]; -extern const u32 gBattleAnimSpriteSheet_Snowball[]; -extern const u32 gBattleAnimSpriteSheet_Vine[]; -extern const u32 gBattleAnimSpriteSheet_Sword2[]; -extern const u32 gBattleAnimSpriteSheet_Clapping[]; -extern const u32 gBattleAnimSpriteSheet_RedTube[]; -extern const u32 gBattleAnimSpriteSheet_Amnesia[]; -extern const u32 gBattleAnimSpriteSheet_String2[]; -extern const u32 gBattleAnimSpriteSheet_Pencil2[]; -extern const u32 gBattleAnimSpriteSheet_Petal[]; -extern const u32 gBattleAnimSpriteSheet_BentSpoon[]; -extern const u32 gBattleAnimSpriteSheet_Web[]; -extern const u32 gBattleAnimSpriteSheet_MilkBottle[]; -extern const u32 gBattleAnimSpriteSheet_Coin[]; -extern const u32 gBattleAnimSpriteSheet_CrackedEgg[]; -extern const u32 gBattleAnimSpriteSheet_HatchedEgg[]; -extern const u32 gBattleAnimSpriteSheet_FreshEgg[]; -extern const u32 gBattleAnimSpriteSheet_Fangs[]; -extern const u32 gBattleAnimSpriteSheet_Explosion2[]; -extern const u32 gBattleAnimSpriteSheet_Explosion3[]; -extern const u32 gBattleAnimSpriteSheet_WaterDroplet[]; -extern const u32 gBattleAnimSpriteSheet_WaterDroplet2[]; -extern const u32 gBattleAnimSpriteSheet_Seed2[]; -extern const u32 gBattleAnimSpriteSheet_Sprout[]; -extern const u32 gBattleAnimSpriteSheet_RedWand[]; -extern const u32 gBattleAnimSpriteSheet_PurpleGreenUnk[]; -extern const u32 gBattleAnimSpriteSheet_WaterColumn[]; -extern const u32 gBattleAnimSpriteSheet_MudUnk[]; -extern const u32 gBattleAnimSpriteSheet_RainDrops[]; -extern const u32 gBattleAnimSpriteSheet_FurySwipes[]; -extern const u32 gBattleAnimSpriteSheet_Vine2[]; -extern const u32 gBattleAnimSpriteSheet_Teeth[]; -extern const u32 gBattleAnimSpriteSheet_Bone2[]; -extern const u32 gBattleAnimSpriteSheet_WhiteBag[]; -extern const u32 gBattleAnimSpriteSheet_Unknown[]; -extern const u32 gBattleAnimSpriteSheet_PurpleCoral[]; -extern const u32 gBattleAnimSpriteSheet_PurpleDroplet[]; -extern const u32 gBattleAnimSpriteSheet_Shock2[]; -extern const u32 gBattleAnimSpriteSheet_ClosingEye2[]; -extern const u32 gBattleAnimSpriteSheet_MetalBall[]; -extern const u32 gBattleAnimSpriteSheet_MonsterDoll[]; -extern const u32 gBattleAnimSpriteSheet_Whirlwind[]; -extern const u32 gBattleAnimSpriteSheet_Whirlwind2[]; -extern const u32 gBattleAnimSpriteSheet_Explosion4[]; -extern const u32 gBattleAnimSpriteSheet_Explosion5[]; -extern const u32 gBattleAnimSpriteSheet_Tongue[]; -extern const u32 gBattleAnimSpriteSheet_Smoke[]; -extern const u32 gBattleAnimSpriteSheet_Smoke2[]; -extern const u32 gBattleAnimSpriteSheet_Impact[]; -extern const u32 gBattleAnimSpriteSheet_Particles[]; -extern const u32 gBattleAnimSpriteSheet_CircleImpact[]; -extern const u32 gBattleAnimSpriteSheet_Scratch[]; -extern const u32 gBattleAnimSpriteSheet_Cut[]; -extern const u32 gBattleAnimSpriteSheet_SharpTeeth[]; -extern const u32 gBattleAnimSpriteSheet_RainbowRings[]; -extern const u32 gBattleAnimSpriteSheet_IceCrystals[]; -extern const u32 gBattleAnimSpriteSheet_IceSpikes[]; -extern const u32 gBattleAnimSpriteSheet_HandsAndFeet[]; -extern const u32 gBattleAnimSpriteSheet_MistCloud[]; -extern const u32 gBattleAnimSpriteSheet_Clamp[]; -//extern const struct CompressedSpriteSheet gBattleAnimSpriteSheet_146[]; -extern const u32 gBattleAnimSpriteSheet_Bubble[]; -extern const u32 gBattleAnimSpriteSheet_Orbs[]; -extern const u32 gBattleAnimSpriteSheet_WaterImpact[]; -extern const u32 gBattleAnimSpriteSheet_WaterOrb[]; -extern const u32 gBattleAnimSpriteSheet_PoisonBubble[]; -extern const u32 gBattleAnimSpriteSheet_ToxicBubble[]; -extern const u32 gBattleAnimSpriteSheet_Spikes[]; -extern const u32 gBattleAnimSpriteSheet_HornHit2[]; -extern const u32 gBattleAnimSpriteSheet_AirWave2[]; -extern const u32 gBattleAnimSpriteSheet_SmallBubbles[]; -extern const u32 gBattleAnimSpriteSheet_RoundShadow[]; -extern const u32 gBattleAnimSpriteSheet_Sunlight[]; -extern const u32 gBattleAnimSpriteSheet_Spore[]; -extern const u32 gBattleAnimSpriteSheet_Flower[]; -extern const u32 gBattleAnimSpriteSheet_RazorLeaf[]; -extern const u32 gBattleAnimSpriteSheet_Needle[]; -extern const u32 gBattleAnimSpriteSheet_WhirlwindLines[]; -extern const u32 gBattleAnimSpriteSheet_GoldRing[]; -extern const u32 gBattleAnimSpriteSheet_GreenLightWall[]; -extern const u32 gBattleAnimSpriteSheet_BlackBall2[]; -extern const u32 gBattleAnimSpriteSheet_SparkH[]; -extern const u32 gBattleAnimSpriteSheet_YellowStar[]; -extern const u32 gBattleAnimSpriteSheet_LargeFreshEgg[]; -extern const u32 gBattleAnimSpriteSheet_ShadowBall[]; -extern const u32 gBattleAnimSpriteSheet_Lick[]; -extern const u32 gBattleAnimSpriteSheet_VoidLines[]; -extern const u32 gBattleAnimSpriteSheet_String[]; -extern const u32 gBattleAnimSpriteSheet_WebThread[]; -extern const u32 gBattleAnimSpriteSheet_SpiderWeb[]; -extern const u32 gBattleAnimSpriteSheet_Lightbulb[]; -extern const u32 gBattleAnimSpriteSheet_Slash[]; -extern const u32 gBattleAnimSpriteSheet_FocusEnergy[]; -extern const u32 gBattleAnimSpriteSheet_SphereToCube[]; -extern const u32 gBattleAnimSpriteSheet_Tendrils[]; -extern const u32 gBattleAnimSpriteSheet_Eye[]; -extern const u32 gBattleAnimSpriteSheet_WhiteShadow[]; -extern const u32 gBattleAnimSpriteSheet_TealAlert[]; -extern const u32 gBattleAnimSpriteSheet_OpeningEye[]; -extern const u32 gBattleAnimSpriteSheet_RoundWhiteHalo[]; -extern const u32 gBattleAnimSpriteSheet_FangAttack[]; -extern const u32 gBattleAnimSpriteSheet_PurpleHandOutline[]; -extern const u32 gBattleAnimSpriteSheet_Moon[]; -extern const u32 gBattleAnimSpriteSheet_GreenSparkle[]; -extern const u32 gBattleAnimSpriteSheet_Spiral[]; -extern const u32 gBattleAnimSpriteSheet_SnoreZ[]; -extern const u32 gBattleAnimSpriteSheet_Explosion[]; -extern const u32 gBattleAnimSpriteSheet_Nail[]; -extern const u32 gBattleAnimSpriteSheet_GhostlySpirit[]; -extern const u32 gBattleAnimSpriteSheet_WarmRock[]; -extern const u32 gBattleAnimSpriteSheet_BreakingEgg[]; -extern const u32 gBattleAnimSpriteSheet_ThinRing[]; -extern const u32 gBattleAnimSpriteSheet_PunchImpact[]; -extern const u32 gBattleAnimSpriteSheet_Bell[]; -extern const u32 gBattleAnimSpriteSheet_MusicNotes2[]; -extern const u32 gBattleAnimSpriteSheet_SpeedDust[]; -extern const u32 gBattleAnimSpriteSheet_TornMetal[]; -extern const u32 gBattleAnimSpriteSheet_ThoughtBubble[]; -extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; -extern const u32 gBattleAnimSpriteSheet_ElectricOrbs[]; -extern const u32 gBattleAnimSpriteSheet_CircleOfLight[]; -extern const u32 gBattleAnimSpriteSheet_Electricity[]; -extern const u32 gBattleAnimSpriteSheet_Finger2[]; -extern const u32 gBattleAnimSpriteSheet_MovementWaves[]; -extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; -extern const u32 gBattleAnimSpriteSheet_RedOrb[]; -extern const u32 gBattleAnimSpriteSheet_EyeSparkle[]; -extern const u32 gBattleAnimSpriteSheet_MagentaHeart[]; -extern const u32 gBattleAnimSpriteSheet_Angel[]; -extern const u32 gBattleAnimSpriteSheet_Devil[]; -extern const u32 gBattleAnimSpriteSheet_Swipe[]; -extern const u32 gBattleAnimSpriteSheet_Roots[]; -extern const u32 gBattleAnimSpriteSheet_ItemBag[]; -extern const u32 gBattleAnimSpriteSheet_JaggedMusicNote[]; -extern const u32 gBattleAnimSpriteSheet_Pokeball[]; -extern const u32 gBattleAnimSpriteSheet_Spotlight[]; -extern const u32 gBattleAnimSpriteSheet_LetterZ[]; -extern const u32 gBattleAnimSpriteSheet_RapidSpin[]; -extern const u32 gBattleAnimSpriteSheet_TriForceTriangle[]; -extern const u32 gBattleAnimSpriteSheet_WispOrb[]; -extern const u32 gBattleAnimSpriteSheet_WispFire[]; -extern const u32 gBattleAnimSpriteSheet_GoldStars[]; -extern const u32 gBattleAnimSpriteSheet_EclipsingOrb[]; -extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; -extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; -extern const u32 gBattleAnimSpriteSheet_GrayOrb[]; -extern const u32 gBattleAnimSpriteSheet_PinkPetal[]; -extern const u32 gBattleAnimSpriteSheet_PainSplit[]; -extern const u32 gBattleAnimSpriteSheet_Confetti[]; -extern const u32 gBattleAnimSpriteSheet_GreenStar[]; -extern const u32 gBattleAnimSpriteSheet_PinkCloud[]; -extern const u32 gBattleAnimSpriteSheet_SweatDrop[]; -extern const u32 gBattleAnimSpriteSheet_GuardRing[]; -extern const u32 gBattleAnimSpriteSheet_PurpleScratch[]; -extern const u32 gBattleAnimSpriteSheet_PurpleSwipe[]; -extern const u32 gBattleAnimSpriteSheet_TagHand[]; -extern const u32 gBattleAnimSpriteSheet_SmallRedEye[]; -extern const u32 gBattleAnimSpriteSheet_HollowOrb[]; -extern const u32 gBattleAnimSpriteSheet_XSign[]; -extern const u32 gBattleAnimSpriteSheet_BluegreenOrb[]; -extern const u32 gBattleAnimSpriteSheet_PawPrint[]; -extern const u32 gBattleAnimSpriteSheet_PurpleFlame[]; -extern const u32 gBattleAnimSpriteSheet_RedBall[]; -extern const u32 gBattleAnimSpriteSheet_SmellingsaltEffect[]; -extern const u32 gBattleAnimSpriteSheet_Meteor[]; -extern const u32 gBattleAnimSpriteSheet_FlatRock[]; -extern const u32 gBattleAnimSpriteSheet_MagnifyingGlass[]; -extern const u32 gBattleAnimSpriteSheet_MetalSoundWaves[]; -extern const u32 gBattleAnimSpriteSheet_FlyingDirt[]; -extern const u32 gBattleAnimSpriteSheet_IcicleSpear[]; -extern const u32 gBattleAnimSpriteSheet_Hail[]; -extern const u32 gBattleAnimSpriteSheet_GlowyRedOrb[]; -extern const u32 gBattleAnimSpriteSheet_GreenSpike[]; -extern const u32 gBattleAnimSpriteSheet_RedBrick[]; -extern const u32 gBattleAnimSpriteSheet_WhiteFeather[]; -extern const u32 gBattleAnimSpriteSheet_Sparkle6[]; -extern const u32 gBattleAnimSpriteSheet_Splash[]; -extern const u32 gBattleAnimSpriteSheet_SweatBead[]; -extern const u32 gBattleAnimSpriteSheet_Gem1[]; -extern const u32 gBattleAnimSpriteSheet_Gem2[]; -extern const u32 gBattleAnimSpriteSheet_Gem3[]; -extern const u32 gBattleAnimSpriteSheet_SlamHit2[]; -extern const u32 gBattleAnimSpriteSheet_Recycle[]; -extern const u32 gBattleAnimSpriteSheet_RedParticles[]; -extern const u32 gBattleAnimSpriteSheet_Protect[]; -extern const u32 gBattleAnimSpriteSheet_DirtMound[]; -extern const u32 gBattleAnimSpriteSheet_Shock3[]; -extern const u32 gBattleAnimSpriteSheet_WeatherBall[]; +extern const u32 gBattleAnimSpriteGfx_YellowUnk[]; +extern const u32 gBattleAnimSpriteGfx_RedFist[]; +extern const u32 gBattleAnimSpriteGfx_SlamHit[]; +extern const u32 gBattleAnimSpriteGfx_Ring[]; +extern const u32 gBattleAnimSpriteGfx_Rocks[]; +extern const u32 gBattleAnimSpriteGfx_Z[]; +extern const u32 gBattleAnimSpriteGfx_YellowUnk2[]; +extern const u32 gBattleAnimSpriteGfx_AirSlash[]; +extern const u32 gBattleAnimSpriteGfx_SpinningGreenOrbs[]; +extern const u32 gBattleAnimSpriteGfx_Leaf[]; +extern const u32 gBattleAnimSpriteGfx_Finger[]; +extern const u32 gBattleAnimSpriteGfx_PoisonPowder[]; +extern const u32 gBattleAnimSpriteGfx_BrownTriangle[]; +extern const u32 gBattleAnimSpriteGfx_Sparkle3[]; +extern const u32 gBattleAnimSpriteGfx_Sparkle4[]; +extern const u32 gBattleAnimSpriteGfx_MusicNotes[]; +extern const u32 gBattleAnimSpriteGfx_Duck[]; +extern const u32 gBattleAnimSpriteGfx_MudSand[]; +extern const u32 gBattleAnimSpriteGfx_Alert[]; +extern const u32 gBattleAnimSpriteGfx_BlueFlames[]; +extern const u32 gBattleAnimSpriteGfx_BlueFlames2[]; +extern const u32 gBattleAnimSpriteGfx_Shock4[]; +extern const u32 gBattleAnimSpriteGfx_Shock[]; +extern const u32 gBattleAnimSpriteGfx_Bell2[]; +extern const u32 gBattleAnimSpriteGfx_PinkGlove[]; +extern const u32 gBattleAnimSpriteGfx_BlueLines[]; +extern const u32 gBattleAnimSpriteGfx_Impact3[]; +extern const u32 gBattleAnimSpriteGfx_Impact2[]; +extern const u32 gBattleAnimSpriteGfx_Reticle[]; +extern const u32 gBattleAnimSpriteGfx_Breath[]; +extern const u32 gBattleAnimSpriteGfx_Anger[]; +extern const u32 gBattleAnimSpriteGfx_Snowball[]; +extern const u32 gBattleAnimSpriteGfx_Vine[]; +extern const u32 gBattleAnimSpriteGfx_Sword2[]; +extern const u32 gBattleAnimSpriteGfx_Clapping[]; +extern const u32 gBattleAnimSpriteGfx_RedTube[]; +extern const u32 gBattleAnimSpriteGfx_Amnesia[]; +extern const u32 gBattleAnimSpriteGfx_String2[]; +extern const u32 gBattleAnimSpriteGfx_Pencil2[]; +extern const u32 gBattleAnimSpriteGfx_Petal[]; +extern const u32 gBattleAnimSpriteGfx_BentSpoon[]; +extern const u32 gBattleAnimSpriteGfx_Web[]; +extern const u32 gBattleAnimSpriteGfx_MilkBottle[]; +extern const u32 gBattleAnimSpriteGfx_Coin[]; +extern const u32 gBattleAnimSpriteGfx_CrackedEgg[]; +extern const u32 gBattleAnimSpriteGfx_HatchedEgg[]; +extern const u32 gBattleAnimSpriteGfx_FreshEgg[]; +extern const u32 gBattleAnimSpriteGfx_Fangs[]; +extern const u32 gBattleAnimSpriteGfx_Explosion2[]; +extern const u32 gBattleAnimSpriteGfx_Explosion3[]; +extern const u32 gBattleAnimSpriteGfx_WaterDroplet[]; +extern const u32 gBattleAnimSpriteGfx_WaterDroplet2[]; +extern const u32 gBattleAnimSpriteGfx_Seed2[]; +extern const u32 gBattleAnimSpriteGfx_Sprout[]; +extern const u32 gBattleAnimSpriteGfx_RedWand[]; +extern const u32 gBattleAnimSpriteGfx_PurpleGreenUnk[]; +extern const u32 gBattleAnimSpriteGfx_WaterColumn[]; +extern const u32 gBattleAnimSpriteGfx_MudUnk[]; +extern const u32 gBattleAnimSpriteGfx_RainDrops[]; +extern const u32 gBattleAnimSpriteGfx_FurySwipes[]; +extern const u32 gBattleAnimSpriteGfx_Vine2[]; +extern const u32 gBattleAnimSpriteGfx_Teeth[]; +extern const u32 gBattleAnimSpriteGfx_Bone2[]; +extern const u32 gBattleAnimSpriteGfx_WhiteBag[]; +extern const u32 gBattleAnimSpriteGfx_Unknown[]; +extern const u32 gBattleAnimSpriteGfx_PurpleCoral[]; +extern const u32 gBattleAnimSpriteGfx_PurpleDroplet[]; +extern const u32 gBattleAnimSpriteGfx_Shock2[]; +extern const u32 gBattleAnimSpriteGfx_ClosingEye2[]; +extern const u32 gBattleAnimSpriteGfx_MetalBall[]; +extern const u32 gBattleAnimSpriteGfx_MonsterDoll[]; +extern const u32 gBattleAnimSpriteGfx_Whirlwind[]; +extern const u32 gBattleAnimSpriteGfx_Whirlwind2[]; +extern const u32 gBattleAnimSpriteGfx_Explosion4[]; +extern const u32 gBattleAnimSpriteGfx_Explosion5[]; +extern const u32 gBattleAnimSpriteGfx_Tongue[]; +extern const u32 gBattleAnimSpriteGfx_Smoke[]; +extern const u32 gBattleAnimSpriteGfx_Smoke2[]; +extern const u32 gBattleAnimSpriteGfx_Impact[]; +extern const u32 gBattleAnimSpriteGfx_Particles[]; +extern const u32 gBattleAnimSpriteGfx_CircleImpact[]; +extern const u32 gBattleAnimSpriteGfx_Scratch[]; +extern const u32 gBattleAnimSpriteGfx_Cut[]; +extern const u32 gBattleAnimSpriteGfx_SharpTeeth[]; +extern const u32 gBattleAnimSpriteGfx_RainbowRings[]; +extern const u32 gBattleAnimSpriteGfx_IceCrystals[]; +extern const u32 gBattleAnimSpriteGfx_IceSpikes[]; +extern const u32 gBattleAnimSpriteGfx_HandsAndFeet[]; +extern const u32 gBattleAnimSpriteGfx_MistCloud[]; +extern const u32 gBattleAnimSpriteGfx_Clamp[]; +//extern const struct CompressedSpriteSheet gBattleAnimSpriteGfx_146[]; +extern const u32 gBattleAnimSpriteGfx_Bubble[]; +extern const u32 gBattleAnimSpriteGfx_Orbs[]; +extern const u32 gBattleAnimSpriteGfx_WaterImpact[]; +extern const u32 gBattleAnimSpriteGfx_WaterOrb[]; +extern const u32 gBattleAnimSpriteGfx_PoisonBubble[]; +extern const u32 gBattleAnimSpriteGfx_ToxicBubble[]; +extern const u32 gBattleAnimSpriteGfx_Spikes[]; +extern const u32 gBattleAnimSpriteGfx_HornHit2[]; +extern const u32 gBattleAnimSpriteGfx_AirWave2[]; +extern const u32 gBattleAnimSpriteGfx_SmallBubbles[]; +extern const u32 gBattleAnimSpriteGfx_RoundShadow[]; +extern const u32 gBattleAnimSpriteGfx_Sunlight[]; +extern const u32 gBattleAnimSpriteGfx_Spore[]; +extern const u32 gBattleAnimSpriteGfx_Flower[]; +extern const u32 gBattleAnimSpriteGfx_RazorLeaf[]; +extern const u32 gBattleAnimSpriteGfx_Needle[]; +extern const u32 gBattleAnimSpriteGfx_WhirlwindLines[]; +extern const u32 gBattleAnimSpriteGfx_GoldRing[]; +extern const u32 gBattleAnimSpriteGfx_GreenLightWall[]; +extern const u32 gBattleAnimSpriteGfx_BlackBall2[]; +extern const u32 gBattleAnimSpriteGfx_SparkH[]; +extern const u32 gBattleAnimSpriteGfx_YellowStar[]; +extern const u32 gBattleAnimSpriteGfx_LargeFreshEgg[]; +extern const u32 gBattleAnimSpriteGfx_ShadowBall[]; +extern const u32 gBattleAnimSpriteGfx_Lick[]; +extern const u32 gBattleAnimSpriteGfx_VoidLines[]; +extern const u32 gBattleAnimSpriteGfx_String[]; +extern const u32 gBattleAnimSpriteGfx_WebThread[]; +extern const u32 gBattleAnimSpriteGfx_SpiderWeb[]; +extern const u32 gBattleAnimSpriteGfx_Lightbulb[]; +extern const u32 gBattleAnimSpriteGfx_Slash[]; +extern const u32 gBattleAnimSpriteGfx_FocusEnergy[]; +extern const u32 gBattleAnimSpriteGfx_SphereToCube[]; +extern const u32 gBattleAnimSpriteGfx_Tendrils[]; +extern const u32 gBattleAnimSpriteGfx_Eye[]; +extern const u32 gBattleAnimSpriteGfx_WhiteShadow[]; +extern const u32 gBattleAnimSpriteGfx_TealAlert[]; +extern const u32 gBattleAnimSpriteGfx_OpeningEye[]; +extern const u32 gBattleAnimSpriteGfx_RoundWhiteHalo[]; +extern const u32 gBattleAnimSpriteGfx_FangAttack[]; +extern const u32 gBattleAnimSpriteGfx_PurpleHandOutline[]; +extern const u32 gBattleAnimSpriteGfx_Moon[]; +extern const u32 gBattleAnimSpriteGfx_GreenSparkle[]; +extern const u32 gBattleAnimSpriteGfx_Spiral[]; +extern const u32 gBattleAnimSpriteGfx_SnoreZ[]; +extern const u32 gBattleAnimSpriteGfx_Explosion[]; +extern const u32 gBattleAnimSpriteGfx_Nail[]; +extern const u32 gBattleAnimSpriteGfx_GhostlySpirit[]; +extern const u32 gBattleAnimSpriteGfx_WarmRock[]; +extern const u32 gBattleAnimSpriteGfx_BreakingEgg[]; +extern const u32 gBattleAnimSpriteGfx_ThinRing[]; +extern const u32 gBattleAnimSpriteGfx_PunchImpact[]; +extern const u32 gBattleAnimSpriteGfx_Bell[]; +extern const u32 gBattleAnimSpriteGfx_MusicNotes2[]; +extern const u32 gBattleAnimSpriteGfx_SpeedDust[]; +extern const u32 gBattleAnimSpriteGfx_TornMetal[]; +extern const u32 gBattleAnimSpriteGfx_ThoughtBubble[]; +extern const u32 gBattleAnimSpriteGfx_MagentaHeart[]; +extern const u32 gBattleAnimSpriteGfx_ElectricOrbs[]; +extern const u32 gBattleAnimSpriteGfx_CircleOfLight[]; +extern const u32 gBattleAnimSpriteGfx_Electricity[]; +extern const u32 gBattleAnimSpriteGfx_Finger2[]; +extern const u32 gBattleAnimSpriteGfx_MovementWaves[]; +extern const u32 gBattleAnimSpriteGfx_MagentaHeart[]; +extern const u32 gBattleAnimSpriteGfx_RedOrb[]; +extern const u32 gBattleAnimSpriteGfx_EyeSparkle[]; +extern const u32 gBattleAnimSpriteGfx_MagentaHeart[]; +extern const u32 gBattleAnimSpriteGfx_Angel[]; +extern const u32 gBattleAnimSpriteGfx_Devil[]; +extern const u32 gBattleAnimSpriteGfx_Swipe[]; +extern const u32 gBattleAnimSpriteGfx_Roots[]; +extern const u32 gBattleAnimSpriteGfx_ItemBag[]; +extern const u32 gBattleAnimSpriteGfx_JaggedMusicNote[]; +extern const u32 gBattleAnimSpriteGfx_Pokeball[]; +extern const u32 gBattleAnimSpriteGfx_Spotlight[]; +extern const u32 gBattleAnimSpriteGfx_LetterZ[]; +extern const u32 gBattleAnimSpriteGfx_RapidSpin[]; +extern const u32 gBattleAnimSpriteGfx_TriForceTriangle[]; +extern const u32 gBattleAnimSpriteGfx_WispOrb[]; +extern const u32 gBattleAnimSpriteGfx_WispFire[]; +extern const u32 gBattleAnimSpriteGfx_GoldStars[]; +extern const u32 gBattleAnimSpriteGfx_EclipsingOrb[]; +extern const u32 gBattleAnimSpriteGfx_GrayOrb[]; +extern const u32 gBattleAnimSpriteGfx_GrayOrb[]; +extern const u32 gBattleAnimSpriteGfx_GrayOrb[]; +extern const u32 gBattleAnimSpriteGfx_PinkPetal[]; +extern const u32 gBattleAnimSpriteGfx_PainSplit[]; +extern const u32 gBattleAnimSpriteGfx_Confetti[]; +extern const u32 gBattleAnimSpriteGfx_GreenStar[]; +extern const u32 gBattleAnimSpriteGfx_PinkCloud[]; +extern const u32 gBattleAnimSpriteGfx_SweatDrop[]; +extern const u32 gBattleAnimSpriteGfx_GuardRing[]; +extern const u32 gBattleAnimSpriteGfx_PurpleScratch[]; +extern const u32 gBattleAnimSpriteGfx_PurpleSwipe[]; +extern const u32 gBattleAnimSpriteGfx_TagHand[]; +extern const u32 gBattleAnimSpriteGfx_SmallRedEye[]; +extern const u32 gBattleAnimSpriteGfx_HollowOrb[]; +extern const u32 gBattleAnimSpriteGfx_XSign[]; +extern const u32 gBattleAnimSpriteGfx_BluegreenOrb[]; +extern const u32 gBattleAnimSpriteGfx_PawPrint[]; +extern const u32 gBattleAnimSpriteGfx_PurpleFlame[]; +extern const u32 gBattleAnimSpriteGfx_RedBall[]; +extern const u32 gBattleAnimSpriteGfx_SmellingsaltEffect[]; +extern const u32 gBattleAnimSpriteGfx_Meteor[]; +extern const u32 gBattleAnimSpriteGfx_FlatRock[]; +extern const u32 gBattleAnimSpriteGfx_MagnifyingGlass[]; +extern const u32 gBattleAnimSpriteGfx_MetalSoundWaves[]; +extern const u32 gBattleAnimSpriteGfx_FlyingDirt[]; +extern const u32 gBattleAnimSpriteGfx_IcicleSpear[]; +extern const u32 gBattleAnimSpriteGfx_Hail[]; +extern const u32 gBattleAnimSpriteGfx_GlowyRedOrb[]; +extern const u32 gBattleAnimSpriteGfx_GreenSpike[]; +extern const u32 gBattleAnimSpriteGfx_RedBrick[]; +extern const u32 gBattleAnimSpriteGfx_WhiteFeather[]; +extern const u32 gBattleAnimSpriteGfx_Sparkle6[]; +extern const u32 gBattleAnimSpriteGfx_Splash[]; +extern const u32 gBattleAnimSpriteGfx_SweatBead[]; +extern const u32 gBattleAnimSpriteGfx_Gem1[]; +extern const u32 gBattleAnimSpriteGfx_Gem2[]; +extern const u32 gBattleAnimSpriteGfx_Gem3[]; +extern const u32 gBattleAnimSpriteGfx_SlamHit2[]; +extern const u32 gBattleAnimSpriteGfx_Recycle[]; +extern const u32 gBattleAnimSpriteGfx_RedParticles[]; +extern const u32 gBattleAnimSpriteGfx_Protect[]; +extern const u32 gBattleAnimSpriteGfx_DirtMound[]; +extern const u32 gBattleAnimSpriteGfx_Shock3[]; +extern const u32 gBattleAnimSpriteGfx_WeatherBall[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[]; extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; -extern const u32 gBattleAnimSpriteSheet_Bird[]; -extern const u32 gBattleAnimSpriteSheet_CrossImpact[]; +extern const u32 gBattleAnimSpriteGfx_Bird[]; +extern const u32 gBattleAnimSpriteGfx_CrossImpact[]; -extern const u32 gBattleAnimSpritePalette_Bone[]; -extern const u32 gBattleAnimSpritePalette_Spark[]; -extern const u32 gBattleAnimSpritePalette_Pencil[]; -extern const u32 gBattleAnimSpritePalette_AirWave[]; -extern const u32 gBattleAnimSpritePalette_Orb[]; -extern const u32 gBattleAnimSpritePalette_Sword[]; -extern const u32 gBattleAnimSpritePalette_Seed[]; -extern const u32 gBattleAnimSpritePalette_Explosion6[]; -extern const u32 gBattleAnimSpritePalette_PinkOrb[]; -extern const u32 gBattleAnimSpritePalette_Gust[]; -extern const u32 gBattleAnimSpritePalette_IceCube[]; -extern const u32 gBattleAnimSpritePalette_Spark2[]; -extern const u32 gBattleAnimSpritePalette_Orange[]; -extern const u32 gBattleAnimSpritePalette_YellowBall[]; -extern const u32 gBattleAnimSpritePalette_LockOn[]; -extern const u32 gBattleAnimSpritePalette_TiedBag[]; -extern const u32 gBattleAnimSpritePalette_BlackSmoke[]; -extern const u32 gBattleAnimSpritePalette_BlackSmoke[]; -extern const u32 gBattleAnimSpritePalette_Conversion[]; -extern const u32 gBattleAnimSpritePalette_Glass[]; -extern const u32 gBattleAnimSpritePalette_HornHit[]; -extern const u32 gBattleAnimSpritePalette_Hit[]; -extern const u32 gBattleAnimSpritePalette_Hit2[]; -extern const u32 gBattleAnimSpritePalette_BlueShards[]; -extern const u32 gBattleAnimSpritePalette_ClosingEye[]; -extern const u32 gBattleAnimSpritePalette_WavingHand[]; -extern const u32 gBattleAnimSpritePalette_HitDuplicate[]; -extern const u32 gBattleAnimSpritePalette_Leer[]; -extern const u32 gBattleAnimSpritePalette_BlueBurst[]; -extern const u32 gBattleAnimSpritePalette_SmallEmber[]; -extern const u32 gBattleAnimSpritePalette_GraySmoke[]; -extern const u32 gBattleAnimSpritePalette_BlueStar[]; -extern const u32 gBattleAnimSpritePalette_BubbleBurst[]; -extern const u32 gBattleAnimSpritePalette_Fire[]; -extern const u32 gBattleAnimSpritePalette_Fire[]; -extern const u32 gBattleAnimSpritePalette_Fire[]; -extern const u32 gBattleAnimSpritePalette_Lightning2[]; -extern const u32 gBattleAnimSpritePalette_Lightning2[]; -extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; -extern const u32 gBattleAnimSpritePalette_ClawSlash[]; -extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; -extern const u32 gBattleAnimSpritePalette_ClawSlash2[]; -extern const u32 gBattleAnimSpritePalette_BubbleBurst2[]; -extern const u32 gBattleAnimSpritePalette_IceChunk[]; -extern const u32 gBattleAnimSpritePalette_Glass2[]; -extern const u32 gBattleAnimSpritePalette_PinkHeart2[]; -extern const u32 gBattleAnimSpritePalette_SapDrip[]; -extern const u32 gBattleAnimSpritePalette_SapDrip2[]; -extern const u32 gBattleAnimSpritePalette_Sparkle1[]; -extern const u32 gBattleAnimSpritePalette_Sparkle2[]; -extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; -extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; -extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; -extern const u32 gBattleAnimSpritePalette_HitDuplicate[]; -extern const u32 gBattleAnimSpritePalette_YellowUnk[]; -extern const u32 gBattleAnimSpritePalette_HumanoidFoot[]; -extern const u32 gBattleAnimSpritePalette_SlamHit[]; -extern const u32 gBattleAnimSpritePalette_Ring[]; -extern const u32 gBattleAnimSpritePalette_Rocks[]; -extern const u32 gBattleAnimSpritePalette_Z[]; -extern const u32 gBattleAnimSpritePalette_YellowUnk2[]; -extern const u32 gBattleAnimSpritePalette_AirSlash[]; -extern const u32 gBattleAnimSpritePalette_SpinningGreenOrbs[]; -extern const u32 gBattleAnimSpritePalette_Leaf[]; -extern const u32 gBattleAnimSpritePalette_Finger[]; -extern const u32 gBattleAnimSpritePalette_PoisonPowder[]; -extern const u32 gBattleAnimSpritePalette_BrownTriangle[]; -extern const u32 gBattleAnimSpritePalette_SleepPowder[]; -extern const u32 gBattleAnimSpritePalette_StunSpore[]; -extern const u32 gBattleAnimSpritePalette_PoisonPowder[]; -extern const u32 gBattleAnimSpritePalette_Sparkle3[]; -extern const u32 gBattleAnimSpritePalette_Sparkle3[]; -extern const u32 gBattleAnimSpritePalette_MusicNotes[]; -extern const u32 gBattleAnimSpritePalette_Duck[]; -extern const u32 gBattleAnimSpritePalette_MudSand[]; -extern const u32 gBattleAnimSpritePalette_Alert[]; -extern const u32 gBattleAnimSpritePalette_BlueFlames[]; -extern const u32 gBattleAnimSpritePalette_BlueFlames[]; -extern const u32 gBattleAnimSpritePalette_Shock4[]; -extern const u32 gBattleAnimSpritePalette_Shock4[]; -extern const u32 gBattleAnimSpritePalette_Bell2[]; -extern const u32 gBattleAnimSpritePalette_PinkGlove[]; -extern const u32 gBattleAnimSpritePalette_BlueLines[]; -extern const u32 gBattleAnimSpritePalette_Impact3[]; -extern const u32 gBattleAnimSpritePalette_Impact2[]; -extern const u32 gBattleAnimSpritePalette_Reticle[]; -extern const u32 gBattleAnimSpritePalette_Breath[]; -extern const u32 gBattleAnimSpritePalette_Anger[]; -extern const u32 gBattleAnimSpritePalette_Snowball[]; -extern const u32 gBattleAnimSpritePalette_Vine[]; -extern const u32 gBattleAnimSpritePalette_Sword2[]; -extern const u32 gBattleAnimSpritePalette_Clapping[]; -extern const u32 gBattleAnimSpritePalette_RedTube[]; -extern const u32 gBattleAnimSpritePalette_Amnesia[]; -extern const u32 gBattleAnimSpritePalette_String2[]; -extern const u32 gBattleAnimSpritePalette_Pencil2[]; -extern const u32 gBattleAnimSpritePalette_Petal[]; -extern const u32 gBattleAnimSpritePalette_BentSpoon[]; -extern const u32 gBattleAnimSpritePalette_String2[]; -extern const u32 gBattleAnimSpritePalette_MilkBottle[]; -extern const u32 gBattleAnimSpritePalette_Coin[]; -extern const u32 gBattleAnimSpritePalette_CrackedEgg[]; -extern const u32 gBattleAnimSpritePalette_CrackedEgg[]; -extern const u32 gBattleAnimSpritePalette_FreshEgg[]; -extern const u32 gBattleAnimSpritePalette_Fangs[]; -extern const u32 gBattleAnimSpritePalette_Explosion2[]; -extern const u32 gBattleAnimSpritePalette_Explosion2[]; -extern const u32 gBattleAnimSpritePalette_WaterDroplet[]; -extern const u32 gBattleAnimSpritePalette_WaterDroplet[]; -extern const u32 gBattleAnimSpritePalette_Seed2[]; -extern const u32 gBattleAnimSpritePalette_Seed2[]; -extern const u32 gBattleAnimSpritePalette_RedWand[]; -extern const u32 gBattleAnimSpritePalette_PurpleGreenUnk[]; -extern const u32 gBattleAnimSpritePalette_WaterColumn[]; -extern const u32 gBattleAnimSpritePalette_MudUnk[]; -extern const u32 gBattleAnimSpritePalette_RainDrops[]; -extern const u32 gBattleAnimSpritePalette_FurySwipes[]; -extern const u32 gBattleAnimSpritePalette_Vine2[]; -extern const u32 gBattleAnimSpritePalette_Teeth[]; -extern const u32 gBattleAnimSpritePalette_Bone2[]; -extern const u32 gBattleAnimSpritePalette_WhiteBag[]; -extern const u32 gBattleAnimSpritePalette_Unknown[]; -extern const u32 gBattleAnimSpritePalette_PurpleCoral[]; -extern const u32 gBattleAnimSpritePalette_PurpleCoral[]; -extern const u32 gBattleAnimSpritePalette_Shock2[]; -extern const u32 gBattleAnimSpritePalette_ClosingEye2[]; -extern const u32 gBattleAnimSpritePalette_MetalBall[]; -extern const u32 gBattleAnimSpritePalette_MonsterDoll[]; -extern const u32 gBattleAnimSpritePalette_Whirlwind[]; -extern const u32 gBattleAnimSpritePalette_Whirlwind[]; -extern const u32 gBattleAnimSpritePalette_Explosion4[]; -extern const u32 gBattleAnimSpritePalette_Explosion4[]; -extern const u32 gBattleAnimSpritePalette_Tongue[]; -extern const u32 gBattleAnimSpritePalette_Smoke[]; -extern const u32 gBattleAnimSpritePalette_Smoke[]; -extern const u32 gBattleAnimSpritePalette_Impact[]; -extern const u32 gBattleAnimSpritePalette_CircleImpact[]; -extern const u32 gBattleAnimSpritePalette_Impact[]; -extern const u32 gBattleAnimSpritePalette_Impact[]; -extern const u32 gBattleAnimSpritePalette_SharpTeeth[]; -extern const u32 gBattleAnimSpritePalette_RainbowRings[]; -extern const u32 gBattleAnimSpritePalette_IceCrystals[]; -extern const u32 gBattleAnimSpritePalette_IceCrystals[]; -extern const u32 gBattleAnimSpritePalette_HandsAndFeet[]; -extern const u32 gBattleAnimSpritePalette_MistCloud[]; -extern const u32 gBattleAnimSpritePalette_SharpTeeth[]; -extern const u32 gBattleAnimSpritePalette_RainDrops[]; -extern const u32 gBattleAnimSpritePalette_Orbs[]; -extern const u32 gBattleAnimSpritePalette_WaterImpact[]; -extern const u32 gBattleAnimSpritePalette_WaterImpact[]; -extern const u32 gBattleAnimSpritePalette_PoisonBubble[]; -extern const u32 gBattleAnimSpritePalette_PoisonBubble[]; -extern const u32 gBattleAnimSpritePalette_Spikes[]; -extern const u32 gBattleAnimSpritePalette_HornHit2[]; -extern const u32 gBattleAnimSpritePalette_AirWave2[]; -extern const u32 gBattleAnimSpritePalette_SmallBubbles[]; -extern const u32 gBattleAnimSpritePalette_RoundShadow[]; -extern const u32 gBattleAnimSpritePalette_Sunlight[]; -extern const u32 gBattleAnimSpritePalette_Spore[]; -extern const u32 gBattleAnimSpritePalette_Flower[]; -extern const u32 gBattleAnimSpritePalette_RazorLeaf[]; -extern const u32 gBattleAnimSpritePalette_Needle[]; -extern const u32 gBattleAnimSpritePalette_WhirlwindLines[]; -extern const u32 gBattleAnimSpritePalette_GoldRing[]; -extern const u32 gBattleAnimSpritePalette_PurpleRing[]; -extern const u32 gBattleAnimSpritePalette_BlueRing[]; -extern const u32 gBattleAnimSpritePalette_GreenLightWall[]; -extern const u32 gBattleAnimSpritePalette_BlueLightWall[]; -extern const u32 gBattleAnimSpritePalette_RedLightWall[]; -extern const u32 gBattleAnimSpritePalette_GrayLightWall[]; -extern const u32 gBattleAnimSpritePalette_OrangeLightWall[]; -extern const u32 gBattleAnimSpritePalette_BlackBall2[]; -extern const u32 gBattleAnimSpritePalette_PurpleGasCloud[]; -extern const u32 gBattleAnimSpritePalette_YellowStar[]; -extern const u32 gBattleAnimSpritePalette_LargeFreshEgg[]; -extern const u32 gBattleAnimSpritePalette_ShadowBall[]; -extern const u32 gBattleAnimSpritePalette_Lick[]; -extern const u32 gBattleAnimSpritePalette_VoidLines[]; -extern const u32 gBattleAnimSpritePalette_String[]; -extern const u32 gBattleAnimSpritePalette_Lightbulb[]; -extern const u32 gBattleAnimSpritePalette_Slash[]; -extern const u32 gBattleAnimSpritePalette_FocusEnergy[]; -extern const u32 gBattleAnimSpritePalette_SphereToCube[]; -extern const u32 gBattleAnimSpritePalette_Tendrils[]; -extern const u32 gBattleAnimSpritePalette_Eye[]; -extern const u32 gBattleAnimSpritePalette_WhiteShadow[]; -extern const u32 gBattleAnimSpritePalette_TealAlert[]; -extern const u32 gBattleAnimSpritePalette_OpeningEye[]; -extern const u32 gBattleAnimSpritePalette_RoundWhiteHalo[]; -extern const u32 gBattleAnimSpritePalette_FangAttack[]; -extern const u32 gBattleAnimSpritePalette_PurpleHandOutline[]; -extern const u32 gBattleAnimSpritePalette_Moon[]; -extern const u32 gBattleAnimSpritePalette_GreenSparkle[]; -extern const u32 gBattleAnimSpritePalette_Spiral[]; -extern const u32 gBattleAnimSpritePalette_SnoreZ[]; -extern const u32 gBattleAnimSpritePalette_Explosion[]; -extern const u32 gBattleAnimSpritePalette_Nail[]; -extern const u32 gBattleAnimSpritePalette_GhostlySpirit[]; -extern const u32 gBattleAnimSpritePalette_WarmRock[]; -extern const u32 gBattleAnimSpritePalette_BreakingEgg[]; -extern const u32 gBattleAnimSpritePalette_ThinRing[]; -extern const u32 gBattleAnimSpritePalette_PunchImpact[]; -extern const u32 gBattleAnimSpritePalette_Bell[]; -extern const u32 gBattleAnimSpritePalette_MusicNotes2[]; -extern const u32 gBattleAnimSpritePalette_SpeedDust[]; -extern const u32 gBattleAnimSpritePalette_ThoughtBubble[]; -extern const u32 gBattleAnimSpritePalette_MagentaHeart[]; -extern const u32 gBattleAnimSpritePalette_ElectricOrbs[]; -extern const u32 gBattleAnimSpritePalette_MovementWaves[]; +extern const u32 gBattleAnimSpritePal_Bone[]; +extern const u32 gBattleAnimSpritePal_Spark[]; +extern const u32 gBattleAnimSpritePal_Pencil[]; +extern const u32 gBattleAnimSpritePal_AirWave[]; +extern const u32 gBattleAnimSpritePal_Orb[]; +extern const u32 gBattleAnimSpritePal_Sword[]; +extern const u32 gBattleAnimSpritePal_Seed[]; +extern const u32 gBattleAnimSpritePal_Explosion6[]; +extern const u32 gBattleAnimSpritePal_PinkOrb[]; +extern const u32 gBattleAnimSpritePal_Gust[]; +extern const u32 gBattleAnimSpritePal_IceCube[]; +extern const u32 gBattleAnimSpritePal_Spark2[]; +extern const u32 gBattleAnimSpritePal_Orange[]; +extern const u32 gBattleAnimSpritePal_YellowBall[]; +extern const u32 gBattleAnimSpritePal_LockOn[]; +extern const u32 gBattleAnimSpritePal_TiedBag[]; +extern const u32 gBattleAnimSpritePal_BlackSmoke[]; +extern const u32 gBattleAnimSpritePal_BlackSmoke[]; +extern const u32 gBattleAnimSpritePal_Conversion[]; +extern const u32 gBattleAnimSpritePal_Glass[]; +extern const u32 gBattleAnimSpritePal_HornHit[]; +extern const u32 gBattleAnimSpritePal_Hit[]; +extern const u32 gBattleAnimSpritePal_Hit2[]; +extern const u32 gBattleAnimSpritePal_BlueShards[]; +extern const u32 gBattleAnimSpritePal_ClosingEye[]; +extern const u32 gBattleAnimSpritePal_WavingHand[]; +extern const u32 gBattleAnimSpritePal_HitDuplicate[]; +extern const u32 gBattleAnimSpritePal_Leer[]; +extern const u32 gBattleAnimSpritePal_BlueBurst[]; +extern const u32 gBattleAnimSpritePal_SmallEmber[]; +extern const u32 gBattleAnimSpritePal_GraySmoke[]; +extern const u32 gBattleAnimSpritePal_BlueStar[]; +extern const u32 gBattleAnimSpritePal_BubbleBurst[]; +extern const u32 gBattleAnimSpritePal_Fire[]; +extern const u32 gBattleAnimSpritePal_Fire[]; +extern const u32 gBattleAnimSpritePal_Fire[]; +extern const u32 gBattleAnimSpritePal_Lightning2[]; +extern const u32 gBattleAnimSpritePal_Lightning2[]; +extern const u32 gBattleAnimSpritePal_ClawSlash2[]; +extern const u32 gBattleAnimSpritePal_ClawSlash[]; +extern const u32 gBattleAnimSpritePal_ClawSlash2[]; +extern const u32 gBattleAnimSpritePal_ClawSlash2[]; +extern const u32 gBattleAnimSpritePal_BubbleBurst2[]; +extern const u32 gBattleAnimSpritePal_IceChunk[]; +extern const u32 gBattleAnimSpritePal_Glass2[]; +extern const u32 gBattleAnimSpritePal_PinkHeart2[]; +extern const u32 gBattleAnimSpritePal_SapDrip[]; +extern const u32 gBattleAnimSpritePal_SapDrip2[]; +extern const u32 gBattleAnimSpritePal_Sparkle1[]; +extern const u32 gBattleAnimSpritePal_Sparkle2[]; +extern const u32 gBattleAnimSpritePal_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePal_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePal_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePal_HitDuplicate[]; +extern const u32 gBattleAnimSpritePal_YellowUnk[]; +extern const u32 gBattleAnimSpritePal_HumanoidFoot[]; +extern const u32 gBattleAnimSpritePal_SlamHit[]; +extern const u32 gBattleAnimSpritePal_Ring[]; +extern const u32 gBattleAnimSpritePal_Rocks[]; +extern const u32 gBattleAnimSpritePal_Z[]; +extern const u32 gBattleAnimSpritePal_YellowUnk2[]; +extern const u32 gBattleAnimSpritePal_AirSlash[]; +extern const u32 gBattleAnimSpritePal_SpinningGreenOrbs[]; +extern const u32 gBattleAnimSpritePal_Leaf[]; +extern const u32 gBattleAnimSpritePal_Finger[]; +extern const u32 gBattleAnimSpritePal_PoisonPowder[]; +extern const u32 gBattleAnimSpritePal_BrownTriangle[]; +extern const u32 gBattleAnimSpritePal_SleepPowder[]; +extern const u32 gBattleAnimSpritePal_StunSpore[]; +extern const u32 gBattleAnimSpritePal_PoisonPowder[]; +extern const u32 gBattleAnimSpritePal_Sparkle3[]; +extern const u32 gBattleAnimSpritePal_Sparkle3[]; +extern const u32 gBattleAnimSpritePal_MusicNotes[]; +extern const u32 gBattleAnimSpritePal_Duck[]; +extern const u32 gBattleAnimSpritePal_MudSand[]; +extern const u32 gBattleAnimSpritePal_Alert[]; +extern const u32 gBattleAnimSpritePal_BlueFlames[]; +extern const u32 gBattleAnimSpritePal_BlueFlames[]; +extern const u32 gBattleAnimSpritePal_Shock4[]; +extern const u32 gBattleAnimSpritePal_Shock4[]; +extern const u32 gBattleAnimSpritePal_Bell2[]; +extern const u32 gBattleAnimSpritePal_PinkGlove[]; +extern const u32 gBattleAnimSpritePal_BlueLines[]; +extern const u32 gBattleAnimSpritePal_Impact3[]; +extern const u32 gBattleAnimSpritePal_Impact2[]; +extern const u32 gBattleAnimSpritePal_Reticle[]; +extern const u32 gBattleAnimSpritePal_Breath[]; +extern const u32 gBattleAnimSpritePal_Anger[]; +extern const u32 gBattleAnimSpritePal_Snowball[]; +extern const u32 gBattleAnimSpritePal_Vine[]; +extern const u32 gBattleAnimSpritePal_Sword2[]; +extern const u32 gBattleAnimSpritePal_Clapping[]; +extern const u32 gBattleAnimSpritePal_RedTube[]; +extern const u32 gBattleAnimSpritePal_Amnesia[]; +extern const u32 gBattleAnimSpritePal_String2[]; +extern const u32 gBattleAnimSpritePal_Pencil2[]; +extern const u32 gBattleAnimSpritePal_Petal[]; +extern const u32 gBattleAnimSpritePal_BentSpoon[]; +extern const u32 gBattleAnimSpritePal_String2[]; +extern const u32 gBattleAnimSpritePal_MilkBottle[]; +extern const u32 gBattleAnimSpritePal_Coin[]; +extern const u32 gBattleAnimSpritePal_CrackedEgg[]; +extern const u32 gBattleAnimSpritePal_CrackedEgg[]; +extern const u32 gBattleAnimSpritePal_FreshEgg[]; +extern const u32 gBattleAnimSpritePal_Fangs[]; +extern const u32 gBattleAnimSpritePal_Explosion2[]; +extern const u32 gBattleAnimSpritePal_Explosion2[]; +extern const u32 gBattleAnimSpritePal_WaterDroplet[]; +extern const u32 gBattleAnimSpritePal_WaterDroplet[]; +extern const u32 gBattleAnimSpritePal_Seed2[]; +extern const u32 gBattleAnimSpritePal_Seed2[]; +extern const u32 gBattleAnimSpritePal_RedWand[]; +extern const u32 gBattleAnimSpritePal_PurpleGreenUnk[]; +extern const u32 gBattleAnimSpritePal_WaterColumn[]; +extern const u32 gBattleAnimSpritePal_MudUnk[]; +extern const u32 gBattleAnimSpritePal_RainDrops[]; +extern const u32 gBattleAnimSpritePal_FurySwipes[]; +extern const u32 gBattleAnimSpritePal_Vine2[]; +extern const u32 gBattleAnimSpritePal_Teeth[]; +extern const u32 gBattleAnimSpritePal_Bone2[]; +extern const u32 gBattleAnimSpritePal_WhiteBag[]; +extern const u32 gBattleAnimSpritePal_Unknown[]; +extern const u32 gBattleAnimSpritePal_PurpleCoral[]; +extern const u32 gBattleAnimSpritePal_PurpleCoral[]; +extern const u32 gBattleAnimSpritePal_Shock2[]; +extern const u32 gBattleAnimSpritePal_ClosingEye2[]; +extern const u32 gBattleAnimSpritePal_MetalBall[]; +extern const u32 gBattleAnimSpritePal_MonsterDoll[]; +extern const u32 gBattleAnimSpritePal_Whirlwind[]; +extern const u32 gBattleAnimSpritePal_Whirlwind[]; +extern const u32 gBattleAnimSpritePal_Explosion4[]; +extern const u32 gBattleAnimSpritePal_Explosion4[]; +extern const u32 gBattleAnimSpritePal_Tongue[]; +extern const u32 gBattleAnimSpritePal_Smoke[]; +extern const u32 gBattleAnimSpritePal_Smoke[]; +extern const u32 gBattleAnimSpritePal_Impact[]; +extern const u32 gBattleAnimSpritePal_CircleImpact[]; +extern const u32 gBattleAnimSpritePal_Impact[]; +extern const u32 gBattleAnimSpritePal_Impact[]; +extern const u32 gBattleAnimSpritePal_SharpTeeth[]; +extern const u32 gBattleAnimSpritePal_RainbowRings[]; +extern const u32 gBattleAnimSpritePal_IceCrystals[]; +extern const u32 gBattleAnimSpritePal_IceCrystals[]; +extern const u32 gBattleAnimSpritePal_HandsAndFeet[]; +extern const u32 gBattleAnimSpritePal_MistCloud[]; +extern const u32 gBattleAnimSpritePal_SharpTeeth[]; +extern const u32 gBattleAnimSpritePal_RainDrops[]; +extern const u32 gBattleAnimSpritePal_Orbs[]; +extern const u32 gBattleAnimSpritePal_WaterImpact[]; +extern const u32 gBattleAnimSpritePal_WaterImpact[]; +extern const u32 gBattleAnimSpritePal_PoisonBubble[]; +extern const u32 gBattleAnimSpritePal_PoisonBubble[]; +extern const u32 gBattleAnimSpritePal_Spikes[]; +extern const u32 gBattleAnimSpritePal_HornHit2[]; +extern const u32 gBattleAnimSpritePal_AirWave2[]; +extern const u32 gBattleAnimSpritePal_SmallBubbles[]; +extern const u32 gBattleAnimSpritePal_RoundShadow[]; +extern const u32 gBattleAnimSpritePal_Sunlight[]; +extern const u32 gBattleAnimSpritePal_Spore[]; +extern const u32 gBattleAnimSpritePal_Flower[]; +extern const u32 gBattleAnimSpritePal_RazorLeaf[]; +extern const u32 gBattleAnimSpritePal_Needle[]; +extern const u32 gBattleAnimSpritePal_WhirlwindLines[]; +extern const u32 gBattleAnimSpritePal_GoldRing[]; +extern const u32 gBattleAnimSpritePal_PurpleRing[]; +extern const u32 gBattleAnimSpritePal_BlueRing[]; +extern const u32 gBattleAnimSpritePal_GreenLightWall[]; +extern const u32 gBattleAnimSpritePal_BlueLightWall[]; +extern const u32 gBattleAnimSpritePal_RedLightWall[]; +extern const u32 gBattleAnimSpritePal_GrayLightWall[]; +extern const u32 gBattleAnimSpritePal_OrangeLightWall[]; +extern const u32 gBattleAnimSpritePal_BlackBall2[]; +extern const u32 gBattleAnimSpritePal_PurpleGasCloud[]; +extern const u32 gBattleAnimSpritePal_YellowStar[]; +extern const u32 gBattleAnimSpritePal_LargeFreshEgg[]; +extern const u32 gBattleAnimSpritePal_ShadowBall[]; +extern const u32 gBattleAnimSpritePal_Lick[]; +extern const u32 gBattleAnimSpritePal_VoidLines[]; +extern const u32 gBattleAnimSpritePal_String[]; +extern const u32 gBattleAnimSpritePal_Lightbulb[]; +extern const u32 gBattleAnimSpritePal_Slash[]; +extern const u32 gBattleAnimSpritePal_FocusEnergy[]; +extern const u32 gBattleAnimSpritePal_SphereToCube[]; +extern const u32 gBattleAnimSpritePal_Tendrils[]; +extern const u32 gBattleAnimSpritePal_Eye[]; +extern const u32 gBattleAnimSpritePal_WhiteShadow[]; +extern const u32 gBattleAnimSpritePal_TealAlert[]; +extern const u32 gBattleAnimSpritePal_OpeningEye[]; +extern const u32 gBattleAnimSpritePal_RoundWhiteHalo[]; +extern const u32 gBattleAnimSpritePal_FangAttack[]; +extern const u32 gBattleAnimSpritePal_PurpleHandOutline[]; +extern const u32 gBattleAnimSpritePal_Moon[]; +extern const u32 gBattleAnimSpritePal_GreenSparkle[]; +extern const u32 gBattleAnimSpritePal_Spiral[]; +extern const u32 gBattleAnimSpritePal_SnoreZ[]; +extern const u32 gBattleAnimSpritePal_Explosion[]; +extern const u32 gBattleAnimSpritePal_Nail[]; +extern const u32 gBattleAnimSpritePal_GhostlySpirit[]; +extern const u32 gBattleAnimSpritePal_WarmRock[]; +extern const u32 gBattleAnimSpritePal_BreakingEgg[]; +extern const u32 gBattleAnimSpritePal_ThinRing[]; +extern const u32 gBattleAnimSpritePal_PunchImpact[]; +extern const u32 gBattleAnimSpritePal_Bell[]; +extern const u32 gBattleAnimSpritePal_MusicNotes2[]; +extern const u32 gBattleAnimSpritePal_SpeedDust[]; +extern const u32 gBattleAnimSpritePal_ThoughtBubble[]; +extern const u32 gBattleAnimSpritePal_MagentaHeart[]; +extern const u32 gBattleAnimSpritePal_ElectricOrbs[]; +extern const u32 gBattleAnimSpritePal_MovementWaves[]; extern const u32 gUnknown_08C249D0[]; extern const u32 gUnknown_08C249F8[]; -extern const u32 gBattleAnimSpritePalette_RedHeart[]; -extern const u32 gBattleAnimSpritePalette_RedOrb[]; -extern const u32 gBattleAnimSpritePalette_EyeSparkle[]; -extern const u32 gBattleAnimSpritePalette_PinkHeart[]; +extern const u32 gBattleAnimSpritePal_RedHeart[]; +extern const u32 gBattleAnimSpritePal_RedOrb[]; +extern const u32 gBattleAnimSpritePal_EyeSparkle[]; +extern const u32 gBattleAnimSpritePal_PinkHeart[]; extern const u32 gUnknown_08C232E0; extern const u32 gUnknown_08C23D50; extern const u32 gUnknown_08C23D78; -extern const u32 gBattleAnimSpritePalette_Angel[]; -extern const u32 gBattleAnimSpritePalette_Devil[]; -extern const u32 gBattleAnimSpritePalette_Swipe[]; -extern const u32 gBattleAnimSpritePalette_Roots[]; -extern const u32 gBattleAnimSpritePalette_ItemBag[]; -extern const u32 gBattleAnimSpritePalette_JaggedMusicNote[]; -extern const u32 gBattleAnimSpritePalette_Pokeball[]; -extern const u32 gBattleAnimSpritePalette_LetterZ[]; -extern const u32 gBattleAnimSpritePalette_RapidSpin[]; -extern const u32 gBattleAnimSpritePalette_TriForceTriangle[]; -extern const u32 gBattleAnimSpritePalette_WispOrb[]; -extern const u32 gBattleAnimSpritePalette_GoldStars[]; -extern const u32 gBattleAnimSpritePalette_EclipsingOrb[]; -extern const u32 gBattleAnimSpritePalette_GrayOrb[]; -extern const u32 gBattleAnimSpritePalette_BlueOrb[]; -extern const u32 gBattleAnimSpritePalette_RedOrb2[]; -extern const u32 gBattleAnimSpritePalette_PinkPetal[]; -extern const u32 gBattleAnimSpritePalette_PainSplit[]; -extern const u32 gBattleAnimSpritePalette_Confetti[]; -extern const u32 gBattleAnimSpritePalette_GreenStar[]; -extern const u32 gBattleAnimSpritePalette_PinkCloud[]; -extern const u32 gBattleAnimSpritePalette_SweatDrop[]; -extern const u32 gBattleAnimSpritePalette_GuardRing[]; +extern const u32 gBattleAnimSpritePal_Angel[]; +extern const u32 gBattleAnimSpritePal_Devil[]; +extern const u32 gBattleAnimSpritePal_Swipe[]; +extern const u32 gBattleAnimSpritePal_Roots[]; +extern const u32 gBattleAnimSpritePal_ItemBag[]; +extern const u32 gBattleAnimSpritePal_JaggedMusicNote[]; +extern const u32 gBattleAnimSpritePal_Pokeball[]; +extern const u32 gBattleAnimSpritePal_LetterZ[]; +extern const u32 gBattleAnimSpritePal_RapidSpin[]; +extern const u32 gBattleAnimSpritePal_TriForceTriangle[]; +extern const u32 gBattleAnimSpritePal_WispOrb[]; +extern const u32 gBattleAnimSpritePal_GoldStars[]; +extern const u32 gBattleAnimSpritePal_EclipsingOrb[]; +extern const u32 gBattleAnimSpritePal_GrayOrb[]; +extern const u32 gBattleAnimSpritePal_BlueOrb[]; +extern const u32 gBattleAnimSpritePal_RedOrb2[]; +extern const u32 gBattleAnimSpritePal_PinkPetal[]; +extern const u32 gBattleAnimSpritePal_PainSplit[]; +extern const u32 gBattleAnimSpritePal_Confetti[]; +extern const u32 gBattleAnimSpritePal_GreenStar[]; +extern const u32 gBattleAnimSpritePal_PinkCloud[]; +extern const u32 gBattleAnimSpritePal_SweatDrop[]; +extern const u32 gBattleAnimSpritePal_GuardRing[]; extern const u32 gCureBubblesGfx[]; extern const u32 gCureBubblesPal[]; extern const u32 gCureBubblesTilemap[]; -extern const u32 gBattleAnimSpritePalette_PurpleScratch[]; -extern const u32 gBattleAnimSpritePalette_SmallRedEye[]; -extern const u32 gBattleAnimSpritePalette_HollowOrb[]; -extern const u32 gBattleAnimSpritePalette_BluegreenOrb[]; -extern const u32 gBattleAnimSpritePalette_PawPrint[]; -extern const u32 gBattleAnimSpritePalette_PurpleFlame[]; -extern const u32 gBattleAnimSpritePalette_RedBall[]; -extern const u32 gBattleAnimSpritePalette_SmellingsaltEffect[]; -extern const u32 gBattleAnimSpritePalette_Meteor[]; -extern const u32 gBattleAnimSpritePalette_FlatRock[]; -extern const u32 gBattleAnimSpritePalette_MagnifyingGlass[]; -extern const u32 gBattleAnimSpritePalette_BrownOrb[]; -extern const u32 gBattleAnimSpritePalette_MetalSoundWaves[]; -extern const u32 gBattleAnimSpritePalette_FlyingDirt[]; -extern const u32 gBattleAnimSpritePalette_IcicleSpear[]; -extern const u32 gBattleAnimSpritePalette_Hail[]; -extern const u32 gBattleAnimSpritePalette_GlowyRedOrb[]; -extern const u32 gBattleAnimSpritePalette_GlowyGreenOrb[]; -extern const u32 gBattleAnimSpritePalette_GreenSpike[]; -extern const u32 gBattleAnimSpritePalette_WhiteCircleOfLight[]; -extern const u32 gBattleAnimSpritePalette_GlowyBlueOrb[]; -extern const u32 gBattleAnimSpritePalette_RedBrick[]; -extern const u32 gBattleAnimSpritePalette_WhiteFeather[]; -extern const u32 gBattleAnimSpritePalette_Sparkle6[]; -extern const u32 gBattleAnimSpritePalette_Splash[]; -extern const u32 gBattleAnimSpritePalette_Gem1[]; -extern const u32 gBattleAnimSpritePalette_SlamHit2[]; -extern const u32 gBattleAnimSpritePalette_Recycle[]; -extern const u32 gBattleAnimSpritePalette_RedParticles[]; -extern const u32 gBattleAnimSpritePalette_Protect[]; -extern const u32 gBattleAnimSpritePalette_DirtMound[]; -extern const u32 gBattleAnimSpritePalette_Shock3[]; -extern const u32 gBattleAnimSpritePalette_WeatherBall[]; -extern const u32 gBattleAnimSpritePalette_Bird[]; -extern const u32 gBattleAnimSpritePalette_CrossImpact[]; -extern const u32 gBattleAnimSpritePalette_Slash2[]; -extern const u32 gBattleAnimSpritePalette_WhipHit[]; -extern const u32 gBattleAnimSpritePalette_BlueRing2[]; +extern const u32 gBattleAnimSpritePal_PurpleScratch[]; +extern const u32 gBattleAnimSpritePal_SmallRedEye[]; +extern const u32 gBattleAnimSpritePal_HollowOrb[]; +extern const u32 gBattleAnimSpritePal_BluegreenOrb[]; +extern const u32 gBattleAnimSpritePal_PawPrint[]; +extern const u32 gBattleAnimSpritePal_PurpleFlame[]; +extern const u32 gBattleAnimSpritePal_RedBall[]; +extern const u32 gBattleAnimSpritePal_SmellingsaltEffect[]; +extern const u32 gBattleAnimSpritePal_Meteor[]; +extern const u32 gBattleAnimSpritePal_FlatRock[]; +extern const u32 gBattleAnimSpritePal_MagnifyingGlass[]; +extern const u32 gBattleAnimSpritePal_BrownOrb[]; +extern const u32 gBattleAnimSpritePal_MetalSoundWaves[]; +extern const u32 gBattleAnimSpritePal_FlyingDirt[]; +extern const u32 gBattleAnimSpritePal_IcicleSpear[]; +extern const u32 gBattleAnimSpritePal_Hail[]; +extern const u32 gBattleAnimSpritePal_GlowyRedOrb[]; +extern const u32 gBattleAnimSpritePal_GlowyGreenOrb[]; +extern const u32 gBattleAnimSpritePal_GreenSpike[]; +extern const u32 gBattleAnimSpritePal_WhiteCircleOfLight[]; +extern const u32 gBattleAnimSpritePal_GlowyBlueOrb[]; +extern const u32 gBattleAnimSpritePal_RedBrick[]; +extern const u32 gBattleAnimSpritePal_WhiteFeather[]; +extern const u32 gBattleAnimSpritePal_Sparkle6[]; +extern const u32 gBattleAnimSpritePal_Splash[]; +extern const u32 gBattleAnimSpritePal_Gem1[]; +extern const u32 gBattleAnimSpritePal_SlamHit2[]; +extern const u32 gBattleAnimSpritePal_Recycle[]; +extern const u32 gBattleAnimSpritePal_RedParticles[]; +extern const u32 gBattleAnimSpritePal_Protect[]; +extern const u32 gBattleAnimSpritePal_DirtMound[]; +extern const u32 gBattleAnimSpritePal_Shock3[]; +extern const u32 gBattleAnimSpritePal_WeatherBall[]; +extern const u32 gBattleAnimSpritePal_Bird[]; +extern const u32 gBattleAnimSpritePal_CrossImpact[]; +extern const u32 gBattleAnimSpritePal_Slash2[]; +extern const u32 gBattleAnimSpritePal_WhipHit[]; +extern const u32 gBattleAnimSpritePal_BlueRing2[]; extern const u32 gBattleAnimBackgroundImage_00[]; extern const u32 gBattleAnimBackgroundImage_02[]; -- cgit v1.2.3 From b85a74afc5a5dc1225e85904ab0b583f5d359d12 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 18:38:15 +0200 Subject: Give names to battle anim backgrounds --- include/constants/battle_anim.h | 8 +-- include/graphics.h | 106 ++++++++++++++++++++-------------------- 2 files changed, 57 insertions(+), 57 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index aaa3cd274..1209dfa19 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -335,10 +335,10 @@ #define BG_GUILLOTINE_CONTESTS 14 #define BG_ICE 15 #define BG_COSMIC 16 -#define BG_SEISMICTOSS_SKUUPPERCUT 17 -#define BG_FLYING 18 -#define BG_FLYING_CONTESTS 19 -#define BG_AURORABEAM 20 +#define BG_IN_AIR 17 +#define BG_SKY 18 +#define BG_SKY_CONTESTS 19 +#define BG_AURORA 20 #define BG_FISSURE 21 #define BG_BUG_OPPONENT 22 #define BG_BUG_PLAYER 23 diff --git a/include/graphics.h b/include/graphics.h index 14b84724f..5a73e7b92 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4396,9 +4396,9 @@ extern const u32 gBattleAnimSpriteGfx_Protect[]; extern const u32 gBattleAnimSpriteGfx_DirtMound[]; extern const u32 gBattleAnimSpriteGfx_Shock3[]; extern const u32 gBattleAnimSpriteGfx_WeatherBall[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; +extern const u32 gBattleAnimBgTilemap_ScaryFacePlayer[]; +extern const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[]; +extern const u32 gBattleAnimBgTilemap_ScaryFaceContest[]; extern const u32 gBattleAnimSpriteGfx_Bird[]; extern const u32 gBattleAnimSpriteGfx_CrossImpact[]; @@ -4685,57 +4685,57 @@ extern const u32 gBattleAnimSpritePal_Slash2[]; extern const u32 gBattleAnimSpritePal_WhipHit[]; extern const u32 gBattleAnimSpritePal_BlueRing2[]; -extern const u32 gBattleAnimBackgroundImage_00[]; -extern const u32 gBattleAnimBackgroundImage_02[]; -extern const u32 gBattleAnimBackgroundImage_03[]; -extern const u32 gBattleAnimBackgroundImage_04[]; -extern const u32 gBattleAnimBackgroundImage_07[]; -extern const u32 gBattleAnimBackgroundImage_09[]; -extern const u32 gBattleAnimBackgroundImage_11[]; -extern const u32 gBattleAnimBackgroundImage_12[]; -extern const u32 gBattleAnimBackgroundImage_15[]; -extern const u32 gBattleAnimBackgroundImage_16[]; -extern const u32 gBattleAnimBackgroundImage_17[]; -extern const u32 gBattleAnimBackgroundImage_20[]; -extern const u32 gBattleAnimBackgroundImage_21[]; -extern const u32 gBattleAnimBackgroundPalette_00[]; -extern const u32 gBattleAnimBackgroundPalette_02[]; -extern const u32 gBattleAnimBackgroundPalette_03[]; -extern const u32 gBattleAnimBackgroundPalette_04[]; -extern const u32 gBattleAnimBackgroundPalette_07[]; -extern const u32 gBattleAnimBackgroundPalette_09[]; -extern const u32 gBattleAnimBackgroundPalette_11[]; -extern const u32 gBattleAnimBackgroundPalette_12[]; -extern const u32 gBattleAnimBackgroundPalette_15[]; -extern const u32 gBattleAnimBackgroundPalette_16[]; -extern const u32 gBattleAnimBackgroundPalette_17[]; -extern const u32 gBattleAnimBackgroundPalette_18[]; -extern const u32 gBattleAnimBackgroundPalette_20[]; -extern const u32 gBattleAnimBackgroundPalette_21[]; -extern const u32 gBattleAnimBackgroundPalette_22[]; -extern const u32 gBattleAnimBackgroundPalette_24[]; -extern const u32 gBattleAnimBackgroundTilemap_00[]; -extern const u32 gBattleAnimBackgroundTilemap_02[]; -extern const u32 gBattleAnimBackgroundTilemap_03[]; -extern const u32 gBattleAnimBackgroundTilemap_04[]; -extern const u32 gBattleAnimBackgroundTilemap_05[]; -extern const u32 gBattleAnimBackgroundTilemap_06[]; -extern const u32 gBattleAnimBackgroundTilemap_07[]; -extern const u32 gBattleAnimBackgroundTilemap_08[]; -extern const u32 gBattleAnimBackgroundTilemap_09[]; -extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gBattleAnimBgImage_Dark[]; +extern const u32 gBattleAnimBgImage_Ghost[]; +extern const u32 gBattleAnimBgImage_Psychic[]; +extern const u32 gBattleAnimBgImage_Impact[]; +extern const u32 gBattleAnimBgImage_Drill[]; +extern const u32 gBattleAnimBgImage_Highspeed[]; +extern const u32 gBattleAnimBgImage_Thunder[]; +extern const u32 gBattleAnimBgImage_Guillotine[]; +extern const u32 gBattleAnimBgImage_Ice[]; +extern const u32 gBattleAnimBgImage_Cosmic[]; +extern const u32 gBattleAnimBgImage_InAir[]; +extern const u32 gBattleAnimBgImage_Aurora[]; +extern const u32 gBattleAnimBgImage_Fissure[]; +extern const u32 gBattleAnimBgPalette_Dark[]; +extern const u32 gBattleAnimBgPalette_Ghost[]; +extern const u32 gBattleAnimBgPalette_Psychic[]; +extern const u32 gBattleAnimBgPalette_Impact[]; +extern const u32 gBattleAnimBgPalette_Drill[]; +extern const u32 gBattleAnimBgPalette_Highspeed[]; +extern const u32 gBattleAnimBgPalette_Thunder[]; +extern const u32 gBattleAnimBgPalette_Guillotine[]; +extern const u32 gBattleAnimBgPalette_Ice[]; +extern const u32 gBattleAnimBgPalette_Cosmic[]; +extern const u32 gBattleAnimBgPalette_InAir[]; +extern const u32 gBattleAnimBgPalette_Sky[]; +extern const u32 gBattleAnimBgPalette_Aurora[]; +extern const u32 gBattleAnimBgPalette_Fissure[]; +extern const u32 gBattleAnimBgPalette_Bug[]; +extern const u32 gBattleAnimBgPalette_Solarbeam[]; +extern const u32 gBattleAnimBgTilemap_Dark[]; +extern const u32 gBattleAnimBgTilemap_Ghost[]; +extern const u32 gBattleAnimBgTilemap_Psychic[]; +extern const u32 gBattleAnimBgTilemap_ImpactOpponent[]; +extern const u32 gBattleAnimBgTilemap_ImpactPlayer[]; +extern const u32 gBattleAnimBgTilemap_ImpactContests[]; +extern const u32 gBattleAnimBgTilemap_Drill[]; +extern const u32 gBattleAnimBgTilemap_DrillContests[]; +extern const u32 gBattleAnimBgTilemap_HighspeedOpponent[]; +extern const u32 gBattleAnimBgTilemap_HighspeedPlayer[]; extern const u32 gUnknown_08C2A634[]; extern const u32 gUnknown_08C2A6D4[]; extern const u32 gUnknown_08C2A6EC[]; -extern const u32 gBattleAnimBackgroundTilemap_11[]; -extern const u32 gBattleAnimBackgroundTilemap_12[]; -extern const u32 gBattleAnimBackgroundTilemap_13[]; -extern const u32 gBattleAnimBackgroundTilemap_14[]; -extern const u32 gBattleAnimBackgroundTilemap_15[]; -extern const u32 gBattleAnimBackgroundTilemap_16[]; -extern const u32 gBattleAnimBackgroundTilemap_17[]; -extern const u32 gBattleAnimBackgroundTilemap_20[]; -extern const u32 gBattleAnimBackgroundTilemap_21[]; +extern const u32 gBattleAnimBgTilemap_Thunder[]; +extern const u32 gBattleAnimBgTilemap_GuillotineOpponent[]; +extern const u32 gBattleAnimBgTilemap_GuillotinePlayer[]; +extern const u32 gBattleAnimBgTilemap_GuillotineContests[]; +extern const u32 gBattleAnimBgTilemap_Ice[]; +extern const u32 gBattleAnimBgTilemap_Cosmic[]; +extern const u32 gBattleAnimBgTilemap_InAir[]; +extern const u32 gBattleAnimBgTilemap_Aurora[]; +extern const u32 gBattleAnimBgTilemap_Fissure[]; extern const u32 gMetalShineGfx[]; extern const u32 gMetalShinePalette[]; @@ -4777,8 +4777,8 @@ extern const u32 gContest3Pal[]; extern const u32 gUnknown_08D95E00[]; extern const u32 gUnknown_08D960D0[]; extern const u32 gUnknown_08D963A4[]; -extern const u32 gBattleAnimBackgroundImage_Surf[]; -extern const u32 gBattleAnimBackgroundPalette_Surf[]; +extern const u32 gBattleAnimBgImage_Surf[]; +extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; extern const u32 gBattleAnimFogTilemap[]; -- cgit v1.2.3 From 4a09a5da330cfb855989ed5390efaef219d73ecc Mon Sep 17 00:00:00 2001 From: Fontbane Date: Thu, 4 Apr 2019 23:26:53 -0400 Subject: Doc field move scripts completely, use fldeff constants for dofieldeffect Fix labels Fix labels again Delete extra boulder scripts Now it should build fine --- include/event_scripts.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index d35bf962d..da96d29d8 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -381,10 +381,10 @@ extern const u8 SecretBase_RedCave1_Text_2758CC[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; //field effects -extern const u8 FieryPath_EventScript_2908FD[]; -extern const u8 EventScript_290CAE[]; +extern const u8 EventScript_FldEffStrength[]; +extern const u8 EventScript_FailSweetScent[]; extern const u8 EventScript_2926F8[]; -extern const u8 Route111_EventScript_2907F0[]; +extern const u8 EventScript_FldEffRockSmash[]; //player pc extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[]; -- cgit v1.2.3 From fe12f2f4b360e68937e49af8672c8b1b1441223c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 6 Apr 2019 12:41:55 -0500 Subject: Document and cleanup some decoration code --- include/decoration.h | 74 ++++++++++++++++++++---------------------- include/decoration_inventory.h | 8 ++--- include/gba/types.h | 4 +-- include/menu_helpers.h | 2 +- include/trader.h | 2 +- 5 files changed, 44 insertions(+), 46 deletions(-) (limited to 'include') diff --git a/include/decoration.h b/include/decoration.h index 0e6d6cfdd..eed930356 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -1,7 +1,8 @@ #ifndef GUARD_DECORATION_H #define GUARD_DECORATION_H -enum DecorPerm { +enum DecorationPermission +{ /* * The nomenclature here describes collision and placement permissions, in that order. */ @@ -9,13 +10,11 @@ enum DecorPerm { DECORPERM_PASS_FLOOR, DECORPERM_BEHIND_FLOOR, DECORPERM_NA_WALL, - DECORPERM_SPRITE + DECORPERM_SPRITE, }; -enum DecorShape { - /* - * Width-x-height - */ +enum DecorationShape +{ DECORSHAPE_1x1, DECORSHAPE_2x1, DECORSHAPE_3x1, // unused @@ -25,53 +24,52 @@ enum DecorShape { DECORSHAPE_1x3, // unused DECORSHAPE_2x4, DECORSHAPE_3x3, - DECORSHAPE_3x2 + DECORSHAPE_3x2, }; -enum DecorCat { - /* - * In which category you can find the decoration in the PC. - */ - /*0*/ DECORCAT_DESK, - /*1*/ DECORCAT_CHAIR, - /*2*/ DECORCAT_PLANT, - /*3*/ DECORCAT_ORNAMENT, - /*4*/ DECORCAT_MAT, - /*5*/ DECORCAT_POSTER, - /*6*/ DECORCAT_DOLL, - /*7*/ DECORCAT_CUSHION +enum DecorationCategory +{ + DECORCAT_DESK, + DECORCAT_CHAIR, + DECORCAT_PLANT, + DECORCAT_ORNAMENT, + DECORCAT_MAT, + DECORCAT_POSTER, + DECORCAT_DOLL, + DECORCAT_CUSHION, + DECORCAT_COUNT, }; struct Decoration { - /*0x00*/ u8 id; - /*0x01*/ u8 name[16]; - /*0x11*/ u8 permission; - /*0x12*/ u8 shape; - /*0x13*/ u8 category; - /*0x14*/ u16 price; - /*0x18*/ const u8 *description; - /*0x1c*/ const u16 *tiles; + u8 id; + u8 name[16]; + u8 permission; + u8 shape; + u8 category; + u16 price; + const u8 *description; + const u16 *tiles; }; -struct DecorPCPointers +struct DecorationPCContext { - /* 0x00 */ u8 *items; - /* 0x04 */ u8 *pos; - /* 0x08 */ u8 size; - /* 0x09 */ u8 isPlayerRoom; + u8 *items; + u8 *pos; + u8 size; + u8 isPlayerRoom; }; extern const struct Decoration gDecorations[]; -extern EWRAM_DATA u8 *gCurDecorInventoryItems; +extern EWRAM_DATA u8 *gCurDecorationItems; extern EWRAM_DATA u8 gCurDecorationIndex; -void sub_8126968(void); -void sub_8126AD8(u8 taskId); +void InitDecorationContextItems(void); +void DoSecretBaseDecorationMenu(u8 taskId); void ShowDecorationOnMap(u16 mapX, u16 mapY, u16 decor); -void sub_8126B2C(u8 taskId); -void sub_8127208(u8 taskId); -void sub_8127250(u8 *dest, u8 decorCat); +void DoPlayerRoomDecorationMenu(u8 taskId); +void ShowDecorationCategoriesWindow(u8 taskId); +void CopyDecorationCategoryName(u8 *dest, u8 decorCat); bool8 IsSelectedDecorInThePC(void); u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u16 paletteTag); diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index 7539f7240..7362c2da2 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -11,13 +11,13 @@ extern struct DecorationInventory gDecorationInventories[]; void SetDecorationInventoriesPointers(void); void ClearDecorationInventories(void); -s8 GetFirstEmptyDecorSlot(u8 idx); +s8 GetFirstEmptyDecorSlot(u8 category); u8 CheckHasDecoration(u8); u8 DecorationAdd(u8); u8 DecorationCheckSpace(u8); s8 DecorationRemove(u8); -void CondenseDecorationCategoryN(u8); -u8 CountDecorationCategoryN(u8 idx); -u8 CountDecorations(void); +void CondenseDecorationsInCategory(u8 category); +u8 GetNumOwnedDecorationsInCategory(u8 category); +u8 GetNumOwnedDecorations(void); #endif // GUARD_DECORATION_INVENTORY_H diff --git a/include/gba/types.h b/include/gba/types.h index cb370c785..9f2594703 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -107,8 +107,8 @@ struct OamData #define SPRITE_SIZE_16x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE)) #define SPRITE_SIZE_32x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE)) -#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2) -#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF) +#define SPRITE_SIZE(dim) ((SPRITE_SIZE_##dim >> 2) & 0x03) +#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0x03) struct BgAffineSrcData { diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 63af4c731..3b6c13172 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -30,7 +30,7 @@ bool8 itemid_80BF6D8_mail_related(u16 itemId); bool8 sub_81221AC(void); bool8 sub_81221EC(void); void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount, u8 maxUsedSlotsCount); -void sub_812225C(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3); +void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems); void sub_8122298(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3, u8 arg4); void LoadListMenuArrowsGfx(void); void sub_8122344(u8 *spriteIds, u8 count); diff --git a/include/trader.h b/include/trader.h index c07ea81bd..25d72bd3b 100644 --- a/include/trader.h +++ b/include/trader.h @@ -6,7 +6,7 @@ #define GUARD_TRADER_H void sub_8133DA0(u8 taskId); -void sub_8133E1C(u8 taskId); +void ExitTraderMenu(u8 taskId); void TraderSetup(void); void Trader_ResetFlag(void); -- cgit v1.2.3