From 7c6bfa45df38be34920ffd8de9b7f74900624f7e Mon Sep 17 00:00:00 2001 From: RavePossum Date: Mon, 17 Feb 2025 14:13:26 -0500 Subject: [PATCH] Mass rename UnkStruct_02007768 -> PokemonSpriteManager --- include/battle/ov16_0223DF00.h | 2 +- include/overlay017/struct_ov17_0223F88C.h | 2 +- include/overlay017/struct_ov17_022476F8.h | 2 +- include/overlay017/struct_ov17_0224A1EC.h | 2 +- include/overlay017/struct_ov17_022507C4.h | 2 +- include/overlay019/ov19_021D61B0.h | 2 +- include/overlay019/struct_ov19_021DA9E0.h | 2 +- include/overlay021/pokedex_graphic_data.h | 2 +- include/overlay021/struct_ov21_021E8E0C.h | 2 +- include/overlay022/ov22_02259098.h | 4 +- .../overlay022/struct_ov22_02257964_sub2.h | 2 +- include/overlay022/struct_ov22_0225A0E4.h | 2 +- include/overlay022/struct_ov22_0225B388.h | 2 +- include/overlay062/struct_ov62_0223118C.h | 2 +- include/overlay076/struct_ov76_0223C398.h | 2 +- include/overlay105/ov105_02245CD0.h | 4 +- include/overlay119/struct_ov119_021D17B8.h | 2 +- include/struct_decls/struct_02007768_decl.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/struct_defs/struct_02007768.h | 4 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/unk_0200762C.h | 24 ++++---- include/unk_02094EDC.h | 2 +- src/battle/battle_display.c | 14 ++--- src/battle/battle_script.c | 2 +- src/battle/ov16_0223DF00.c | 4 +- src/choose_starter/choose_starter_app.c | 2 +- src/overlay019/ov19_021D61B0.c | 4 +- src/overlay021/ov21_021E8D48.c | 4 +- src/overlay022/ov22_02259098.c | 4 +- src/overlay077/ov77_021D6C70.c | 2 +- src/overlay095/ov95_02247B6C.c | 2 +- src/overlay095/ov95_0224B3D8.c | 2 +- src/overlay105/ov105_02241AE0.c | 2 +- src/overlay105/ov105_02245CD0.c | 8 +-- src/unk_0200762C.c | 60 +++++++++---------- src/unk_02094EDC.c | 2 +- 37 files changed, 93 insertions(+), 93 deletions(-) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 38e4d4f791..c249fc6087 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -83,7 +83,7 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); * @return Pointer to the Pokemon struct in that battler's party slot. */ Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSys); +PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSys); UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSys); SpriteSystem *ov16_0223E010(BattleSystem *battleSys); SpriteManager *ov16_0223E018(BattleSystem *battleSys); diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index 2a7cc4a17f..24d60b1934 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -19,7 +19,7 @@ typedef struct { UnkStruct_02095C48_sub1 *unk_00; - UnkStruct_02007768 *unk_04; + PokemonSpriteManager *unk_04; PokemonSprite *unk_08[4]; SpriteSystem *unk_18; SpriteManager *unk_1C; diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index b6b7ec4f81..23cc8233a6 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -17,7 +17,7 @@ typedef struct { UnkStruct_02095C48_sub1 *unk_00; - UnkStruct_02007768 *unk_04; + PokemonSpriteManager *unk_04; PokemonSprite *unk_08[4]; PokemonSprite *unk_18; SpriteSystem *unk_1C; diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index bcae73593a..cc4bac79fb 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -29,7 +29,7 @@ typedef struct { UnkStruct_02095C48_sub1 *unk_00; UnkStruct_ov17_0224B09C unk_04[4]; - UnkStruct_02007768 *unk_44; + PokemonSpriteManager *unk_44; PokemonSprite *unk_48[4]; SpriteSystem *unk_58; SpriteManager *unk_5C; diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index fe9a9550f9..263e9bfecf 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -19,7 +19,7 @@ typedef struct { UnkStruct_02095C48_sub1 *unk_00; - UnkStruct_02007768 *unk_04; + PokemonSpriteManager *unk_04; PokemonSprite *unk_08[4]; SpriteSystem *unk_18; SpriteManager *unk_1C; diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h index 0cd7933dcc..006bff574a 100644 --- a/include/overlay019/ov19_021D61B0.h +++ b/include/overlay019/ov19_021D61B0.h @@ -32,7 +32,7 @@ UnkStruct_ov19_021DC680 *ov19_021D77E8(UnkStruct_ov19_021D61B0 *param0); UnkStruct_ov19_021D8E00 *ov19_021D77F4(UnkStruct_ov19_021D61B0 *param0); UnkStruct_ov19_021DE3E8 *ov19_021D7800(UnkStruct_ov19_021D61B0 *param0); UnkStruct_ov19_021DBA9C *ov19_021D780C(UnkStruct_ov19_021D61B0 *param0); -UnkStruct_02007768 *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0); +PokemonSpriteManager *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0); int ov19_021D7820(UnkStruct_ov19_021D61B0 *param0); void ov19_021D783C(SpriteResourcesHeader *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5); Sprite *ov19_021D785C(SpriteList *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5); diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h index e21bb0141f..183de6a58c 100644 --- a/include/overlay019/struct_ov19_021DA9E0.h +++ b/include/overlay019/struct_ov19_021DA9E0.h @@ -24,7 +24,7 @@ typedef struct { UnkStruct_ov19_021D61B0 *unk_14; UnkStruct_0200C440 *unk_18; UnkStruct_0200C440 *unk_1C; - UnkStruct_02007768 *unk_20; + PokemonSpriteManager *unk_20; PokemonSprite *unk_24; void *unk_28; NNSG2dCellDataBank *unk_2C; diff --git a/include/overlay021/pokedex_graphic_data.h b/include/overlay021/pokedex_graphic_data.h index 52891f4974..34a6b8053a 100644 --- a/include/overlay021/pokedex_graphic_data.h +++ b/include/overlay021/pokedex_graphic_data.h @@ -25,7 +25,7 @@ typedef struct PokedexGraphicData { SpriteList *spriteList; SpriteResourceCollection *spriteResourceCollection[4]; UnkStruct_ov21_021D4C0C *unk_14C; - UnkStruct_02007768 *unk_150; + PokemonSpriteManager *unk_150; PokemonSprite *pokemonSprite[4]; UnkStruct_02015064 *unk_164; UnkStruct_ov21_021D23F8 unk_168; diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 5a506dee2e..627d708a67 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -10,7 +10,7 @@ typedef struct { BgConfig *unk_00; PaletteData *unk_04; - UnkStruct_02007768 *unk_08; + PokemonSpriteManager *unk_08; int heapId; Pokemon *unk_10; int unk_14; diff --git a/include/overlay022/ov22_02259098.h b/include/overlay022/ov22_02259098.h index 4bdaf0ba78..56f6544430 100644 --- a/include/overlay022/ov22_02259098.h +++ b/include/overlay022/ov22_02259098.h @@ -13,8 +13,8 @@ #include "pokemon.h" void ov22_02259098(UnkStruct_ov22_0225A0E4 *param0, PokemonSpriteTemplate *param1); -void ov22_022590C0(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4); -void ov22_022590D4(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4, BOOL param5); +void ov22_022590C0(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4); +void ov22_022590D4(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4, BOOL param5); void ov22_022591B8(UnkStruct_020298D8 *param0); void ov22_022591D0(UnkStruct_020298D8 *param0, int param1); int ov22_022591E0(UnkStruct_020298D8 *param0); diff --git a/include/overlay022/struct_ov22_02257964_sub2.h b/include/overlay022/struct_ov22_02257964_sub2.h index 5e116c5fdc..3686fd3450 100644 --- a/include/overlay022/struct_ov22_02257964_sub2.h +++ b/include/overlay022/struct_ov22_02257964_sub2.h @@ -17,7 +17,7 @@ typedef struct { UnkStruct_02015128 **unk_04; UnkStruct_020151A4 **unk_08; u8 *unk_0C; - UnkStruct_02007768 *unk_10; + PokemonSpriteManager *unk_10; BgConfig *unk_14; UnkStruct_ov22_02254DE0 *unk_18; UnkStruct_ov22_022597BC unk_1C; diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h index 306802e9b8..b72e0ae2b3 100644 --- a/include/overlay022/struct_ov22_0225A0E4.h +++ b/include/overlay022/struct_ov22_0225A0E4.h @@ -24,7 +24,7 @@ typedef struct { int unk_14; int unk_18; BOOL unk_1C; - UnkStruct_02007768 *unk_20; + PokemonSpriteManager *unk_20; NNSGfdTexKey unk_24; NNSGfdPlttKey unk_28; BOOL unk_2C; diff --git a/include/overlay022/struct_ov22_0225B388.h b/include/overlay022/struct_ov22_0225B388.h index 71e3e807f9..cada458bed 100644 --- a/include/overlay022/struct_ov22_0225B388.h +++ b/include/overlay022/struct_ov22_0225B388.h @@ -16,7 +16,7 @@ typedef struct { UnkStruct_02015128 **unk_04; UnkStruct_020151A4 **unk_08; u8 *unk_0C; - UnkStruct_02007768 *unk_10; + PokemonSpriteManager *unk_10; BgConfig *unk_14; UnkStruct_ov22_02254DE0 *unk_18; UnkStruct_ov22_02259484 *unk_1C; diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index 5782adf338..cd405dba9b 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -36,7 +36,7 @@ typedef struct { u8 unk_48; u8 padding_49[3]; GenericPointerData *unk_4C; - UnkStruct_02007768 *unk_50; + PokemonSpriteManager *unk_50; UnkStruct_ov62_022349A8 unk_54; UnkStruct_ov62_0223359C unk_46C; UnkStruct_ov62_02233310 unk_48C; diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index 25aa0aefca..d9eeee6cc3 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -32,7 +32,7 @@ typedef struct { Window unk_18[11]; StringList *unk_C8; Menu *unk_CC; - UnkStruct_02007768 *unk_D0; + PokemonSpriteManager *unk_D0; PokemonSprite *unk_D4; int unk_D8; UnkStruct_ov22_02258A48 unk_DC; diff --git a/include/overlay105/ov105_02245CD0.h b/include/overlay105/ov105_02245CD0.h index 4ece498462..c582042baf 100644 --- a/include/overlay105/ov105_02245CD0.h +++ b/include/overlay105/ov105_02245CD0.h @@ -7,8 +7,8 @@ #include "pokemon.h" void ov105_02245CD0(void); -void ov105_02245D50(UnkStruct_02007768 *param0); -PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5); +void ov105_02245D50(PokemonSpriteManager *param0); +PokemonSprite *ov105_02245D88(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, int param4, int param5); void ov105_02245DB8(PokemonSprite *param0, int param1); #endif // POKEPLATINUM_OV105_02245CD0_H diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h index 4b96c09cdf..b2d9617f52 100644 --- a/include/overlay119/struct_ov119_021D17B8.h +++ b/include/overlay119/struct_ov119_021D17B8.h @@ -22,7 +22,7 @@ typedef struct { int unk_10; Window unk_14[2]; GenericPointerData *unk_34; - UnkStruct_02007768 *unk_38; + PokemonSpriteManager *unk_38; NARC *unk_3C; UnkStruct_ov119_021D14DC *unk_40; StringList *unk_44; diff --git a/include/struct_decls/struct_02007768_decl.h b/include/struct_decls/struct_02007768_decl.h index 6be08f180a..c196b21d27 100644 --- a/include/struct_decls/struct_02007768_decl.h +++ b/include/struct_decls/struct_02007768_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02007768_DECL_H #define POKEPLATINUM_STRUCT_02007768_DECL_H -typedef struct UnkStruct_02007768_t UnkStruct_02007768; +typedef struct PokemonSpriteManager_t PokemonSpriteManager; #endif // POKEPLATINUM_STRUCT_02007768_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index cca123a20a..bbbbd0c1c1 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -63,7 +63,7 @@ struct BattleSystem { PCBoxes *pcBoxes; Party *parties[MAX_BATTLERS]; ChatotCry *unk_78[MAX_BATTLERS]; - UnkStruct_02007768 *unk_88; + PokemonSpriteManager *unk_88; UnkStruct_ov12_0221FCDC *unk_8C; SpriteSystem *unk_90; SpriteManager *unk_94; diff --git a/include/struct_defs/struct_02007768.h b/include/struct_defs/struct_02007768.h index 2036a77f4c..3f71fe0080 100644 --- a/include/struct_defs/struct_02007768.h +++ b/include/struct_defs/struct_02007768.h @@ -7,7 +7,7 @@ #include "struct_defs/pokemon_sprite.h" -typedef struct UnkStruct_02007768_t { +typedef struct PokemonSpriteManager_t { PokemonSprite sprites[4]; NNSG2dImageProxy imageProxy; NNSG2dImagePaletteProxy paletteProxy; @@ -26,6 +26,6 @@ typedef struct UnkStruct_02007768_t { u8 needLoadPltt; u8 needG3Identity; u32 flags; -} UnkStruct_02007768; +} PokemonSpriteManager; #endif // POKEPLATINUM_STRUCT_02007768_H diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index f6bb9e706b..5b53dee477 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -31,7 +31,7 @@ struct UnkStruct_0207AE68_t { StringTemplate *unk_0C; Strbuf *unk_10; PaletteData *unk_14; - UnkStruct_02007768 *unk_18; + PokemonSpriteManager *unk_18; PokemonSprite *unk_1C[2]; Party *unk_24; Pokemon *unk_28; diff --git a/include/unk_0200762C.h b/include/unk_0200762C.h index 5e34a20d90..48bd7e8583 100644 --- a/include/unk_0200762C.h +++ b/include/unk_0200762C.h @@ -8,21 +8,21 @@ #include "struct_defs/struct_02008900.h" void *sub_0200762C(int heapID); -void sub_02007768(UnkStruct_02007768 *param0); -void sub_02007B6C(UnkStruct_02007768 *param0); +void sub_02007768(PokemonSpriteManager *param0); +void sub_02007B6C(PokemonSpriteManager *param0); void sub_02007B98(PokemonSprite *param0, int param1); void sub_02007C10(PokemonSprite *param0, SpriteAnimationFrame *param1); BOOL sub_02007C24(PokemonSprite *param0); -PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); -PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); +PokemonSprite *sub_02007C34(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); +PokemonSprite *sub_02007C7C(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); void sub_02007DC8(PokemonSprite *param0); -void sub_02007DD4(UnkStruct_02007768 *param0); +void sub_02007DD4(PokemonSpriteManager *param0); void sub_02007DEC(PokemonSprite *param0, int param1, int param2); int sub_020080C0(PokemonSprite *param0, int param1); void sub_02008274(PokemonSprite *param0, int param1, int param2); void sub_020086D4(PokemonSprite *param0, int param1, int param2, int param3, int param4); void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param4); -void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4); +void sub_0200872C(PokemonSpriteManager *param0, int param1, int param2, int param3, int param4); void sub_02008780(PokemonSprite *param0); BOOL sub_020087B4(PokemonSprite *param0); void sub_020087C8(PokemonSprite *param0, int param1); @@ -31,14 +31,14 @@ int sub_02008900(UnkStruct_02008900 *param0); void sub_020089A0(PokemonSprite *param0); void sub_020089B0(PokemonSprite *param0); void sub_02008A0C(PokemonSprite *param0); -void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2); -void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2); +void sub_02008A78(PokemonSpriteManager *param0, u32 param1, u32 param2); +void sub_02008A84(PokemonSpriteManager *param0, u32 param1, u32 param2); PokemonSpriteTemplate *sub_02008A90(PokemonSprite *param0); -void sub_02008A94(UnkStruct_02007768 *param0); -void sub_02008B2C(UnkStruct_02007768 *param0, int param1); +void sub_02008A94(PokemonSpriteManager *param0); +void sub_02008B2C(PokemonSpriteManager *param0, int param1); BOOL sub_02008B38(PokemonSprite *param0); -void sub_02008B54(UnkStruct_02007768 *param0, u32 param1); -void sub_02008B60(UnkStruct_02007768 *param0, u32 param1); +void sub_02008B54(PokemonSpriteManager *param0, u32 param1); +void sub_02008B60(PokemonSpriteManager *param0, u32 param1); void sub_020091D8(u8 *param0, u32 param1, BOOL param2); void sub_02009348(u8 *param0); void sub_02009370(u8 *param0); diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h index 13eb038a2d..4241f7a2c5 100644 --- a/include/unk_02094EDC.h +++ b/include/unk_02094EDC.h @@ -15,7 +15,7 @@ void sub_02094F04(UnkStruct_02095C48 *param0, int param1, int param2, int param3 void sub_020951B0(UnkStruct_02095C48 *param0, int param1); void sub_02095338(UnkStruct_02095C48 *param0); void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int param2); -PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int heapID, int param6, int param7, int param8); +PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int heapID, int param6, int param7, int param8); void sub_020954F0(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4); s8 sub_02095734(int param0); void sub_02095750(int param0, u32 *param1, u32 *param2); diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index d3e5e23d7a..c970620885 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -196,7 +196,7 @@ static void ShowPartyGaugeTask(SysTask *param0, void *param1); static void HidePartyGaugeTask(SysTask *param0, void *param1); static void ov16_02263688(SysTask *param0, void *param1); static void ov16_022636D4(SysTask *param0, void *param1); -static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, UnkStruct_02007768 *param1, PokemonSpriteTemplate *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12); +static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, PokemonSpriteManager *param1, PokemonSpriteTemplate *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12); static void ov16_02263C1C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2, BattleMessage *param3); static void ov16_02263CF0(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_0225C40C *param2, BattleMessage *param3); static void ov16_02263DD0(BattleSystem *battleSys, BattlerData *param1, BattleMessage *param2); @@ -249,7 +249,7 @@ void ov16_0225CBDC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_ { int v0; PokemonSpriteTemplate v1; - UnkStruct_02007768 *v2; + PokemonSpriteManager *v2; SpriteAnimationFrame v3[10]; UnkStruct_ov16_0225E4E8 *v4; int battleType; @@ -568,7 +568,7 @@ void ov16_0225D414(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_ { int v0; PokemonSpriteTemplate v1; - UnkStruct_02007768 *v2; + PokemonSpriteManager *v2; UnkStruct_ov16_02260384 *v3; u32 v4; @@ -1752,7 +1752,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } { - UnkStruct_02007768 *v2; + PokemonSpriteManager *v2; SpriteAnimationFrame v3[10]; v2 = ov16_0223E000(v0->unk_00); @@ -1920,7 +1920,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) v0->unk_0C = ov12_02237728(&v2); } { - UnkStruct_02007768 *v3; + PokemonSpriteManager *v3; SpriteAnimationFrame v4[10]; v3 = ov16_0223E000(v0->unk_00); @@ -4841,7 +4841,7 @@ static void ov16_02262D28(SysTask *param0, void *param1) { UnkStruct_ov16_0225DC7C *v0 = (UnkStruct_ov16_0225DC7C *)param1; PaletteData *v1; - UnkStruct_02007768 *v2; + PokemonSpriteManager *v2; v1 = BattleSystem_PaletteSys(v0->unk_00); v2 = ov16_0223E000(v0->unk_00); @@ -5638,7 +5638,7 @@ void ov16_02263B20(BattlerData *param0, int param1) ManagedSprite_SetDrawFlag(param0->unk_18, param1); } -static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, UnkStruct_02007768 *param1, PokemonSpriteTemplate *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12) +static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, PokemonSpriteManager *param1, PokemonSpriteTemplate *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12) { PokemonSprite *v0; u8 *v1 = ov16_0223F2B8(ov16_0223E0C8(battleSys), param10); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index ce15c739e8..1a6bab3d47 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -10546,7 +10546,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) BattleScriptTaskData *v2 = param1; Pokemon *v3; PaletteData *v4; - UnkStruct_02007768 *v5; + PokemonSpriteManager *v5; MessageLoader *v6 = BattleSystem_MessageLoader(v2->battleSys); v4 = BattleSystem_PaletteSys(v2->battleSys); v5 = ov16_0223E000(v2->battleSys); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 64cd379b91..1a1b9889a4 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -77,7 +77,7 @@ int BattleSystem_MaxBattlers(BattleSystem *battleSystem); Party *BattleSystem_Party(BattleSystem *battleSystem, int param1); int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSystem); +PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSystem); UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem); SpriteSystem *ov16_0223E010(BattleSystem *battleSystem); SpriteManager *ov16_0223E018(BattleSystem *battleSystem); @@ -289,7 +289,7 @@ Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slo return Party_GetPokemonBySlotIndex(battleSys->parties[battler], slot); } -UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSystem) +PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSystem) { return battleSystem->unk_88; } diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index aa19c37540..e1d8feaa8d 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -206,7 +206,7 @@ typedef struct ChooseStarterApp { G2dRenderer unk_BC; SpriteList *unk_248; SpriteResourceCollection *unk_24C[6]; - UnkStruct_02007768 *spriteManager; + PokemonSpriteManager *spriteManager; PokemonSprite *sprites[NUM_STARTER_OPTIONS]; StarterPreviewGraphics unk_274; NNSFndAllocator unk_2B4; diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index a0cf8b7644..71b1b5ec0a 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -58,7 +58,7 @@ struct UnkStruct_ov19_021D61B0_t { SpriteList *unk_18; G2dRenderer unk_1C; NNSG2dImagePaletteProxy unk_1A8; - UnkStruct_02007768 *unk_1BC; + PokemonSpriteManager *unk_1BC; BgConfig *unk_1C0; const UnkStruct_ov19_021D4DF0 *unk_1C4; UnkStruct_ov19_021DA384 unk_1C8; @@ -1850,7 +1850,7 @@ UnkStruct_ov19_021DBA9C *ov19_021D780C(UnkStruct_ov19_021D61B0 *param0) return &(param0->unk_6690); } -UnkStruct_02007768 *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0) +PokemonSpriteManager *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0) { return param0->unk_1BC; } diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index cea0106041..8edb5dcc61 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -103,7 +103,7 @@ static void ov21_021E9208(SpriteResourceCollection **param0, int param1); static void ov21_021E9228(SpriteResourceCollection **param0); static void ov21_021E9240(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, int param4); static void ov21_021E92B0(UnkStruct_ov21_021D22F8 *param0); -static PokemonSprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4); +static PokemonSprite *ov21_021E99E0(PokemonSpriteManager *param0, Pokemon *param1, int param2, int param3, int param4); static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); static void ov21_021E9344(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9); static void ov21_021E93C4(SpriteResource **param0, SpriteResourceCollection **param1); @@ -753,7 +753,7 @@ static void ov21_021E998C(Window *param0, enum HeapId heapID) MessageLoader_Free(pokedexMessageBank); } -static PokemonSprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4) +static PokemonSprite *ov21_021E99E0(PokemonSpriteManager *param0, Pokemon *param1, int param2, int param3, int param4) { PokemonSpriteTemplate v0; diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 060029accd..521bb96272 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -33,12 +33,12 @@ void ov22_02259098(UnkStruct_ov22_0225A0E4 *param0, PokemonSpriteTemplate *param sub_020093A0((u8 *)v1->pRawData, param1->archive); } -void ov22_022590C0(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4) +void ov22_022590C0(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4) { ov22_022590D4(param0, param1, param2, param3, param4, 0); } -void ov22_022590D4(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4, BOOL param5) +void ov22_022590D4(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4, BOOL param5) { int v0 = Pokemon_GetValue(param2, MON_DATA_SPECIES, NULL); diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c index 653df180bf..e69e1ef963 100644 --- a/src/overlay077/ov77_021D6C70.c +++ b/src/overlay077/ov77_021D6C70.c @@ -18,7 +18,7 @@ #include "unk_0202419C.h" typedef struct UnkStruct_ov77_021D6CFC_t { - UnkStruct_02007768 *unk_00; + PokemonSpriteManager *unk_00; PokemonSprite *unk_04[3]; BOOL unk_10; void *unk_14; diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 37ac74368b..f80f9e163d 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -40,7 +40,7 @@ typedef struct { UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - UnkStruct_02007768 *unk_0C; + PokemonSpriteManager *unk_0C; PokemonSprite *unk_10; SpriteAnimationFrame unk_14[10]; Sprite *unk_3C[2]; diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 5d4daf6933..3561434369 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -56,7 +56,7 @@ typedef struct { int unk_04; int unk_08; BOOL unk_0C; - UnkStruct_02007768 *unk_10; + PokemonSpriteManager *unk_10; PokemonSprite *unk_14; SpriteAnimationFrame unk_18[10]; Sprite *unk_40[2]; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 360429cb68..31d46de288 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -103,7 +103,7 @@ struct UnkStruct_ov105_02241FF4_t { StringList unk_100[4]; PaletteData *unk_120; GenericPointerData *unk_124; - UnkStruct_02007768 *unk_128; + PokemonSpriteManager *unk_128; PokemonSprite *unk_12C[3]; Options *unk_138; SaveData *unk_13C; diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c index c0ee8fa8a1..a454f228fc 100644 --- a/src/overlay105/ov105_02245CD0.c +++ b/src/overlay105/ov105_02245CD0.c @@ -11,8 +11,8 @@ #include "unk_0202419C.h" void ov105_02245CD0(void); -void ov105_02245D50(UnkStruct_02007768 *param0); -PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5); +void ov105_02245D50(PokemonSpriteManager *param0); +PokemonSprite *ov105_02245D88(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, int param4, int param5); void ov105_02245DB8(PokemonSprite *param0, int param1); void ov105_02245CD0(void) @@ -32,7 +32,7 @@ void ov105_02245CD0(void) return; } -void ov105_02245D50(UnkStruct_02007768 *param0) +void ov105_02245D50(PokemonSpriteManager *param0) { sub_020241B4(); @@ -50,7 +50,7 @@ void ov105_02245D50(UnkStruct_02007768 *param0) return; } -PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5) +PokemonSprite *ov105_02245D88(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, int param4, int param5) { PokemonSpriteTemplate v0; PokemonSprite *v1; diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c index 3a58572c2f..628b8388fb 100644 --- a/src/unk_0200762C.c +++ b/src/unk_0200762C.c @@ -271,12 +271,12 @@ static const UnkStruct_020E4E62 *Unk_021007A4[] = { (UnkStruct_020E4E62 *)&Unk_020E4F4C }; -void sub_02007768(UnkStruct_02007768 *param0); -void sub_02007B6C(UnkStruct_02007768 *param0); -PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); -PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); +void sub_02007768(PokemonSpriteManager *param0); +void sub_02007B6C(PokemonSpriteManager *param0); +PokemonSprite *sub_02007C34(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); +PokemonSprite *sub_02007C7C(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); void sub_02007DC8(PokemonSprite *param0); -void sub_02007DD4(UnkStruct_02007768 *param0); +void sub_02007DD4(PokemonSpriteManager *param0); void sub_02007B98(PokemonSprite *param0, int param1); void sub_02007C10(PokemonSprite *param0, SpriteAnimationFrame *param1); BOOL sub_02007C24(PokemonSprite *param0); @@ -285,38 +285,38 @@ int sub_020080C0(PokemonSprite *param0, int param1); void sub_02008274(PokemonSprite *param0, int param1, int param2); void sub_020086D4(PokemonSprite *param0, int param1, int param2, int param3, int param4); void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param4); -void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4); +void sub_0200872C(PokemonSpriteManager *param0, int param1, int param2, int param3, int param4); void sub_02008780(PokemonSprite *param0); BOOL sub_020087B4(PokemonSprite *param0); void sub_020087C8(PokemonSprite *param0, int param1); void sub_020089A0(PokemonSprite *param0); void sub_020089B0(PokemonSprite *param0); void sub_02008A0C(PokemonSprite *param0); -void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2); -void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2); +void sub_02008A78(PokemonSpriteManager *param0, u32 param1, u32 param2); +void sub_02008A84(PokemonSpriteManager *param0, u32 param1, u32 param2); PokemonSpriteTemplate *sub_02008A90(PokemonSprite *param0); -void sub_02008A94(UnkStruct_02007768 *param0); -void sub_02008B2C(UnkStruct_02007768 *param0, int param1); +void sub_02008A94(PokemonSpriteManager *param0); +void sub_02008B2C(PokemonSpriteManager *param0, int param1); BOOL sub_02008B38(PokemonSprite *param0); -void sub_02008B54(UnkStruct_02007768 *param0, u32 param1); -void sub_02008B60(UnkStruct_02007768 *param0, u32 param1); +void sub_02008B54(PokemonSpriteManager *param0, u32 param1); +void sub_02008B60(PokemonSpriteManager *param0, u32 param1); void sub_020091D8(u8 *param0, u32 param1, BOOL param2); void sub_02009348(u8 *param0); -static void sub_02008B78(UnkStruct_02007768 *param0); -static void sub_02008FC8(UnkStruct_02007768 *param0); +static void sub_02008B78(PokemonSpriteManager *param0); +static void sub_02008FC8(PokemonSpriteManager *param0); static void sub_020088D8(PokemonSprite *param0); static u8 sub_020091AC(u8 param0); static void sub_020091C0(PokemonSprite *param0, u8 *param1); void *sub_0200762C(int heapID) { - UnkStruct_02007768 *v0; + PokemonSpriteManager *v0; int v1, v2, v3, v4; NNSG2dCharacterData *v5; u8 *v6; void *v7; - v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02007768)); + v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonSpriteManager)); v0->heapID = heapID; v0->dummy330 = 0; @@ -390,7 +390,7 @@ static const int Unk_020E4D50[4][4] = { { 0xA0, 0xC0, 0xE0, 0xD0 } }; -void sub_02007768(UnkStruct_02007768 *param0) +void sub_02007768(PokemonSpriteManager *param0) { int v0; int v1, v2; @@ -480,7 +480,7 @@ void sub_02007768(UnkStruct_02007768 *param0) G3_PopMtx(1); } -void sub_02007B6C(UnkStruct_02007768 *param0) +void sub_02007B6C(PokemonSpriteManager *param0) { Heap_FreeToHeap(param0->charRawData); Heap_FreeToHeap(param0->plttRawData); @@ -518,7 +518,7 @@ BOOL sub_02007C24(PokemonSprite *param0) return param0->unk_58 != 0; } -PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7) +PokemonSprite *sub_02007C34(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7) { int v0; @@ -533,7 +533,7 @@ PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, PokemonSpriteTemplate *p return sub_02007C7C(param0, param1, param2, param3, param4, param5, v0, param6, param7); } -PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8) +PokemonSprite *sub_02007C7C(PokemonSpriteManager *param0, PokemonSpriteTemplate *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8) { GF_ASSERT(param0->sprites[param6].unk_00_0 == 0); @@ -576,7 +576,7 @@ void sub_02007DC8(PokemonSprite *param0) param0->unk_00_0 = 0; } -void sub_02007DD4(UnkStruct_02007768 *param0) +void sub_02007DD4(PokemonSpriteManager *param0) { int v0; @@ -1011,7 +1011,7 @@ void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param0->unk_24.unk_28 = param4; } -void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4) +void sub_0200872C(PokemonSpriteManager *param0, int param1, int param2, int param3, int param4) { int v0; @@ -1163,13 +1163,13 @@ void sub_02008A0C(PokemonSprite *param0) param0->unk_00_8 = 1; } -void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2) +void sub_02008A78(PokemonSpriteManager *param0, u32 param1, u32 param2) { param0->charBaseAddr = param1; param0->charSize = param2; } -void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2) +void sub_02008A84(PokemonSpriteManager *param0, u32 param1, u32 param2) { param0->plttBaseAddr = param1; param0->plttSize = param2; @@ -1180,7 +1180,7 @@ PokemonSpriteTemplate *sub_02008A90(PokemonSprite *param0) return ¶m0->unk_04; } -void sub_02008A94(UnkStruct_02007768 *param0) +void sub_02008A94(PokemonSpriteManager *param0) { if (param0->needLoadImage) { param0->needLoadImage = FALSE; @@ -1207,7 +1207,7 @@ void sub_02008A94(UnkStruct_02007768 *param0) } } -void sub_02008B2C(UnkStruct_02007768 *param0, int param1) +void sub_02008B2C(PokemonSpriteManager *param0, int param1) { param0->needG3Identity = param1; } @@ -1218,17 +1218,17 @@ BOOL sub_02008B38(PokemonSprite *param0) return param0->unk_00_0 != 0; } -void sub_02008B54(UnkStruct_02007768 *param0, u32 param1) +void sub_02008B54(PokemonSpriteManager *param0, u32 param1) { param0->flags |= param1; } -void sub_02008B60(UnkStruct_02007768 *param0, u32 param1) +void sub_02008B60(PokemonSpriteManager *param0, u32 param1) { param0->flags &= (param1 ^ 0xffffffff); } -static void sub_02008B78(UnkStruct_02007768 *param0) +static void sub_02008B78(PokemonSpriteManager *param0) { NNSG2dCharacterData *v0; int v1, v2, v3; @@ -1341,7 +1341,7 @@ static void sub_02008B78(UnkStruct_02007768 *param0) param0->needLoadImage = v6; } -static void sub_02008FC8(UnkStruct_02007768 *param0) +static void sub_02008FC8(PokemonSpriteManager *param0) { NNSG2dPaletteData *v0; int v1, v2, v3; diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 947125a9ed..b2abf1bff5 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -662,7 +662,7 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int par } } -PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int heapID, int param6, int param7, int param8) +PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int heapID, int param6, int param7, int param8) { PokemonSpriteTemplate v0; PokemonSprite *v1;