From 4cdebe28046e9c8144dce2ea6b0a8e8f21f59dde Mon Sep 17 00:00:00 2001 From: RavePossum Date: Mon, 28 Oct 2024 12:03:53 -0400 Subject: [PATCH] Consolidate pokemon summary struct def/decl files --- include/overlay094/struct_ov94_0223FD4C.h | 2 +- include/pokemon_summary_app.h | 161 +++++++++++++++++++++- include/struct_defs/pokemon_summary.h | 32 ----- include/struct_defs/pokemon_summary_app.h | 139 ------------------- include/struct_defs/struct_0207AE68_t.h | 2 +- include/struct_defs/struct_02095E80_t.h | 2 +- include/struct_defs/struct_0209BBA4.h | 2 +- include/unk_0203D1B8.h | 2 +- include/unk_0208EA44.h | 3 +- include/unk_0208FCF8.h | 2 +- include/unk_020916B4.h | 2 +- include/unk_020920C0.h | 2 +- src/field_menu.c | 1 - src/overlay019/ov19_021D0D80.c | 1 - src/overlay091/ov91_021D0D80.c | 1 - src/overlay104/ov104_02239C58.c | 1 - src/overlay105/ov105_02241AE0.c | 1 - src/overlay106/ov106_02241AE0.c | 1 - src/pokemon_summary_app.c | 3 +- src/scrcmd.c | 2 +- src/unk_0203D1B8.c | 1 - src/unk_0204F13C.c | 1 - src/unk_0204FAB4.c | 1 - src/unk_0205003C.c | 1 - src/unk_0205A0D8.c | 1 - src/unk_0206B9D8.c | 1 - src/unk_0207AE68.c | 1 - src/unk_0208EA44.c | 2 - src/unk_0208FCF8.c | 1 - src/unk_020916B4.c | 1 - src/unk_020920C0.c | 3 +- src/unk_020989DC.c | 1 - src/unk_0209C194.c | 2 +- 33 files changed, 172 insertions(+), 207 deletions(-) delete mode 100644 include/struct_defs/pokemon_summary.h delete mode 100644 include/struct_defs/pokemon_summary_app.h diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index fd49b44efe..2e7fefc9bc 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -6,7 +6,6 @@ #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0207AE68_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203E0FC.h" @@ -29,6 +28,7 @@ #include "message.h" #include "overlay_manager.h" #include "pokemon.h" +#include "pokemon_summary_app.h" #include "sprite_resource.h" #include "strbuf.h" #include "string_list.h" diff --git a/include/pokemon_summary_app.h b/include/pokemon_summary_app.h index 89101844d8..05673e8505 100644 --- a/include/pokemon_summary_app.h +++ b/include/pokemon_summary_app.h @@ -1,13 +1,170 @@ #ifndef POKEPLATINUM_UNK_0208C324_H #define POKEPLATINUM_UNK_0208C324_H -#include "struct_defs/pokemon_summary.h" -#include "struct_defs/pokemon_summary_app.h" +#include "constants/moves.h" +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_0200C440_decl.h" +#include "struct_decls/struct_0200C6E4_decl.h" +#include "struct_decls/struct_0200C704_decl.h" +#include "struct_defs/archived_poke_sprite_data.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/sprite_animation_frame.h" +#include "struct_defs/struct_02091850.h" + +#include "bg_window.h" +#include "camera.h" +#include "cell_actor.h" +#include "game_options.h" +#include "message.h" +#include "narc.h" #include "pokemon.h" +#include "pokemon_summary_app.h" #include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "trainer_info.h" +typedef struct PokemonSummary { + void *monData; //!< Pointer to generic Pokemon data + Options *options; // unk_04 + const u16 *OTName; // unk_08 + u32 OTID; // unk_0C + u8 OTGender; // unk_10 + u8 dataType; // unk_11 + u8 mode; // unk_12 + u8 max; // unk_13 + u8 pos; // unk_14 + u8 pageFlag; // unk_15 + u8 selectedSlot; // unk_16 + u8 returnMode; // unk_17 + u16 move; // unk_18 + + u8 padding_1A[2]; + + u32 dexMode; // unk_1C + void *ribbons; // unk_20 + void *poffin; // unk_24 + ChatotCry *chatotCry; // unk_28 + BOOL contest; // unk_2C +} PokemonSummary; + +typedef struct PokemonSummaryAppData { + Strbuf *speciesName; + Strbuf *nickname; + Strbuf *OTName; + + u16 species; + u16 heldItem; + + u8 type1; + u8 type2; + u8 level : 7; + u8 showGender : 1; + u8 gender : 2; + u8 caughtBall : 6; + + u32 OTID; + u32 curExp; + u32 curLevelExp; + u32 nextLevelExp; + + u16 curHP; + u16 maxHP; + u16 attack; + u16 defense; + u16 spAttack; + u16 spDefense; + u16 speed; + u8 ability; + u8 nature; + + u16 moves[LEARNED_MOVES_MAX]; + u8 curPP[LEARNED_MOVES_MAX]; + u8 maxPP[LEARNED_MOVES_MAX]; + + u8 OTGender; + u8 cool; + u8 beauty; + u8 cute; + u8 smart; + u8 tough; + u8 sheen; + u8 preferredFlavor; + + u16 markings; + u16 form; + + u32 status : 28; + u32 isEgg : 1; + u32 isShiny : 1; + u32 pokerus : 2; + + u32 ribbons[4]; +} PokemonSummaryAppData; + +typedef struct PokemonSummaryAppSpriteData { + Camera *camera; + void *spriteManager; + SpriteAnimationFrame frames[MAX_ANIMATION_FRAMES]; + PokemonAnimationSys *animationSys; + Sprite *sprite; + BOOL flip; +} PokemonSummaryAppSpriteData; + +typedef struct PokemonSummaryApp { + BgConfig *bgl; + Window staticWindows[36]; + Window *extraWindows; + u32 numExtraWindows; + + PokemonSummary *data; + PokemonSummaryAppData monData; + PokemonSummaryAppSpriteData monSpriteData; + + UnkStruct_02091850 unk_2F0[4]; + UnkStruct_02091850 unk_350[4]; + UnkStruct_02091850 unk_3B0[4]; + u32 unk_410; + + SpriteRenderer *renderer; + SpriteGfxHandler *gfxHandler; + CellActor *unk_41C[77]; + CellActorData *actor[77]; + + UnkStruct_0200C440 *unk_684; + MessageLoader *msgLoader; + MessageLoader *ribbonLoader; + StringTemplate *strFormatter; + Strbuf *strbuf; + Strbuf *playerName; + MessageLoader *moveNameLoader; + NARC *narcPlPokeData; + + s8 page; + u8 cursor : 4; + u8 cursorTmp : 4; + u8 subscreen; + u8 subscreenType : 4; + u8 subscreenExit : 4; + + u8 sheenState; + u8 sheenMax; + u8 sheenPos; + u8 sheenCount; + + u8 buttonCount; + u8 buttonState; + u8 buttonPos; + + u8 ribbonPos; + u8 ribbonState; + u8 ribbonMax; + u8 ribbonNum; +} PokemonSummaryApp; + BOOL PokemonSummary_ShowContestData(SaveData *param0); void PokemonSummary_FlagVisiblePages(PokemonSummary *param0, const u8 *param1); u8 PokemonSummary_PageIsVisble(PokemonSummaryApp *param0, u32 param1); diff --git a/include/struct_defs/pokemon_summary.h b/include/struct_defs/pokemon_summary.h deleted file mode 100644 index ca58827bea..0000000000 --- a/include/struct_defs/pokemon_summary.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H -#define POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H - -#include "struct_defs/chatot_cry.h" - -#include "game_options.h" - -typedef struct PokemonSummary { - void *monData; //!< Pointer to generic Pokemon data - Options *options; // unk_04 - const u16 *OTName; // unk_08 - u32 OTID; // unk_0C - u8 OTGender; // unk_10 - u8 dataType; // unk_11 - u8 mode; // unk_12 - u8 max; // unk_13 - u8 pos; // unk_14 - u8 pageFlag; // unk_15 - u8 selectedSlot; // unk_16 - u8 returnMode; // unk_17 - u16 move; // unk_18 - - u8 padding_1A[2]; - - u32 dexMode; // unk_1C - void *ribbons; // unk_20 - void *poffin; // unk_24 - ChatotCry *chatotCry; // unk_28 - BOOL contest; // unk_2C -} PokemonSummary; - -#endif // POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h deleted file mode 100644 index f0e468a39e..0000000000 --- a/include/struct_defs/pokemon_summary_app.h +++ /dev/null @@ -1,139 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_POKEMON_SUMMARY_APP_H -#define POKEPLATINUM_STRUCT_POKEMON_SUMMARY_APP_H - -#include "constants/moves.h" - -#include "struct_decls/cell_actor_data.h" -#include "struct_decls/pokemon_animation_sys_decl.h" -#include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_0200C440_decl.h" -#include "struct_decls/struct_0200C6E4_decl.h" -#include "struct_decls/struct_0200C704_decl.h" -#include "struct_defs/archived_poke_sprite_data.h" -#include "struct_defs/pokemon_summary.h" -#include "struct_defs/sprite_animation_frame.h" -#include "struct_defs/struct_02091850.h" - -#include "bg_window.h" -#include "camera.h" -#include "cell_actor.h" -#include "message.h" -#include "narc.h" -#include "strbuf.h" -#include "string_template.h" - -typedef struct PokemonSummaryAppData { - Strbuf *speciesName; - Strbuf *nickname; - Strbuf *OTName; - - u16 species; - u16 heldItem; - - u8 type1; - u8 type2; - u8 level : 7; - u8 showGender : 1; - u8 gender : 2; - u8 caughtBall : 6; - - u32 OTID; - u32 curExp; - u32 curLevelExp; - u32 nextLevelExp; - - u16 curHP; - u16 maxHP; - u16 attack; - u16 defense; - u16 spAttack; - u16 spDefense; - u16 speed; - u8 ability; - u8 nature; - - u16 moves[LEARNED_MOVES_MAX]; - u8 curPP[LEARNED_MOVES_MAX]; - u8 maxPP[LEARNED_MOVES_MAX]; - - u8 OTGender; - u8 cool; - u8 beauty; - u8 cute; - u8 smart; - u8 tough; - u8 sheen; - u8 preferredFlavor; - - u16 markings; - u16 form; - - u32 status : 28; - u32 isEgg : 1; - u32 isShiny : 1; - u32 pokerus : 2; - - u32 ribbons[4]; -} PokemonSummaryAppData; - -typedef struct PokemonSummaryAppSpriteData { - Camera *camera; - void *spriteManager; - SpriteAnimationFrame frames[MAX_ANIMATION_FRAMES]; - PokemonAnimationSys *animationSys; - Sprite *sprite; - BOOL flip; -} PokemonSummaryAppSpriteData; - -typedef struct PokemonSummaryApp { - BgConfig *bgl; - Window staticWindows[36]; - Window *extraWindows; - u32 numExtraWindows; - - PokemonSummary *data; - PokemonSummaryAppData monData; - PokemonSummaryAppSpriteData monSpriteData; - - UnkStruct_02091850 unk_2F0[4]; - UnkStruct_02091850 unk_350[4]; - UnkStruct_02091850 unk_3B0[4]; - u32 unk_410; - - SpriteRenderer *renderer; - SpriteGfxHandler *gfxHandler; - CellActor *unk_41C[77]; - CellActorData *actor[77]; - - UnkStruct_0200C440 *unk_684; - MessageLoader *msgLoader; - MessageLoader *ribbonLoader; - StringTemplate *strFormatter; - Strbuf *strbuf; - Strbuf *playerName; - MessageLoader *moveNameLoader; - NARC *narcPlPokeData; - - s8 page; - u8 cursor : 4; - u8 cursorTmp : 4; - u8 subscreen; - u8 subscreenType : 4; - u8 subscreenExit : 4; - - u8 sheenState; - u8 sheenMax; - u8 sheenPos; - u8 sheenCount; - - u8 buttonCount; - u8 buttonState; - u8 buttonPos; - - u8 ribbonPos; - u8 ribbonState; - u8 ribbonMax; - u8 ribbonNum; -} PokemonSummaryApp; - -#endif // POKEPLATINUM_STRUCT_POKEMON_SUMMARY_APP_H diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index f64c5ea9e0..c14aacd28e 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -6,7 +6,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207C8C4.h" @@ -19,6 +18,7 @@ #include "overlay_manager.h" #include "palette.h" #include "pokemon.h" +#include "pokemon_summary_app.h" #include "poketch_data.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index ee789c2b2d..7715708738 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -10,7 +10,6 @@ #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_02095E80_sub1.h" @@ -25,6 +24,7 @@ #include "menu.h" #include "message.h" #include "overlay_manager.h" +#include "pokemon_summary_app.h" #include "savedata.h" #include "sprite_resource.h" #include "strbuf.h" diff --git a/include/struct_defs/struct_0209BBA4.h b/include/struct_defs/struct_0209BBA4.h index 3ee5b84a13..c77d59e028 100644 --- a/include/struct_defs/struct_0209BBA4.h +++ b/include/struct_defs/struct_0209BBA4.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_0209BBA4_H #define POKEPLATINUM_STRUCT_0209BBA4_H -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02098C44.h" #include "field/field_system_decl.h" +#include "pokemon_summary_app.h" #include "savedata.h" typedef struct { diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index ecb5754114..d131250230 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -4,7 +4,6 @@ #include "struct_decls/struct_02070950_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_defs/choose_starter_data.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_0203E234.h" @@ -23,6 +22,7 @@ #include "field_task.h" #include "pokemon.h" +#include "pokemon_summary_app.h" #include "savedata.h" void sub_0203D1D4(FieldSystem *fieldSystem, BattleParams *param1); diff --git a/include/unk_0208EA44.h b/include/unk_0208EA44.h index 9fa108c13f..85c797b6e9 100644 --- a/include/unk_0208EA44.h +++ b/include/unk_0208EA44.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_UNK_0208EA44_H #define POKEPLATINUM_UNK_0208EA44_H -#include "struct_defs/pokemon_summary_app.h" - #include "bg_window.h" +#include "pokemon_summary_app.h" void sub_0208EA44(PokemonSummaryApp *param0); void sub_0208EAF4(PokemonSummaryApp *param0); diff --git a/include/unk_0208FCF8.h b/include/unk_0208FCF8.h index b2e40d53a0..090c73384d 100644 --- a/include/unk_0208FCF8.h +++ b/include/unk_0208FCF8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0208FCF8_H #define POKEPLATINUM_UNK_0208FCF8_H -#include "struct_defs/pokemon_summary_app.h" +#include "pokemon_summary_app.h" void sub_0208FCF8(PokemonSummaryApp *param0); void sub_0208FD40(PokemonSummaryApp *param0); diff --git a/include/unk_020916B4.h b/include/unk_020916B4.h index b03ab74775..80ac1739c9 100644 --- a/include/unk_020916B4.h +++ b/include/unk_020916B4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020916B4_H #define POKEPLATINUM_UNK_020916B4_H -#include "struct_defs/pokemon_summary_app.h" +#include "pokemon_summary_app.h" void sub_020916B4(PokemonSummaryApp *param0); void sub_02091750(PokemonSummaryApp *param0); diff --git a/include/unk_020920C0.h b/include/unk_020920C0.h index b1e0c0ff5f..b6b1e58152 100644 --- a/include/unk_020920C0.h +++ b/include/unk_020920C0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020920C0_H #define POKEPLATINUM_UNK_020920C0_H -#include "struct_defs/pokemon_summary_app.h" +#include "pokemon_summary_app.h" void sub_020920C0(PokemonSummaryApp *param0); void sub_0209219C(PokemonSummaryApp *param0); diff --git a/src/field_menu.c b/src/field_menu.c index f944d3bd5a..f85cb65014 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -10,7 +10,6 @@ #include "struct_decls/struct_0207CB08_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/sentence.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index c4334ccba1..453a418449 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -11,7 +11,6 @@ #include "struct_decls/struct_0207CB08_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_0208737C.h" diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index c8beb1aa97..0f9adede74 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020997B8.h" diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index f757e72035..c2b8abbf17 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_0209B75C_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02098C44.h" #include "struct_defs/struct_0209BBA4.h" diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 41083e274a..0432616e5a 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -6,7 +6,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 25d6e5f706..8b71ff0b2e 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" #include "overlay104/ov104_0222DCE0.h" diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index a2a51eda4e..e82258b003 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -1,11 +1,10 @@ -#include "struct_defs/pokemon_summary_app.h" +#include "pokemon_summary_app.h" #include #include #include "constants/pokemon.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" #include "bg_window.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 0aa4dc511c..9e6928b44f 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -30,7 +30,6 @@ #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/choose_starter_data.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0202DF8C.h" @@ -117,6 +116,7 @@ #include "player_avatar.h" #include "poffin.h" #include "pokemon.h" +#include "pokemon_summary_app.h" #include "pokeradar.h" #include "poketch_data.h" #include "render_window.h" diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index c575aaf18c..d456b97edf 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -13,7 +13,6 @@ #include "struct_decls/struct_0209747C_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/choose_starter_data.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202DF8C.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203D9B8.h" diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 7666f7bcf2..1d9da65790 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -11,7 +11,6 @@ #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204F3D0.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 0e3592cc87..0b88189f45 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204FCF8.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index eb36249f41..2f5178a6fb 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -6,7 +6,6 @@ #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_02050224.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index bd545d7ec6..5578cdbe45 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_party_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02072014.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index c3929cfcaa..99379c90be 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -9,7 +9,6 @@ #include "struct_decls/struct_0202D060_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0206BC70.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index a4453bceb0..f6598b1bee 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -11,7 +11,6 @@ #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index a268840b88..0bfeb3b77b 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -3,8 +3,6 @@ #include #include -#include "struct_defs/pokemon_summary_app.h" - #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay104/struct_ov104_022412F4.h" diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 3035d6a75f..c63c8434d1 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/pokemon_summary_app.h" #include "struct_defs/struct_02090800.h" #include "bg_window.h" diff --git a/src/unk_020916B4.c b/src/unk_020916B4.c index cc306e4160..24c701d90f 100644 --- a/src/unk_020916B4.c +++ b/src/unk_020916B4.c @@ -6,7 +6,6 @@ #include #include "struct_defs/archived_sprite.h" -#include "struct_defs/pokemon_summary_app.h" #include "struct_defs/struct_02091850.h" #include "overlay115/camera_angle.h" diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index b5f3891864..b370328180 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -3,10 +3,9 @@ #include #include -#include "struct_defs/pokemon_summary_app.h" - #include "bg_window.h" #include "core_sys.h" +#include "pokemon_summary_app.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_0208EA44.h" diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 3fd96d8723..ac124c5453 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_020989DC.h" diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 0e8a5a22ae..6c2db59442 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02098C44.h" #include "struct_defs/struct_0209C194.h" #include "struct_defs/struct_0209C194_1.h" @@ -18,6 +17,7 @@ #include "game_records.h" #include "heap.h" #include "journal.h" +#include "pokemon_summary_app.h" #include "save_player.h" #include "unk_020366A0.h" #include "unk_0203D1B8.h"