From f86d302f59be2bb859df78ee0083dec6f3fb075b Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Mon, 2 Jun 2025 14:06:50 +0200 Subject: [PATCH] Put MoveEffectSystem structs into header file --- include/battle/ov16_0223DF00.h | 2 +- include/battle/struct_ov16_0225D9A8.h | 2 +- include/battle/struct_ov16_0225EA80.h | 2 +- include/overlay012/funcptr_ov12_02239E64_1.h | 2 +- include/overlay012/funcptr_ov12_02239E68.h | 2 +- include/overlay012/funcptr_ov12_02239EEC.h | 2 +- include/overlay012/ov12_0221FC20.h | 257 +++++-- include/overlay012/ov12_02225864.h | 12 +- include/overlay012/ov12_022269C0.h | 10 +- include/overlay012/ov12_02226B84.h | 80 +- include/overlay012/ov12_0222AC70.h | 38 +- include/overlay012/ov12_0222D6B0.h | 12 +- include/overlay012/ov12_0222E784.h | 2 +- include/overlay012/ov12_0222E91C.h | 10 +- include/overlay012/ov12_0222F700.h | 66 +- include/overlay012/ov12_022346A4.h | 8 +- include/overlay012/ov12_02234E44.h | 8 +- include/overlay012/ov12_02235254.h | 50 +- .../overlay012/struct_ov12_0221FCDC_decl.h | 2 +- .../overlay012/struct_ov12_0222118C_decl.h | 6 - .../overlay012/struct_ov12_022211D8_decl.h | 6 - .../overlay012/struct_ov12_022222D4_decl.h | 6 - .../overlay012/struct_ov12_02223178_decl.h | 6 - include/overlay012/struct_ov12_02225640.h | 2 +- include/overlay012/struct_ov12_0223595C.h | 2 +- include/overlay017/struct_ov17_0223F88C.h | 2 +- include/struct_defs/battle_system.h | 2 +- src/battle/battle_display.c | 20 +- src/battle/ov16_0223B140.c | 4 +- src/battle/ov16_0223DF00.c | 4 +- src/overlay012/ov12_0221FC20.c | 721 +++++++----------- src/overlay012/ov12_0222389C.c | 30 +- src/overlay012/ov12_0222421C.c | 6 +- src/overlay012/ov12_02225864.c | 12 +- src/overlay012/ov12_022269C0.c | 20 +- src/overlay012/ov12_02226B84.c | 116 +-- src/overlay012/ov12_0222AC70.c | 66 +- src/overlay012/ov12_0222D6B0.c | 20 +- src/overlay012/ov12_0222E784.c | 2 +- src/overlay012/ov12_0222E91C.c | 10 +- src/overlay012/ov12_0222F700.c | 132 ++-- src/overlay012/ov12_022346A4.c | 16 +- src/overlay012/ov12_02234E44.c | 12 +- src/overlay012/ov12_02235254.c | 50 +- src/overlay017/ov17_0223B140.c | 4 +- 45 files changed, 914 insertions(+), 930 deletions(-) delete mode 100644 include/overlay012/struct_ov12_0222118C_decl.h delete mode 100644 include/overlay012/struct_ov12_022211D8_decl.h delete mode 100644 include/overlay012/struct_ov12_022222D4_decl.h delete mode 100644 include/overlay012/struct_ov12_02223178_decl.h diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 19b40fb563..cf9971e49f 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -85,7 +85,7 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); */ Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSys); -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSys); +MoveEffectSystem *ov16_0223E008(BattleSystem *battleSys); SpriteSystem *BattleSystem_GetSpriteSystem(BattleSystem *battleSys); SpriteManager *BattleSystem_GetSpriteManager(BattleSystem *battleSys); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSys, int param1); diff --git a/include/battle/struct_ov16_0225D9A8.h b/include/battle/struct_ov16_0225D9A8.h index db182c5e74..24a2fabc0b 100644 --- a/include/battle/struct_ov16_0225D9A8.h +++ b/include/battle/struct_ov16_0225D9A8.h @@ -13,7 +13,7 @@ typedef struct { BattleSystem *unk_00; BattlerData *unk_04; PokemonSprite *unk_08; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; UnkStruct_ov16_02265BBC unk_10; u8 unk_68; u8 unk_69; diff --git a/include/battle/struct_ov16_0225EA80.h b/include/battle/struct_ov16_0225EA80.h index 6f1f5f378e..4fc8074c8d 100644 --- a/include/battle/struct_ov16_0225EA80.h +++ b/include/battle/struct_ov16_0225EA80.h @@ -17,7 +17,7 @@ typedef struct { BallRotation *unk_0C; UnkStruct_ov12_02223764 *unk_10; PokemonSpriteTemplate unk_14; - UnkStruct_ov12_0221FCDC *unk_24; + MoveEffectSystem *unk_24; UnkStruct_ov16_02265BBC unk_28; u8 unk_80; u8 unk_81; diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h index cfcbcf8cd9..ed0fe5cfeb 100644 --- a/include/overlay012/funcptr_ov12_02239E64_1.h +++ b/include/overlay012/funcptr_ov12_02239E64_1.h @@ -6,6 +6,6 @@ #include "sprite.h" #include "sprite_system.h" -typedef void (*UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, Sprite *); +typedef void (*UnkFuncPtr_ov12_02239E64_1)(MoveEffectSystem *, SpriteSystem *, SpriteManager *, Sprite *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H diff --git a/include/overlay012/funcptr_ov12_02239E68.h b/include/overlay012/funcptr_ov12_02239E68.h index 81575ee21c..dc819bedb0 100644 --- a/include/overlay012/funcptr_ov12_02239E68.h +++ b/include/overlay012/funcptr_ov12_02239E68.h @@ -5,6 +5,6 @@ #include "sprite_system.h" -typedef void (*UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, ManagedSprite *); +typedef void (*UnkFuncPtr_ov12_02239E68)(MoveEffectSystem *, SpriteSystem *, SpriteManager *, ManagedSprite *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H diff --git a/include/overlay012/funcptr_ov12_02239EEC.h b/include/overlay012/funcptr_ov12_02239EEC.h index e383dd45f1..cfec095850 100644 --- a/include/overlay012/funcptr_ov12_02239EEC.h +++ b/include/overlay012/funcptr_ov12_02239EEC.h @@ -3,6 +3,6 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -typedef void (*UnkFuncPtr_ov12_02239EEC)(UnkStruct_ov12_0221FCDC *); +typedef void (*UnkFuncPtr_ov12_02239EEC)(MoveEffectSystem *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239EEC_H diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index 8924728b8a..95b4f0c05e 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -7,7 +7,7 @@ #include "battle/struct_ov16_02265BBC.h" #include "overlay012/funcptr_ov12_02239EEC.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_02223178_decl.h" +#include "overlay012/struct_ov12_02226504_decl.h" #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_022380DC.h" @@ -19,66 +19,209 @@ #include "sprite_system.h" #include "sys_task_manager.h" -UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int heapID); -void ov12_0221FDC0(UnkStruct_ov12_0221FCDC *param0, BOOL param1); -BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0); -int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3); -BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_02220188(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_02220198(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC *param0); -SysTask *ov12_022201CC(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3); -SysTask *ov12_022201E8(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2); -SysTask *ov12_02220204(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3); -void ov12_02220220(UnkStruct_ov12_0221FCDC *param0, SysTask *param1); -void ov12_02220230(UnkStruct_ov12_0221FCDC *param0, SysTask *param1); -u16 ov12_02220240(UnkStruct_ov12_0221FCDC *param0); -u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0); -ParticleSystem *ov12_02220250(UnkStruct_ov12_0221FCDC *param0); -ParticleSystem *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1); -SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1); -BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0); -s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1); -ManagedSprite *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1); -ManagedSprite *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1); -SpriteManager *ov12_022202EC(UnkStruct_ov12_0221FCDC *param0); -SpriteManager *ov12_02220300(UnkStruct_ov12_0221FCDC *param0); -SpriteSystem *ov12_02220308(UnkStruct_ov12_0221FCDC *param0); + +enum MoveEffectSystemArc { + MOVE_EFFECT_SYSTEM_ARC_BATT_BG = 0, + MOVE_EFFECT_SYSTEM_ARC_BATT_OBJ, + MOVE_EFFECT_SYSTEM_ARC_WECHAR, + MOVE_EFFECT_SYSTEM_ARC_WEPLTT, + MOVE_EFFECT_SYSTEM_ARC_WECELL, + MOVE_EFFECT_SYSTEM_ARC_WECELLANM, + + MOVE_EFFECT_SYSTEM_ARC_COUNT, +}; + +typedef struct UnkStruct_ov12_02223178_t { + u8 unk_00; + u8 unk_01; + u16 unk_02; + s32 unk_04; + u16 unk_08; + u16 unk_0A; + u32 unk_0C; + u16 unk_10; + u16 unk_12; + u16 unk_14; + u16 unk_16; + int unk_18; + ParticleSystem *unk_1C[16]; + SPLEmitter *unk_5C[20]; + SpriteSystem *unk_AC; + UnkStruct_ov16_0223E0C8 *unk_B0[4]; + u8 unk_C0[4]; + PokemonSprite *unk_C4[4]; + u32 battleType; + u16 unk_D8[4]; + u8 unk_E0[4]; + u8 unk_E4[4]; + u8 unk_E8[4]; + u32 unk_EC[4]; + u32 unk_FC[4]; + ChatotCry *unk_10C; + u8 *unk_110; + u16 *unk_114; + int unk_118; +} UnkStruct_ov12_02223178; + +typedef struct { + u32 *unk_00; + u8 unk_04; + u8 unk_05; + BOOL unk_08; +} UnkStruct_ov12_0221FCDC_sub1; + +typedef struct { + MoveEffectSystem *unk_00; + SpriteManager *unk_04; + ManagedSprite *unk_08; + BOOL unk_0C; +} UnkStruct_ov12_02221810; + +typedef struct { + s16 unk_00; + s16 unk_02; + s16 unk_04; + s16 unk_06; + int unk_08; +} UnkStruct_ov12_022224F8_sub1; + +typedef struct { + UnkStruct_ov12_022224F8_sub1 unk_00[16]; + UnkStruct_ov12_02226504 *unk_C0; +} UnkStruct_ov12_022224F8; + +typedef struct UnkStruct_ov12_022222D4_t { + BgConfig *unk_00; + s16 unk_04; + s16 unk_06; + s16 unk_08; + s16 unk_0A; + int unk_0C; + int unk_10; + BOOL unk_14; + BOOL unk_18; + UnkStruct_ov12_022224F8 *unk_1C; +} UnkStruct_ov12_022222D4; + +typedef struct { + u8 unk_00; + u8 unk_01; + PokemonSprite *unk_04; + SysTask *unk_08; +} UnkStruct_ov12_0222118C_sub1; + +typedef struct UnkStruct_ov12_0222118C_t { + ManagedSprite *unk_00; + UnkStruct_ov12_0222118C_sub1 unk_04; +} UnkStruct_ov12_0222118C; + +typedef struct UnkStruct_ov12_022211D8_t { + BgConfig *unk_00; + UnkStruct_ov12_0222118C_sub1 unk_04; +} UnkStruct_ov12_022211D8; + +typedef struct MoveEffectSystem { + int heapID; + int narcID; + BOOL unk_08; + BOOL unk_0C; + BOOL unk_10; + void *unk_14; + u32 *unk_18; + u32 *unk_1C[3]; + UnkStruct_ov12_0221FCDC_sub1 unk_28[3]; + UnkStruct_ov12_02221810 unk_48[2]; + u8 unk_68[16]; + u8 unk_78[16]; + s8 unk_88; + u8 unk_89; + u16 unk_8A; + u16 unk_8C; + s32 unk_90[10]; + UnkFuncPtr_ov12_02239EEC unk_B8; + UnkStruct_ov12_02223178 *unk_BC; + BgConfig *unk_C0; + PaletteData *unk_C4; + SpriteManager *unk_C8[4]; + ManagedSprite *unk_D8[10]; + SpriteTemplate unk_100; + SpriteManager *unk_134; + ManagedSprite *unk_138[5]; + BOOL unk_14C[5]; + UnkStruct_ov12_0222118C *unk_160[5]; + UnkStruct_ov12_022211D8 *unk_174; + u8 unk_178; + u8 unk_179; + u8 unk_17A; + u8 unk_17B; + UnkStruct_ov12_022222D4 *unk_17C; + UnkStruct_ov16_02264408_sub1 unk_180; + int unk_198; + u8 unk_19C[4]; + NARC *arcs[6]; +} MoveEffectSystem; + + +MoveEffectSystem *MoveEffectSystem_New(enum HeapId heapID); +void ov12_0221FDC0(MoveEffectSystem *param0, BOOL param1); +BOOL ov12_0221FDD4(MoveEffectSystem *param0); +int ov12_0221FDE4(MoveEffectSystem *param0); +BOOL MoveEffectSystem_Delete(MoveEffectSystem *param0); +BOOL ov12_0221FE30(MoveEffectSystem *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3); +BOOL ov12_0222016C(MoveEffectSystem *param0); +BOOL ov12_02220188(MoveEffectSystem *param0); +BOOL ov12_02220198(MoveEffectSystem *param0); +BOOL ov12_022201B4(MoveEffectSystem *param0); +SysTask *ov12_022201CC(MoveEffectSystem *param0, SysTaskFunc param1, void *param2, u32 param3); +SysTask *ov12_022201E8(MoveEffectSystem *param0, SysTaskFunc param1, void *param2); +SysTask *ov12_02220204(MoveEffectSystem *param0, SysTaskFunc param1, void *param2, u32 param3); +void ov12_02220220(MoveEffectSystem *param0, SysTask *param1); +void ov12_02220230(MoveEffectSystem *param0, SysTask *param1); +u16 ov12_02220240(MoveEffectSystem *param0); +u16 ov12_02220248(MoveEffectSystem *param0); +ParticleSystem *ov12_02220250(MoveEffectSystem *param0); +ParticleSystem *ov12_02220260(MoveEffectSystem *param0, int param1); +SPLEmitter *ov12_0222026C(MoveEffectSystem *param0, int param1); +BgConfig *ov12_02220278(MoveEffectSystem *param0); +s32 ov12_02220280(MoveEffectSystem *param0, int param1); +ManagedSprite *ov12_02220298(MoveEffectSystem *param0, int param1); +ManagedSprite *ov12_022202C0(MoveEffectSystem *param0, int param1); +SpriteManager *ov12_022202EC(MoveEffectSystem *param0); +SpriteManager *ov12_02220300(MoveEffectSystem *param0); +SpriteSystem *ov12_02220308(MoveEffectSystem *param0); void ov12_02220474(void); -int ov12_02220540(UnkStruct_ov12_0221FCDC *param0, int param1); -void ov12_02220590(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_022380DC *param1, int param2); -void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1); -void ov12_02222338(UnkStruct_ov12_0221FCDC *param0); -int ov12_02222354(UnkStruct_ov12_0221FCDC *param0); -void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1); -void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02220540(MoveEffectSystem *param0, int param1); +void ov12_02220590(MoveEffectSystem *param0, UnkStruct_ov12_022380DC *param1, int param2); +void ov12_02221238(MoveEffectSystem *param0, int param1); +void ov12_02222338(MoveEffectSystem *param0); +int ov12_02222354(MoveEffectSystem *param0); +void ov12_02222590(MoveEffectSystem *param0, int param1); +void ov12_02222664(MoveEffectSystem *param0, int param1); UnkFuncPtr_ov12_02239EEC ov12_02223164(u32 param0); int ov12_02223178(UnkStruct_ov12_02223178 *param0); -s8 ov12_0222317C(UnkStruct_ov12_0221FCDC *param0, s8 param1); +s8 ov12_0222317C(MoveEffectSystem *param0, s8 param1); s8 ov12_02223234(s8 param0, s8 param1, s8 param2); -BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC *param0, int param1[], int param2); -SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC *param0); -int ov12_022232B8(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022232C4(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022232D0(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022232E0(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1); -PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1); -PaletteData *ov12_0222332C(UnkStruct_ov12_0221FCDC *param0); -int ov12_02223334(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_02223344(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_02223354(UnkStruct_ov12_0221FCDC *param0, int param1); -BOOL ov12_02223364(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_0222337C(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_0222339C(UnkStruct_ov12_0221FCDC *param0); -int ov12_022233B0(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022233EC(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1); -void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1); -void ov12_02223488(UnkStruct_ov12_0221FCDC *param0); -BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC *param0, int param1); +BOOL ov12_0222325C(MoveEffectSystem *param0, int param1[], int param2); +SpriteTemplate ov12_0222329C(MoveEffectSystem *param0); +int ov12_022232B8(MoveEffectSystem *param0, int param1); +int ov12_022232C4(MoveEffectSystem *param0, int param1); +int ov12_022232D0(MoveEffectSystem *param0, int param1); +int ov12_022232E0(MoveEffectSystem *param0, int param1); +int ov12_022232EC(MoveEffectSystem *param0, int param1); +PokemonSprite *ov12_022232FC(MoveEffectSystem *param0, int param1); +PaletteData *ov12_0222332C(MoveEffectSystem *param0); +int ov12_02223334(MoveEffectSystem *param0, int param1); +int ov12_02223344(MoveEffectSystem *param0, int param1); +int ov12_02223354(MoveEffectSystem *param0, int param1); +BOOL ov12_02223364(MoveEffectSystem *param0); +BOOL ov12_0222337C(MoveEffectSystem *param0, int param1); +int ov12_0222339C(MoveEffectSystem *param0); +int ov12_022233B0(MoveEffectSystem *param0, int param1); +int ov12_022233EC(MoveEffectSystem *param0, int param1); +int ov12_02223428(MoveEffectSystem *param0, int param1); +void ov12_02223460(MoveEffectSystem *param0, int param1); +void ov12_02223488(MoveEffectSystem *param0); +BOOL ov12_022234A8(MoveEffectSystem *param0, int param1); int ov12_022234E4(int param0, int param1); UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int param2); UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int heapID); diff --git a/include/overlay012/ov12_02225864.h b/include/overlay012/ov12_02225864.h index 8b4b838af4..6b1065b04b 100644 --- a/include/overlay012/ov12_02225864.h +++ b/include/overlay012/ov12_02225864.h @@ -16,11 +16,11 @@ #include "sprite.h" void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3); -void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3); -s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); +void ov12_02225898(MoveEffectSystem *param0, int param1, s16 *param2, s16 *param3); +s16 ov12_022258E0(MoveEffectSystem *param0, int param1, int param2); u8 ov12_02225950(ManagedSprite *param0); -int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_0222598C(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02225964(MoveEffectSystem *param0, int param1); +int ov12_0222598C(MoveEffectSystem *param0, int param1); fx32 ov12_022259A0(fx32 param0, fx32 param1, u32 param2); u32 ov12_022259AC(fx32 param0, fx32 param1, fx32 param2); void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1, s16 param2, s16 param3); @@ -81,7 +81,7 @@ BOOL ov12_022267A8(int *param0, int param1, s32 param2); BOOL ov12_02226848(UnkStruct_ov12_022267D4 *param0); void ov12_02226858(UnkStruct_ov12_022267D4 *param0); UnkStruct_ov12_022267D4 *ov12_02226870(PaletteData *param0, int heapID, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10); -void ov12_02226924(UnkStruct_ov12_0221FCDC *param0); -void ov12_02226954(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226924(MoveEffectSystem *param0); +void ov12_02226954(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_02225864_H diff --git a/include/overlay012/ov12_022269C0.h b/include/overlay012/ov12_022269C0.h index 0ff7d00b7a..3f4eb3eb82 100644 --- a/include/overlay012/ov12_022269C0.h +++ b/include/overlay012/ov12_022269C0.h @@ -5,10 +5,10 @@ #include "sprite_system.h" -void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0); -void ov12_022269EC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02226A3C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02226A88(UnkStruct_ov12_0221FCDC *param0); -void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022269C0(MoveEffectSystem *param0); +void ov12_022269EC(MoveEffectSystem *param0); +void ov12_02226A3C(MoveEffectSystem *param0); +void ov12_02226A88(MoveEffectSystem *param0); +void ov12_02226B1C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); #endif // POKEPLATINUM_OV12_022269C0_H diff --git a/include/overlay012/ov12_02226B84.h b/include/overlay012/ov12_02226B84.h index a4847faaa3..4d0281d703 100644 --- a/include/overlay012/ov12_02226B84.h +++ b/include/overlay012/ov12_02226B84.h @@ -5,45 +5,45 @@ #include "sprite_system.h" -void ov12_02226CB0(UnkStruct_ov12_0221FCDC *param0); -void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0); -void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0); -void ov12_02227408(UnkStruct_ov12_0221FCDC *param0); -void ov12_02227534(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02227828(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222797C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02227F30(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228168(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228214(UnkStruct_ov12_0221FCDC *param0); -void ov12_022282BC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228394(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228520(UnkStruct_ov12_0221FCDC *param0); -void ov12_022287CC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228A0C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228B40(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228C6C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228E00(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228EC0(UnkStruct_ov12_0221FCDC *param0); -void ov12_02228FB4(UnkStruct_ov12_0221FCDC *param0); -void ov12_022290DC(UnkStruct_ov12_0221FCDC *param0); -void ov12_022291AC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229304(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229638(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229810(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229908(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229C5C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02229E54(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222A00C(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222A604(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222AC40(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226CB0(MoveEffectSystem *param0); +void ov12_02226EB0(MoveEffectSystem *param0); +void ov12_022271D8(MoveEffectSystem *param0); +void ov12_02227408(MoveEffectSystem *param0); +void ov12_02227534(MoveEffectSystem *param0); +void ov12_0222777C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02227828(MoveEffectSystem *param0); +void ov12_0222797C(MoveEffectSystem *param0); +void ov12_02227CBC(MoveEffectSystem *param0); +void ov12_02227F30(MoveEffectSystem *param0); +void ov12_02228168(MoveEffectSystem *param0); +void ov12_02228214(MoveEffectSystem *param0); +void ov12_022282BC(MoveEffectSystem *param0); +void ov12_02228394(MoveEffectSystem *param0); +void ov12_02228520(MoveEffectSystem *param0); +void ov12_022287CC(MoveEffectSystem *param0); +void ov12_02228A0C(MoveEffectSystem *param0); +void ov12_02228B40(MoveEffectSystem *param0); +void ov12_02228C6C(MoveEffectSystem *param0); +void ov12_02228E00(MoveEffectSystem *param0); +void ov12_02228EC0(MoveEffectSystem *param0); +void ov12_02228FB4(MoveEffectSystem *param0); +void ov12_022290DC(MoveEffectSystem *param0); +void ov12_022291AC(MoveEffectSystem *param0); +void ov12_02229304(MoveEffectSystem *param0); +void ov12_02229638(MoveEffectSystem *param0); +void ov12_02229810(MoveEffectSystem *param0); +void ov12_02229908(MoveEffectSystem *param0); +void ov12_02229B28(MoveEffectSystem *param0); +void ov12_02229C5C(MoveEffectSystem *param0); +void ov12_02229E54(MoveEffectSystem *param0); +void ov12_0222A00C(MoveEffectSystem *param0); +void ov12_0222A1AC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222A34C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222A410(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222A5C0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222A604(MoveEffectSystem *param0); +void ov12_0222A8F4(MoveEffectSystem *param0); +void ov12_0222AB50(MoveEffectSystem *param0); +void ov12_0222AC40(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_02226B84_H diff --git a/include/overlay012/ov12_0222AC70.h b/include/overlay012/ov12_0222AC70.h index add53f0abe..b5647fe1d0 100644 --- a/include/overlay012/ov12_0222AC70.h +++ b/include/overlay012/ov12_0222AC70.h @@ -5,24 +5,24 @@ #include "sprite_system.h" -void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222B9E0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222BAE4(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222BCF4(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222BE48(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222BFA8(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222C0C0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222C5FC(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222CA2C(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222CB90(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222AE68(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222B194(MoveEffectSystem *param0); +void ov12_0222B45C(MoveEffectSystem *param0); +void ov12_0222B68C(MoveEffectSystem *param0); +void ov12_0222B9E0(MoveEffectSystem *param0); +void ov12_0222BAE4(MoveEffectSystem *param0); +void ov12_0222BCF4(MoveEffectSystem *param0); +void ov12_0222BE48(MoveEffectSystem *param0); +void ov12_0222BFA8(MoveEffectSystem *param0); +void ov12_0222C0C0(MoveEffectSystem *param0); +void ov12_0222C3C0(MoveEffectSystem *param0); +void ov12_0222C5FC(MoveEffectSystem *param0); +void ov12_0222C6D4(MoveEffectSystem *param0); +void ov12_0222C8F8(MoveEffectSystem *param0); +void ov12_0222CA2C(MoveEffectSystem *param0); +void ov12_0222CB90(MoveEffectSystem *param0); +void ov12_0222CC54(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222CFA0(MoveEffectSystem *param0); +void ov12_0222D56C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); #endif // POKEPLATINUM_OV12_0222AC70_H diff --git a/include/overlay012/ov12_0222D6B0.h b/include/overlay012/ov12_0222D6B0.h index 16d29fbcb7..5b663b1d28 100644 --- a/include/overlay012/ov12_0222D6B0.h +++ b/include/overlay012/ov12_0222D6B0.h @@ -5,12 +5,12 @@ #include "sprite_system.h" -void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222D7C0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222DB60(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222DEFC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222E1A8(MoveEffectSystem *param0); void ov12_0222E248(ManagedSprite *param0); -void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222E2F8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222E61C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); #endif // POKEPLATINUM_OV12_0222D6B0_H diff --git a/include/overlay012/ov12_0222E784.h b/include/overlay012/ov12_0222E784.h index 5502b5d949..dcd93ed1a3 100644 --- a/include/overlay012/ov12_0222E784.h +++ b/include/overlay012/ov12_0222E784.h @@ -3,6 +3,6 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222E810(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_0222E784_H diff --git a/include/overlay012/ov12_0222E91C.h b/include/overlay012/ov12_0222E91C.h index 5ed94a6fda..e747c80231 100644 --- a/include/overlay012/ov12_0222E91C.h +++ b/include/overlay012/ov12_0222E91C.h @@ -5,10 +5,10 @@ #include "sprite_system.h" -void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222EAA0(MoveEffectSystem *param0); +void ov12_0222EC90(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0222EFB0(MoveEffectSystem *param0); +void ov12_0222F2F8(MoveEffectSystem *param0); +void ov12_0222F5EC(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_0222E91C_H diff --git a/include/overlay012/ov12_0222F700.h b/include/overlay012/ov12_0222F700.h index 0a5c8652b8..887f2b3677 100644 --- a/include/overlay012/ov12_0222F700.h +++ b/include/overlay012/ov12_0222F700.h @@ -5,38 +5,38 @@ #include "sprite_system.h" -void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0); -void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0); -void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0); -void ov12_02230754(UnkStruct_ov12_0221FCDC *param0); -void ov12_02230804(UnkStruct_ov12_0221FCDC *param0); -void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02231444(UnkStruct_ov12_0221FCDC *param0); -void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0); -void ov12_02232024(UnkStruct_ov12_0221FCDC *param0); -void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0); -void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0); -void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02233178(UnkStruct_ov12_0221FCDC *param0); -void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0); -void ov12_02233F30(UnkStruct_ov12_0221FCDC *param0); -void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02234214(UnkStruct_ov12_0221FCDC *param0); -void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0); -void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0); -void ov12_0223464C(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222F770(MoveEffectSystem *param0); +void ov12_0222F9E4(MoveEffectSystem *param0); +void ov12_0222FE30(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022300C4(MoveEffectSystem *param0); +void ov12_022303D0(MoveEffectSystem *param0); +void ov12_02230754(MoveEffectSystem *param0); +void ov12_02230804(MoveEffectSystem *param0); +void ov12_02230A8C(MoveEffectSystem *param0); +void ov12_02230CEC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02231010(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022312A4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02231444(MoveEffectSystem *param0); +void ov12_02231650(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02231950(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02231C1C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02231E7C(MoveEffectSystem *param0); +void ov12_02232024(MoveEffectSystem *param0); +void ov12_02232378(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_0223249C(MoveEffectSystem *param0); +void ov12_022326AC(MoveEffectSystem *param0); +void ov12_022329E0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02232CA8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02233178(MoveEffectSystem *param0); +void ov12_02233454(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02233734(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022339C4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02233CD4(MoveEffectSystem *param0); +void ov12_02233F30(MoveEffectSystem *param0); +void ov12_02234008(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02234214(MoveEffectSystem *param0); +void ov12_022342C4(MoveEffectSystem *param0); +void ov12_022344D0(MoveEffectSystem *param0); +void ov12_0223464C(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_0222F700_H diff --git a/include/overlay012/ov12_022346A4.h b/include/overlay012/ov12_022346A4.h index 41d66b96a9..0109b62bb5 100644 --- a/include/overlay012/ov12_022346A4.h +++ b/include/overlay012/ov12_022346A4.h @@ -5,9 +5,9 @@ #include "sprite_system.h" -void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); -void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022346A4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_022348C8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02234A10(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); +void ov12_02234D98(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3); #endif // POKEPLATINUM_OV12_022346A4_H diff --git a/include/overlay012/ov12_02234E44.h b/include/overlay012/ov12_02234E44.h index 3c62ea3714..d6607b5809 100644 --- a/include/overlay012/ov12_02234E44.h +++ b/include/overlay012/ov12_02234E44.h @@ -3,9 +3,9 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_022351A4(UnkStruct_ov12_0221FCDC *param0); -void ov12_022351D0(UnkStruct_ov12_0221FCDC *param0); -void ov12_022351FC(UnkStruct_ov12_0221FCDC *param0); -void ov12_02235228(UnkStruct_ov12_0221FCDC *param0); +void ov12_022351A4(MoveEffectSystem *param0); +void ov12_022351D0(MoveEffectSystem *param0); +void ov12_022351FC(MoveEffectSystem *param0); +void ov12_02235228(MoveEffectSystem *param0); #endif // POKEPLATINUM_OV12_02234E44_H diff --git a/include/overlay012/ov12_02235254.h b/include/overlay012/ov12_02235254.h index b8ed7216cc..540b74f592 100644 --- a/include/overlay012/ov12_02235254.h +++ b/include/overlay012/ov12_02235254.h @@ -11,13 +11,13 @@ #include "pokemon_sprite.h" #include "sprite.h" -int ov12_02235254(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_02235288(UnkStruct_ov12_0221FCDC *param0, int param1); -int ov12_022352AC(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02235254(MoveEffectSystem *param0, int param1); +int ov12_0223525C(MoveEffectSystem *param0, int param1); +int ov12_02235288(MoveEffectSystem *param0, int param1); +int ov12_022352AC(MoveEffectSystem *param0, int param1); int ov12_02235310(int param0); void ov12_02235350(int param0, int param1, UnkStruct_ov12_02235350 *param2); -void ov12_022353AC(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235350 *param2); +void ov12_022353AC(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235350 *param2); void ov12_02235448(int param0, VecFx32 *param1, int param2, int param3); void ov12_02235458(int param0, VecFx32 *param1, int param2, int param3); void ov12_02235468(int param0, VecFx32 *param1, int param2, int param3); @@ -30,31 +30,31 @@ void ov12_022354C8(int param0, VecFx32 *param1, int param2, int param3); void ov12_022354D8(int param0, VecFx32 *param1, int param2, int param3); void ov12_022354E8(int param0, VecFx32 *param1, int param2, int param3); void ov12_022354F8(int param0, VecFx32 *param1, int param2, int param3); -void ov12_02235508(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235538(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235568(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235598(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_022355C8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_022355F8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235628(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235658(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235688(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_022356B8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_022356E8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); -void ov12_02235718(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235508(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235538(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235568(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235598(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_022355C8(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_022355F8(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235628(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235658(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235688(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_022356B8(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_022356E8(MoveEffectSystem *param0, int param1, VecFx32 *param2); +void ov12_02235718(MoveEffectSystem *param0, int param1, VecFx32 *param2); void ov12_02235748(VecFx32 *param0); void ov12_02235758(int param0, VecFx32 *param1, int param2, int param3); void ov12_02235760(int param0, VecFx32 *param1); -void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); -void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int param3); -void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); -void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2); +void ov12_02235780(MoveEffectSystem *param0, int param1, int param2); +void ov12_022357BC(MoveEffectSystem *param0, int param1, int param2, int param3); +void ov12_022357EC(MoveEffectSystem *param0, int param1, int param2); +void ov12_02235838(MoveEffectSystem *param0, int param1, BOOL param2); void ov12_02235918(PokemonSprite *param0, UnkStruct_ov12_02235350 *param1); void ov12_02235950(ManagedSprite *param0, UnkStruct_ov12_02235350 *param1); -void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1); -void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); -void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); -void *ov12_02235E50(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_0223595C(MoveEffectSystem *param0, UnkStruct_ov12_0223595C *param1); +void ov12_02235998(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); +void ov12_02235D74(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); +void *ov12_02235E50(MoveEffectSystem *param0, int param1); void ov12_02235E80(void *param0); #endif // POKEPLATINUM_OV12_02235254_H diff --git a/include/overlay012/struct_ov12_0221FCDC_decl.h b/include/overlay012/struct_ov12_0221FCDC_decl.h index 8ace84c9f6..9536afa04e 100644 --- a/include/overlay012/struct_ov12_0221FCDC_decl.h +++ b/include/overlay012/struct_ov12_0221FCDC_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV12_0221FCDC_DECL_H #define POKEPLATINUM_STRUCT_OV12_0221FCDC_DECL_H -typedef struct UnkStruct_ov12_0221FCDC_t UnkStruct_ov12_0221FCDC; +typedef struct MoveEffectSystem MoveEffectSystem; #endif // POKEPLATINUM_STRUCT_OV12_0221FCDC_DECL_H diff --git a/include/overlay012/struct_ov12_0222118C_decl.h b/include/overlay012/struct_ov12_0222118C_decl.h deleted file mode 100644 index fb991cd1e9..0000000000 --- a/include/overlay012/struct_ov12_0222118C_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV12_0222118C_DECL_H -#define POKEPLATINUM_STRUCT_OV12_0222118C_DECL_H - -typedef struct UnkStruct_ov12_0222118C_t UnkStruct_ov12_0222118C; - -#endif // POKEPLATINUM_STRUCT_OV12_0222118C_DECL_H diff --git a/include/overlay012/struct_ov12_022211D8_decl.h b/include/overlay012/struct_ov12_022211D8_decl.h deleted file mode 100644 index f3a234ca8d..0000000000 --- a/include/overlay012/struct_ov12_022211D8_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV12_022211D8_DECL_H -#define POKEPLATINUM_STRUCT_OV12_022211D8_DECL_H - -typedef struct UnkStruct_ov12_022211D8_t UnkStruct_ov12_022211D8; - -#endif // POKEPLATINUM_STRUCT_OV12_022211D8_DECL_H diff --git a/include/overlay012/struct_ov12_022222D4_decl.h b/include/overlay012/struct_ov12_022222D4_decl.h deleted file mode 100644 index 052c153ab7..0000000000 --- a/include/overlay012/struct_ov12_022222D4_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV12_022222D4_DECL_H -#define POKEPLATINUM_STRUCT_OV12_022222D4_DECL_H - -typedef struct UnkStruct_ov12_022222D4_t UnkStruct_ov12_022222D4; - -#endif // POKEPLATINUM_STRUCT_OV12_022222D4_DECL_H diff --git a/include/overlay012/struct_ov12_02223178_decl.h b/include/overlay012/struct_ov12_02223178_decl.h deleted file mode 100644 index 1e2b1a8efd..0000000000 --- a/include/overlay012/struct_ov12_02223178_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV12_02223178_DECL_H -#define POKEPLATINUM_STRUCT_OV12_02223178_DECL_H - -typedef struct UnkStruct_ov12_02223178_t UnkStruct_ov12_02223178; - -#endif // POKEPLATINUM_STRUCT_OV12_02223178_DECL_H diff --git a/include/overlay012/struct_ov12_02225640.h b/include/overlay012/struct_ov12_02225640.h index 03f7fdcb63..1f39894b8e 100644 --- a/include/overlay012/struct_ov12_02225640.h +++ b/include/overlay012/struct_ov12_02225640.h @@ -8,7 +8,7 @@ #include "particle_system.h" typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; ParticleSystem *unk_04; s8 unk_08; int unk_0C[6]; diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h index d4b1c9215f..f737402e42 100644 --- a/include/overlay012/struct_ov12_0223595C.h +++ b/include/overlay012/struct_ov12_0223595C.h @@ -12,7 +12,7 @@ typedef struct { u8 unk_01; u8 unk_02; u8 unk_03; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; SpriteSystem *unk_08; SpriteManager *unk_0C; SpriteManager *unk_10; diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index 7058d49563..a7a19fed92 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -22,7 +22,7 @@ typedef struct { PokemonSprite *unk_08[4]; SpriteSystem *unk_18; SpriteManager *unk_1C; - UnkStruct_ov12_0221FCDC *unk_20; + MoveEffectSystem *unk_20; BgConfig *unk_24; Window unk_28[1]; MessageLoader *unk_38; diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 1769282162..14f903025c 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -65,7 +65,7 @@ struct BattleSystem { Party *parties[MAX_BATTLERS]; ChatotCry *unk_78[MAX_BATTLERS]; PokemonSpriteManager *unk_88; - UnkStruct_ov12_0221FCDC *unk_8C; + MoveEffectSystem *unk_8C; SpriteSystem *spriteSys; SpriteManager *spriteMan; Poketch *poketch; diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index a68bd8fa88..22a3ab918a 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -202,7 +202,7 @@ static void ov16_022641B4(BattleSystem *battleSys, BattlerData *param1, BattleMe static void ov16_02264270(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2, BattleMessage *param3); static void ov16_02264360(BattleSystem *battleSys, BattlerData *param1, BattleMessage *param2); static ManagedSprite *ov16_022643B8(BattleSystem *battleSys, int param1, int param2, int param3, s16 param4, s16 param5); -static void ov16_02264408(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov12_0221FCDC *param2, UnkStruct_ov16_02265BBC *param3); +static void ov16_02264408(BattleSystem *battleSys, BattlerData *param1, MoveEffectSystem *param2, UnkStruct_ov16_02265BBC *param3); static void ov16_02264530(BattleSystem *battleSys, UnkStruct_ov16_02265BBC *param1, UnkStruct_ov12_022380DC *param2, int param3); static void ov16_022645B8(u8 *param0, u8 *param1, int param2, int param3, u16 param4); static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, ManagedSprite *param1); @@ -1457,7 +1457,7 @@ void ov16_0225E4C8(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_ static void ov16_0225E4E8(SysTask *param0, void *param1) { UnkStruct_ov16_0225E4E8 *v0 = (UnkStruct_ov16_0225E4E8 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); s16 v2, v3; switch (v0->unk_12) { @@ -1597,7 +1597,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) static void ov16_0225E894(SysTask *param0, void *param1) { UnkStruct_ov16_0225E4E8 *v0 = (UnkStruct_ov16_0225E4E8 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); s16 v2, v3; switch (v0->unk_12) { @@ -1862,7 +1862,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) { UnkStruct_ov16_02265BBC v8; - v0->unk_24 = ov12_0221FCDC(HEAP_ID_BATTLE); + v0->unk_24 = MoveEffectSystem_New(HEAP_ID_BATTLE); ov16_02266B78(v0->unk_00, NULL, &v8, 1, 11, v0->unk_81, v0->unk_81, NULL); ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_24, &v8); } @@ -1877,7 +1877,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) if (ov12_02220188(v0->unk_24) == 0) { ov12_02220198(v0->unk_24); - ov12_0221FDF4(v0->unk_24); + MoveEffectSystem_Delete(v0->unk_24); v0->unk_83 = 0xff; } break; @@ -1893,7 +1893,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) static void ov16_0225F0C0(SysTask *param0, void *param1) { UnkStruct_ov16_0225EA80 *v0 = (UnkStruct_ov16_0225EA80 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); switch (v0->unk_83) { case 0: { @@ -2109,7 +2109,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) static void ov16_0225F764(SysTask *param0, void *param1) { UnkStruct_ov16_0225F764 *v0 = (UnkStruct_ov16_0225F764 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); switch (v0->unk_6B) { case 0: @@ -4717,7 +4717,7 @@ static void ov16_022629DC(SysTask *param0, void *param1) static void ov16_02262A9C(SysTask *param0, void *param1) { UnkStruct_ov16_0225DB74 *v0 = (UnkStruct_ov16_0225DB74 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); int v2; int v3; @@ -4863,7 +4863,7 @@ static void ov16_02262D28(SysTask *param0, void *param1) static void ov16_02262DC4(SysTask *param0, void *param1) { UnkStruct_ov16_0225DCB0 *v0 = (UnkStruct_ov16_0225DCB0 *)param1; - UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); + MoveEffectSystem *v1 = ov16_0223E008(v0->unk_00); switch (v0->unk_62) { case 0: @@ -6082,7 +6082,7 @@ static ManagedSprite *ov16_022643B8(BattleSystem *battleSys, int param1, int par return v3; } -static void ov16_02264408(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov12_0221FCDC *param2, UnkStruct_ov16_02265BBC *param3) +static void ov16_02264408(BattleSystem *battleSys, BattlerData *param1, MoveEffectSystem *param2, UnkStruct_ov16_02265BBC *param3) { UnkStruct_ov16_02264408 v0; int i; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 6b09e6313f..e75bc1e0df 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -605,7 +605,7 @@ static void ov16_0223B790(ApplicationManager *appMan) ov16_0223F36C(battleSys); ov16_0223CE28(); - battleSys->unk_8C = ov12_0221FCDC(HEAP_ID_BATTLE); + battleSys->unk_8C = MoveEffectSystem_New(HEAP_ID_BATTLE); ov16_0223C210(battleSys); @@ -762,7 +762,7 @@ static void ov16_0223BCB4(ApplicationManager *appMan) sub_02015FB8(battleSystem->pokemonAnimationSys); ParticleSystem_FreeAll(); - ov12_0221FDF4(battleSystem->unk_8C); + MoveEffectSystem_Delete(battleSystem->unk_8C); BattleContext_Free(battleSystem->battleCtx); for (battlerId = 0; battlerId < battleSystem->maxBattlers; battlerId++) { diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 2809c8a45d..0bcb0e2c57 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -80,7 +80,7 @@ Party *BattleSystem_Party(BattleSystem *battleSystem, int param1); int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSystem); -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem); +MoveEffectSystem *ov16_0223E008(BattleSystem *battleSystem); SpriteSystem *BattleSystem_GetSpriteSystem(BattleSystem *battleSystem); SpriteManager *BattleSystem_GetSpriteManager(BattleSystem *battleSystem); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1); @@ -292,7 +292,7 @@ PokemonSpriteManager *ov16_0223E000(BattleSystem *battleSystem) return battleSystem->unk_88; } -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem) +MoveEffectSystem *ov16_0223E008(BattleSystem *battleSystem) { return battleSystem->unk_8C; } diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 5454f00b55..83762152b8 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -19,9 +19,6 @@ #include "overlay012/ov12_02226998.h" #include "overlay012/ov12_02235254.h" #include "overlay012/ov12_022380BC.h" -#include "overlay012/struct_ov12_0222118C_decl.h" -#include "overlay012/struct_ov12_022211D8_decl.h" -#include "overlay012/struct_ov12_022222D4_decl.h" #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_02226504_decl.h" #include "overlay012/struct_ov12_022380DC.h" @@ -48,92 +45,6 @@ #include "system.h" #include "vram_transfer.h" -typedef struct UnkStruct_ov12_02223178_t { - u8 unk_00; - u8 unk_01; - u16 unk_02; - s32 unk_04; - u16 unk_08; - u16 unk_0A; - u32 unk_0C; - u16 unk_10; - u16 unk_12; - u16 unk_14; - u16 unk_16; - int unk_18; - ParticleSystem *unk_1C[16]; - SPLEmitter *unk_5C[20]; - SpriteSystem *unk_AC; - UnkStruct_ov16_0223E0C8 *unk_B0[4]; - u8 unk_C0[4]; - PokemonSprite *unk_C4[4]; - u32 battleType; - u16 unk_D8[4]; - u8 unk_E0[4]; - u8 unk_E4[4]; - u8 unk_E8[4]; - u32 unk_EC[4]; - u32 unk_FC[4]; - ChatotCry *unk_10C; - u8 *unk_110; - u16 *unk_114; - int unk_118; -} UnkStruct_ov12_02223178; - -typedef struct { - u32 *unk_00; - u8 unk_04; - u8 unk_05; - BOOL unk_08; -} UnkStruct_ov12_0221FCDC_sub1; - -typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; - SpriteManager *unk_04; - ManagedSprite *unk_08; - BOOL unk_0C; -} UnkStruct_ov12_02221810; - -typedef struct UnkStruct_ov12_0221FCDC_t { - int heapID; - enum NarcID narcID; - BOOL unk_08; - BOOL unk_0C; - BOOL unk_10; - void *unk_14; - u32 *unk_18; - u32 *unk_1C[3]; - UnkStruct_ov12_0221FCDC_sub1 unk_28[3]; - UnkStruct_ov12_02221810 unk_48[2]; - u8 unk_68[16]; - u8 unk_78[16]; - s8 unk_88; - u8 unk_89; - u16 unk_8A; - u16 unk_8C; - s32 unk_90[10]; - UnkFuncPtr_ov12_02239EEC unk_B8; - UnkStruct_ov12_02223178 *unk_BC; - BgConfig *unk_C0; - PaletteData *unk_C4; - SpriteManager *unk_C8[4]; - ManagedSprite *unk_D8[10]; - SpriteTemplate unk_100; - SpriteManager *unk_134; - ManagedSprite *unk_138[5]; - BOOL unk_14C[5]; - UnkStruct_ov12_0222118C *unk_160[5]; - UnkStruct_ov12_022211D8 *unk_174; - u8 unk_178; - u8 unk_179; - u8 unk_17A; - u8 unk_17B; - UnkStruct_ov12_022222D4 *unk_17C; - UnkStruct_ov16_02264408_sub1 unk_180; - int unk_198; - u8 unk_19C[4]; - NARC *unk_1A0[6]; -} UnkStruct_ov12_0221FCDC; typedef struct UnkStruct_ov12_02220314_t { u8 unk_00; @@ -148,7 +59,7 @@ typedef struct UnkStruct_ov12_02220314_t { u8 unk_18; u16 unk_1A; u32 unk_1C[7]; - UnkStruct_ov12_0221FCDC *unk_38; + MoveEffectSystem *unk_38; } UnkStruct_ov12_02220314; typedef struct UnkStruct_ov12_02221BBC_t { @@ -170,59 +81,19 @@ typedef struct UnkStruct_ov12_02221BBC_t { u16 unk_44_0 : 1; u16 unk_44_1 : 1; u16 unk_44_2 : 14; - UnkStruct_ov12_0221FCDC *unk_48; + MoveEffectSystem *unk_48; } UnkStruct_ov12_02221BBC; -typedef struct { - s16 unk_00; - s16 unk_02; - s16 unk_04; - s16 unk_06; - int unk_08; -} UnkStruct_ov12_022224F8_sub1; -typedef struct { - UnkStruct_ov12_022224F8_sub1 unk_00[16]; - UnkStruct_ov12_02226504 *unk_C0; -} UnkStruct_ov12_022224F8; -typedef struct UnkStruct_ov12_022222D4_t { - BgConfig *unk_00; - s16 unk_04; - s16 unk_06; - s16 unk_08; - s16 unk_0A; - int unk_0C; - int unk_10; - BOOL unk_14; - BOOL unk_18; - UnkStruct_ov12_022224F8 *unk_1C; -} UnkStruct_ov12_022222D4; - -typedef struct { - u8 unk_00; - u8 unk_01; - PokemonSprite *unk_04; - SysTask *unk_08; -} UnkStruct_ov12_0222118C_sub1; - -typedef struct UnkStruct_ov12_0222118C_t { - ManagedSprite *unk_00; - UnkStruct_ov12_0222118C_sub1 unk_04; -} UnkStruct_ov12_0222118C; - -typedef struct UnkStruct_ov12_022211D8_t { - BgConfig *unk_00; - UnkStruct_ov12_0222118C_sub1 unk_04; -} UnkStruct_ov12_022211D8; static void ov12_022224F8(SysTask *param0, void *param1); -static void ov12_0221FC20(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0221FC44(UnkStruct_ov12_0221FCDC *param0); -static SysTask *ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTaskFunc param2, void *param3, u32 param4); -static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *param2); -static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220344(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02220314 *param1); +static void ov12_0221FC20(MoveEffectSystem *param0); +static void ov12_0221FC44(MoveEffectSystem *param0); +static SysTask *ov12_0221FC68(u8 param0, MoveEffectSystem *param1, SysTaskFunc param2, void *param3, u32 param4); +static void ov12_0221FCA4(u8 param0, MoveEffectSystem *param1, SysTask *param2); +static UnkStruct_ov12_02220314 *ov12_02220314(MoveEffectSystem *param0); +static void ov12_02220344(MoveEffectSystem *param0, UnkStruct_ov12_02220314 *param1); static void ov12_0222035C(SysTask *param0, void *param1); static BOOL ov12_0222039C(UnkStruct_ov12_02220314 *param0); static BOOL ov12_022203A0(UnkStruct_ov12_02220314 *param0); @@ -230,94 +101,94 @@ static BOOL ov12_022203FC(UnkStruct_ov12_02220314 *param0); static BOOL ov12_02220404(UnkStruct_ov12_02220314 *param0); static BOOL ov12_0222040C(UnkStruct_ov12_02220314 *param0); static BOOL ov12_0222044C(UnkStruct_ov12_02220314 *param0); -static void ov12_022204C4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022204E4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222074C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222950(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221284(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221288(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222CAC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222CDC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220E14(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220E44(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220504(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220524(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220F30(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221064(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221098(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222724(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222774(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022227CC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222820(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222840(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222984(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022229BC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022229D8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222B94(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222BF8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222CE4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222C50(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222C54(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220E70(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222144C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022217B4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022217E0(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221A00(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221A14(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221A30(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220EA8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222A78(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222AF0(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222293C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222940(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222944(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221A4C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221A50(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222948(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222294C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222968(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220F5C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220FA0(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220FFC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221024(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220ED0(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022209A8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220A3C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220B8C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220C44(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220CFC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02220DE8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022230CC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02223160(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222CE8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222D84(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222DCC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222E2C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222E74(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222307C(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0); -static void ov12_022219E8(UnkStruct_ov12_0221FCDC *param0); -static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0); -static int ov12_022210A8(UnkStruct_ov12_0221FCDC *param0, int param1); -static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2); -static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3); +static void ov12_022204C4(MoveEffectSystem *param0); +static void ov12_022204E4(MoveEffectSystem *param0); +static void ov12_0222070C(MoveEffectSystem *param0); +static void ov12_0222074C(MoveEffectSystem *param0); +static void ov12_02220798(MoveEffectSystem *param0); +static void ov12_02222950(MoveEffectSystem *param0); +static void ov12_02221284(MoveEffectSystem *param0); +static void ov12_02221288(MoveEffectSystem *param0); +static void ov12_02222CAC(MoveEffectSystem *param0); +static void ov12_02222CDC(MoveEffectSystem *param0); +static void ov12_02220E14(MoveEffectSystem *param0); +static void ov12_02220E44(MoveEffectSystem *param0); +static void ov12_02220504(MoveEffectSystem *param0); +static void ov12_02220524(MoveEffectSystem *param0); +static void ov12_022206A4(MoveEffectSystem *param0); +static void ov12_022206E8(MoveEffectSystem *param0); +static void ov12_02220F30(MoveEffectSystem *param0); +static void ov12_02221064(MoveEffectSystem *param0); +static void ov12_02221098(MoveEffectSystem *param0); +static void ov12_02222724(MoveEffectSystem *param0); +static void ov12_02222774(MoveEffectSystem *param0); +static void ov12_022227CC(MoveEffectSystem *param0); +static void ov12_02222820(MoveEffectSystem *param0); +static void ov12_02222840(MoveEffectSystem *param0); +static void ov12_02222860(MoveEffectSystem *param0); +static void ov12_02222984(MoveEffectSystem *param0); +static void ov12_022229BC(MoveEffectSystem *param0); +static void ov12_022229D8(MoveEffectSystem *param0); +static void ov12_02222B94(MoveEffectSystem *param0); +static void ov12_02222BF8(MoveEffectSystem *param0); +static void ov12_02222CE4(MoveEffectSystem *param0); +static void ov12_02222C50(MoveEffectSystem *param0); +static void ov12_02222C54(MoveEffectSystem *param0); +static void ov12_02220E70(MoveEffectSystem *param0); +static void ov12_0222128C(MoveEffectSystem *param0); +static void ov12_0222144C(MoveEffectSystem *param0); +static void ov12_022214C4(MoveEffectSystem *param0); +static void ov12_02221580(MoveEffectSystem *param0); +static void ov12_022217B4(MoveEffectSystem *param0); +static void ov12_022217E0(MoveEffectSystem *param0); +static void ov12_02221A00(MoveEffectSystem *param0); +static void ov12_02221A14(MoveEffectSystem *param0); +static void ov12_02221A30(MoveEffectSystem *param0); +static void ov12_02221424(MoveEffectSystem *param0); +static void ov12_02220EA8(MoveEffectSystem *param0); +static void ov12_022228DC(MoveEffectSystem *param0); +static void ov12_02222A78(MoveEffectSystem *param0); +static void ov12_02222AF0(MoveEffectSystem *param0); +static void ov12_0222293C(MoveEffectSystem *param0); +static void ov12_02222940(MoveEffectSystem *param0); +static void ov12_02222944(MoveEffectSystem *param0); +static void ov12_02221A4C(MoveEffectSystem *param0); +static void ov12_02221A50(MoveEffectSystem *param0); +static void ov12_02222948(MoveEffectSystem *param0); +static void ov12_0222294C(MoveEffectSystem *param0); +static void ov12_02222968(MoveEffectSystem *param0); +static void ov12_02220F5C(MoveEffectSystem *param0); +static void ov12_02220FA0(MoveEffectSystem *param0); +static void ov12_02220FFC(MoveEffectSystem *param0); +static void ov12_02221024(MoveEffectSystem *param0); +static void ov12_022230D4(MoveEffectSystem *param0); +static void ov12_02223134(MoveEffectSystem *param0); +static void ov12_02220ED0(MoveEffectSystem *param0); +static void ov12_022209A8(MoveEffectSystem *param0); +static void ov12_02220A3C(MoveEffectSystem *param0); +static void ov12_02220B8C(MoveEffectSystem *param0); +static void ov12_02220C44(MoveEffectSystem *param0); +static void ov12_02220CFC(MoveEffectSystem *param0); +static void ov12_02220D3C(MoveEffectSystem *param0); +static void ov12_02220D90(MoveEffectSystem *param0); +static void ov12_02220DE8(MoveEffectSystem *param0); +static void ov12_022230CC(MoveEffectSystem *param0); +static void ov12_02223160(MoveEffectSystem *param0); +static void ov12_02222CE8(MoveEffectSystem *param0); +static void ov12_02222D84(MoveEffectSystem *param0); +static void ov12_02222DCC(MoveEffectSystem *param0); +static void ov12_02222E2C(MoveEffectSystem *param0); +static void ov12_02222E74(MoveEffectSystem *param0); +static void ov12_02222EBC(MoveEffectSystem *param0); +static void ov12_02222FC8(MoveEffectSystem *param0); +static void ov12_0222307C(MoveEffectSystem *param0); +static void ov12_022230A8(MoveEffectSystem *param0); +static void ov12_02221834(MoveEffectSystem *param0); +static void ov12_022219E8(MoveEffectSystem *param0); +static void ov12_0222048C(MoveEffectSystem *param0); +static int ov12_022210A8(MoveEffectSystem *param0, int param1); +static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, MoveEffectSystem *param1, int param2); +static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, MoveEffectSystem *param1, int param2, int param3); static int ov12_02221B54(int param0, int param1); static void ov12_02221B64(UnkStruct_ov12_02221BBC *param0); static BOOL ov12_02221C50(SysTask *param0, UnkStruct_ov12_02221BBC *param1); @@ -356,7 +227,7 @@ static const s16 Unk_ov12_02238660[] = { 0x20 }; -static void ov12_0221FC20(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0221FC20(MoveEffectSystem *param0) { if (param0->unk_89 == 0) { param0->unk_89 == 0; @@ -366,7 +237,7 @@ static void ov12_0221FC20(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_0221FC44(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0221FC44(MoveEffectSystem *param0) { UnkFuncPtr_ov12_02239EEC v0; @@ -376,7 +247,7 @@ static void ov12_0221FC44(UnkStruct_ov12_0221FCDC *param0) } while (param0->unk_89 == 0 && param0->unk_10 == 1); } -static SysTask *ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTaskFunc param2, void *param3, u32 param4) +static SysTask *ov12_0221FC68(u8 param0, MoveEffectSystem *param1, SysTaskFunc param2, void *param3, u32 param4) { SysTask *v0; @@ -396,7 +267,7 @@ static SysTask *ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTas return v0; } -static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *param2) +static void ov12_0221FCA4(u8 param0, MoveEffectSystem *param1, SysTask *param2) { switch (param0) { case 1: @@ -413,93 +284,87 @@ static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *p SysTask_Done(param2); } -UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int heapID) +MoveEffectSystem *MoveEffectSystem_New(enum HeapId heapID) { - int v0; - UnkStruct_ov12_0221FCDC *v1 = NULL; + int i; + MoveEffectSystem *system = Heap_AllocFromHeap(heapID, sizeof(MoveEffectSystem)); - v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_0221FCDC)); - - if (v1 == NULL) { - GF_ASSERT(v1 != NULL); + if (system == NULL) { + GF_ASSERT(system != NULL); return NULL; } - memset(v1, 0, sizeof(UnkStruct_ov12_0221FCDC)); + memset(system, 0, sizeof(MoveEffectSystem)); - v1->heapID = heapID; - v1->unk_08 = 0; - v1->unk_BC = Heap_AllocFromHeap(v1->heapID, sizeof(UnkStruct_ov12_02223178)); - v1->unk_1A0[0] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, heapID); - v1->unk_1A0[1] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID); - v1->unk_1A0[2] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR, heapID); - v1->unk_1A0[3] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT, heapID); - v1->unk_1A0[4] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL, heapID); - v1->unk_1A0[5] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM, heapID); + system->heapID = heapID; + system->unk_08 = 0; + system->unk_BC = Heap_AllocFromHeap(system->heapID, sizeof(UnkStruct_ov12_02223178)); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_BATT_BG] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, heapID); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_BATT_OBJ] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_WECHAR] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR, heapID); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_WEPLTT] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT, heapID); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_WECELL] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL, heapID); + system->arcs[MOVE_EFFECT_SYSTEM_ARC_WECELLANM] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM, heapID); - if (v1->unk_BC == NULL) { - GF_ASSERT(v1->unk_BC != NULL); + if (system->unk_BC == NULL) { + GF_ASSERT(system->unk_BC != NULL); return NULL; } - memset(v1->unk_BC, 0, sizeof(UnkStruct_ov12_02223178)); + memset(system->unk_BC, 0, sizeof(UnkStruct_ov12_02223178)); - v1->unk_0C = 0; - v1->unk_18 = NULL; + system->unk_0C = 0; + system->unk_18 = NULL; - for (v0 = 0; v0 < 4; v0++) { - v1->unk_C8[v0] = NULL; + for (i = 0; i < 4; i++) { + system->unk_C8[i] = NULL; } - for (v0 = 0; v0 < (4 + 1); v0++) { - v1->unk_160[v0] = NULL; + for (i = 0; i < (4 + 1); i++) { + system->unk_160[i] = NULL; } - v1->unk_174 = NULL; - v1->unk_0C = 1; + system->unk_174 = NULL; + system->unk_0C = 1; - return v1; + return system; } -void ov12_0221FDC0(UnkStruct_ov12_0221FCDC *param0, BOOL param1) +void ov12_0221FDC0(MoveEffectSystem *param0, BOOL param1) { GF_ASSERT(param0 != NULL); param0->unk_08 = param1; } -BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_0221FDD4(MoveEffectSystem *param0) { GF_ASSERT(param0 != NULL); return param0->unk_08; } -int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0) +int ov12_0221FDE4(MoveEffectSystem *param0) { GF_ASSERT(param0 != NULL); return param0->heapID; } -BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC *param0) +BOOL MoveEffectSystem_Delete(MoveEffectSystem *system) { - if (ov12_022201B4(param0) == 0) { - return 0; + if (ov12_022201B4(system) == 0) { + return FALSE; } - { - int v0; - - for (v0 = 0; v0 < 6; v0++) { - NARC_dtor(param0->unk_1A0[v0]); - } + for (int i = 0; i < MOVE_EFFECT_SYSTEM_ARC_COUNT; i++) { + NARC_dtor(system->arcs[i]); } - Heap_Free(param0->unk_BC); - Heap_Free(param0); + Heap_Free(system->unk_BC); + Heap_Free(system); - return 1; + return TRUE; } -BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3) +BOOL ov12_0221FE30(MoveEffectSystem *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3) { int v0; int v1 = param2; @@ -629,7 +494,7 @@ BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *par return 1; } -BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_0222016C(MoveEffectSystem *param0) { if (ov12_022201B4(param0) == 0) { return 0; @@ -639,12 +504,12 @@ BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC *param0) return 1; } -BOOL ov12_02220188(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_02220188(MoveEffectSystem *param0) { return (param0->unk_10 == 1) ? 1 : 0; } -BOOL ov12_02220198(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_02220198(MoveEffectSystem *param0) { if (param0->unk_14 == NULL) { GF_ASSERT(param0->unk_14); @@ -655,7 +520,7 @@ BOOL ov12_02220198(UnkStruct_ov12_0221FCDC *param0) return 1; } -BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_022201B4(MoveEffectSystem *param0) { if (param0 == NULL) { return 0; @@ -664,72 +529,72 @@ BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC *param0) return (param0->unk_0C == 1) ? 1 : 0; } -SysTask *ov12_022201CC(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3) +SysTask *ov12_022201CC(MoveEffectSystem *param0, SysTaskFunc param1, void *param2, u32 param3) { SysTask *v0 = ov12_0221FC68(1, param0, param1, param2, param3); return v0; } -SysTask *ov12_022201E8(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2) +SysTask *ov12_022201E8(MoveEffectSystem *param0, SysTaskFunc param1, void *param2) { SysTask *v0 = ov12_0221FC68(1, param0, param1, param2, 1100); return v0; } -SysTask *ov12_02220204(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3) +SysTask *ov12_02220204(MoveEffectSystem *param0, SysTaskFunc param1, void *param2, u32 param3) { SysTask *v0 = ov12_0221FC68(2, param0, param1, param2, param3); return v0; } -void ov12_02220220(UnkStruct_ov12_0221FCDC *param0, SysTask *param1) +void ov12_02220220(MoveEffectSystem *param0, SysTask *param1) { ov12_0221FCA4(1, param0, param1); } -void ov12_02220230(UnkStruct_ov12_0221FCDC *param0, SysTask *param1) +void ov12_02220230(MoveEffectSystem *param0, SysTask *param1) { ov12_0221FCA4(2, param0, param1); } -u16 ov12_02220240(UnkStruct_ov12_0221FCDC *param0) +u16 ov12_02220240(MoveEffectSystem *param0) { return param0->unk_BC->unk_14; } -u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0) +u16 ov12_02220248(MoveEffectSystem *param0) { return param0->unk_BC->unk_16; } -ParticleSystem *ov12_02220250(UnkStruct_ov12_0221FCDC *param0) +ParticleSystem *ov12_02220250(MoveEffectSystem *param0) { return param0->unk_BC->unk_1C[param0->unk_BC->unk_18]; } -ParticleSystem *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1) +ParticleSystem *ov12_02220260(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_1C[param1]; } -SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1) +SPLEmitter *ov12_0222026C(MoveEffectSystem *param0, int param1) { SPLEmitter *v0 = param0->unk_BC->unk_5C[param1]; return v0; } -BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0) +BgConfig *ov12_02220278(MoveEffectSystem *param0) { return param0->unk_C0; } -s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1) +s32 ov12_02220280(MoveEffectSystem *param0, int param1) { GF_ASSERT(param1 < (8 + 2)); return param0->unk_90[param1]; } -ManagedSprite *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1) +ManagedSprite *ov12_02220298(MoveEffectSystem *param0, int param1) { GF_ASSERT(param1 < 10); GF_ASSERT(param0 != NULL); @@ -738,7 +603,7 @@ ManagedSprite *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1) return param0->unk_D8[param1]; } -ManagedSprite *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1) +ManagedSprite *ov12_022202C0(MoveEffectSystem *param0, int param1) { GF_ASSERT(param1 < (4 + 1)); GF_ASSERT(param0 != NULL); @@ -747,18 +612,18 @@ ManagedSprite *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1) return param0->unk_138[param1]; } -SpriteManager *ov12_022202EC(UnkStruct_ov12_0221FCDC *param0) +SpriteManager *ov12_022202EC(MoveEffectSystem *param0) { GF_ASSERT(param0 != NULL); return param0->unk_134; } -SpriteManager *ov12_02220300(UnkStruct_ov12_0221FCDC *param0) +SpriteManager *ov12_02220300(MoveEffectSystem *param0) { return param0->unk_C8[0]; } -SpriteSystem *ov12_02220308(UnkStruct_ov12_0221FCDC *param0) +SpriteSystem *ov12_02220308(MoveEffectSystem *param0) { return param0->unk_BC->unk_AC; } @@ -772,7 +637,7 @@ static BOOL (*const Unk_ov12_0223862C[])(UnkStruct_ov12_02220314 *) = { ov12_0222044C }; -static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0) +static UnkStruct_ov12_02220314 *ov12_02220314(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -789,7 +654,7 @@ static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0) return v0; } -static void ov12_02220344(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02220314 *param1) +static void ov12_02220344(MoveEffectSystem *param0, UnkStruct_ov12_02220314 *param1) { param1->unk_38 = param0; SysTask_Start(ov12_0222035C, param1, 1100); @@ -1018,7 +883,7 @@ static inline int inline_ov12_022204C4(u32 *param0) return inline_ov12_022204C4_sub(param0, 1); } -static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222048C(MoveEffectSystem *param0) { param0->unk_89 = 1; @@ -1032,7 +897,7 @@ static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_022204C4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022204C4(MoveEffectSystem *param0) { param0->unk_18 += 1; param0->unk_89 = (u8)inline_ov12_022204C4(param0->unk_18); @@ -1040,7 +905,7 @@ static void ov12_022204C4(UnkStruct_ov12_0221FCDC *param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_022204E4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022204E4(MoveEffectSystem *param0) { if (param0->unk_8A == 0) { param0->unk_18 += 1; @@ -1050,7 +915,7 @@ static void ov12_022204E4(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220504(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220504(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1069,7 +934,7 @@ static void ov12_02220504(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220524(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220524(MoveEffectSystem *param0) { int v0; @@ -1080,7 +945,7 @@ static void ov12_02220524(UnkStruct_ov12_0221FCDC *param0) } } -int ov12_02220540(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02220540(MoveEffectSystem *param0, int param1) { int v0 = 0; @@ -1111,7 +976,7 @@ int ov12_02220540(UnkStruct_ov12_0221FCDC *param0, int param1) return v0; } -void ov12_02220590(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_022380DC *param1, int param2) +void ov12_02220590(MoveEffectSystem *param0, UnkStruct_ov12_022380DC *param1, int param2) { int v0; @@ -1149,7 +1014,7 @@ void ov12_02220590(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_022380DC *par } } -static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022206A4(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_022380DC v1; @@ -1169,7 +1034,7 @@ static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022206E8(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_022380DC v1; @@ -1182,7 +1047,7 @@ static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0) ov12_022382BC(&v1, param0->heapID); } -static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222070C(MoveEffectSystem *param0) { int v0; @@ -1203,7 +1068,7 @@ static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_0222074C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222074C(MoveEffectSystem *param0) { int v0; @@ -1226,7 +1091,7 @@ static void ov12_0222074C(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220798(MoveEffectSystem *param0) { int v0; int v1 = 0; @@ -1321,7 +1186,7 @@ static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0) param0->unk_10 = 0; } -static void ov12_022209A8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022209A8(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1353,7 +1218,7 @@ static void ov12_022209A8(UnkStruct_ov12_0221FCDC *param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v2], v0, v1, param0); } -static void ov12_02220A3C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220A3C(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1389,7 +1254,7 @@ static void ov12_02220A3C(UnkStruct_ov12_0221FCDC *param0) param0->unk_BC->unk_5C[v3] = ov12_02223880(param0->unk_BC->unk_1C[v2], v0, v1, param0); } -static int ov12_02220ADC(UnkStruct_ov12_0221FCDC *param0) +static int ov12_02220ADC(MoveEffectSystem *param0) { int v0; int v1, v2; @@ -1414,7 +1279,7 @@ static int ov12_02220ADC(UnkStruct_ov12_0221FCDC *param0) return v0 - 1; } -static int ov12_02220B34(UnkStruct_ov12_0221FCDC *param0) +static int ov12_02220B34(MoveEffectSystem *param0) { int v0; int v1, v2; @@ -1439,7 +1304,7 @@ static int ov12_02220B34(UnkStruct_ov12_0221FCDC *param0) return v0; } -static void ov12_02220B8C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220B8C(MoveEffectSystem *param0) { int v0; u32 v1[6]; @@ -1480,7 +1345,7 @@ static void ov12_02220B8C(UnkStruct_ov12_0221FCDC *param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v3], v4, v2, param0); } -static void ov12_02220C44(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220C44(MoveEffectSystem *param0) { int v0; u32 v1[4]; @@ -1521,7 +1386,7 @@ static void ov12_02220C44(UnkStruct_ov12_0221FCDC *param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v3], v4, v2, param0); } -static void ov12_02220CFC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220CFC(MoveEffectSystem *param0) { int v0; int v1 = 0; @@ -1542,7 +1407,7 @@ static void ov12_02220CFC(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220D3C(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1562,7 +1427,7 @@ static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220D90(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1586,7 +1451,7 @@ static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_02220DE8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220DE8(MoveEffectSystem *param0) { u32 v0; @@ -1598,7 +1463,7 @@ static void ov12_02220DE8(UnkStruct_ov12_0221FCDC *param0) param0->unk_BC->unk_1C[v0] = NULL; } -static void ov12_02220E14(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220E14(MoveEffectSystem *param0) { int v0; @@ -1616,7 +1481,7 @@ static void ov12_02220E14(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220E44(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220E44(MoveEffectSystem *param0) { int v0; @@ -1634,7 +1499,7 @@ static void ov12_02220E44(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220E70(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220E70(MoveEffectSystem *param0) { u32 v0; u32 v1; @@ -1654,7 +1519,7 @@ static void ov12_02220E70(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220EA8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220EA8(MoveEffectSystem *param0) { param0->unk_18 += 1; @@ -1665,7 +1530,7 @@ static void ov12_02220EA8(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02220ED0(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220ED0(MoveEffectSystem *param0) { int v0; u32 v1; @@ -1694,7 +1559,7 @@ static void ov12_02220ED0(UnkStruct_ov12_0221FCDC *param0) v3(param0); } -static void ov12_02220F30(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220F30(MoveEffectSystem *param0) { int v0; @@ -1707,7 +1572,7 @@ static void ov12_02220F30(UnkStruct_ov12_0221FCDC *param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220F5C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220F5C(MoveEffectSystem *param0) { int v0; int v1; @@ -1730,7 +1595,7 @@ static void ov12_02220F5C(UnkStruct_ov12_0221FCDC *param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220FA0(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220FA0(MoveEffectSystem *param0) { int v0; int v1[] = { @@ -1761,7 +1626,7 @@ static void ov12_02220FA0(UnkStruct_ov12_0221FCDC *param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220FFC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02220FFC(MoveEffectSystem *param0) { param0->unk_18 += 1; @@ -1772,7 +1637,7 @@ static void ov12_02220FFC(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02221024(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221024(MoveEffectSystem *param0) { int v0; int v1; @@ -1789,7 +1654,7 @@ static void ov12_02221024(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02221064(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221064(MoveEffectSystem *param0) { int v0; @@ -1805,13 +1670,13 @@ static void ov12_02221064(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02221098(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221098(MoveEffectSystem *param0) { param0->unk_18 += 1; param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static int ov12_022210A8(UnkStruct_ov12_0221FCDC *param0, int param1) +static int ov12_022210A8(MoveEffectSystem *param0, int param1) { int v0; @@ -1957,7 +1822,7 @@ static void ov12_022211D8(SysTask *param0, void *param1) Bg_SetOffset(v0->unk_00, BG_LAYER_MAIN_2, 3, -(v2 - 40)); } -void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1) +void ov12_02221238(MoveEffectSystem *param0, int param1) { if (param1 == 4) { if (param0->unk_174 != NULL) { @@ -1974,17 +1839,17 @@ void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1) } } -static void ov12_02221284(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221284(MoveEffectSystem *param0) { return; } -static void ov12_02221288(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221288(MoveEffectSystem *param0) { return; } -static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222128C(MoveEffectSystem *param0) { void *v0 = NULL; int v1; @@ -2023,7 +1888,7 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) Bg_ToggleLayer(BG_LAYER_MAIN_2, 0); Bg_LoadTiles(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0); PaletteData_LoadBufferFromFileStart(param0->unk_C4, v4, v5, param0->heapID, 0, 0, (8 * 16)); - Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->heapID); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->arcs[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->heapID); if (v2 == 1) { SysTask *v9; @@ -2055,7 +1920,7 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) Bg_SetPriority(BG_LAYER_MAIN_2, ov12_0222339C(param0)); } -static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221424(MoveEffectSystem *param0) { param0->unk_18 += 1; param0->unk_18 += 1; @@ -2068,7 +1933,7 @@ static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0) ov12_02221238(param0, 4); } -static void ov12_0222144C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222144C(MoveEffectSystem *param0) { int v0 = (4 + 1); SpriteResourceCapacities v1 = { @@ -2088,7 +1953,7 @@ static void ov12_0222144C(UnkStruct_ov12_0221FCDC *param0) SpriteSystem_InitManagerWithCapacities(param0->unk_BC->unk_AC, param0->unk_134, &v1); } -static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022214C4(MoveEffectSystem *param0) { int v0[6]; int v1; @@ -2104,13 +1969,13 @@ static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0) v0[4] = 0; v0[5] = 0; - SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v0[SPRITE_RESOURCE_PLTT]); - SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, PLTTBUF_MAIN_OBJ, param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[SPRITE_RESOURCE_PLTT]); - SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 77, FALSE, v0[SPRITE_RESOURCE_CELL]); - SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, FALSE, v0[SPRITE_RESOURCE_ANIM]); + SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->arcs[1], 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v0[SPRITE_RESOURCE_PLTT]); + SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, PLTTBUF_MAIN_OBJ, param0->unk_BC->unk_AC, param0->unk_134, param0->arcs[1], 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[SPRITE_RESOURCE_PLTT]); + SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->arcs[1], 77, FALSE, v0[SPRITE_RESOURCE_CELL]); + SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->arcs[1], 78, FALSE, v0[SPRITE_RESOURCE_ANIM]); } -static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221580(MoveEffectSystem *param0) { u8 *v0 = NULL; ManagedSprite *v1 = NULL; @@ -2236,7 +2101,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_022217B4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022217B4(MoveEffectSystem *param0) { param0->unk_18 += 1; @@ -2247,7 +2112,7 @@ static void ov12_022217B4(UnkStruct_ov12_0221FCDC *param0) param0->unk_134 = NULL; } -static void ov12_022217E0(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022217E0(MoveEffectSystem *param0) { int v0; @@ -2278,7 +2143,7 @@ static void ov12_02221810(SysTask *param0, void *param1) } } -static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221834(MoveEffectSystem *param0) { int v0; int v1; @@ -2384,7 +2249,7 @@ static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_022219E8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022219E8(MoveEffectSystem *param0) { int v0; @@ -2395,7 +2260,7 @@ static void ov12_022219E8(UnkStruct_ov12_0221FCDC *param0) param0->unk_48[v0].unk_0C = 0; } -static void ov12_02221A00(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221A00(MoveEffectSystem *param0) { int v0; @@ -2406,7 +2271,7 @@ static void ov12_02221A00(UnkStruct_ov12_0221FCDC *param0) ov12_02221238(param0, v0); } -static void ov12_02221A14(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221A14(MoveEffectSystem *param0) { int v0; int v1; @@ -2421,7 +2286,7 @@ static void ov12_02221A14(UnkStruct_ov12_0221FCDC *param0) param0->unk_68[v0] = v1; } -void ov12_02221A30(UnkStruct_ov12_0221FCDC *param0) +void ov12_02221A30(MoveEffectSystem *param0) { int v0; int v1; @@ -2436,12 +2301,12 @@ void ov12_02221A30(UnkStruct_ov12_0221FCDC *param0) param0->unk_78[v0] = v1; } -static void ov12_02221A4C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221A4C(MoveEffectSystem *param0) { return; } -static void ov12_02221A50(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02221A50(MoveEffectSystem *param0) { return; } @@ -2465,7 +2330,7 @@ static BOOL (*const Unk_ov12_02238644[])(UnkStruct_ov12_02221BBC *) = { ov12_022224E4 }; -static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2) +static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, MoveEffectSystem *param1, int param2) { int v0; int v1; @@ -2492,7 +2357,7 @@ static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC return 0; } -static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3) +static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, MoveEffectSystem *param1, int param2, int param3) { Graphics_LoadTilesToBgLayer(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, ov12_022234E4(param3, HEAP_ID_SYSTEM), param1->unk_C0, param2, 0, 0, 1, param1->heapID); PaletteData_LoadBufferFromFileStart(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->heapID, 0, 0x20, (9 * 16)); @@ -2555,7 +2420,7 @@ static void ov12_02221B64(UnkStruct_ov12_02221BBC *param0) } } -static UnkStruct_ov12_02221BBC *ov12_02221BBC(UnkStruct_ov12_0221FCDC *param0) +static UnkStruct_ov12_02221BBC *ov12_02221BBC(MoveEffectSystem *param0) { UnkStruct_ov12_02221BBC *v0 = NULL; @@ -2904,7 +2769,7 @@ static void ov12_022222D4(SysTask *param0, void *param1) } } -void ov12_02222338(UnkStruct_ov12_0221FCDC *param0) +void ov12_02222338(MoveEffectSystem *param0) { GF_ASSERT(param0); @@ -2915,7 +2780,7 @@ void ov12_02222338(UnkStruct_ov12_0221FCDC *param0) param0->unk_17C->unk_18 = 1; } -int ov12_02222354(UnkStruct_ov12_0221FCDC *param0) +int ov12_02222354(MoveEffectSystem *param0) { return param0->unk_198; } @@ -2959,7 +2824,7 @@ static BOOL ov12_02222360(UnkStruct_ov12_02221BBC *param0) static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC *param0) { int v0, v1; - UnkStruct_ov12_0221FCDC *v2 = param0->unk_48; + MoveEffectSystem *v2 = param0->unk_48; UnkStruct_ov12_022222D4 *v3 = Heap_AllocFromHeap(param0->unk_48->heapID, sizeof(UnkStruct_ov12_022222D4)); v3->unk_1C = Heap_AllocFromHeap(v2->heapID, sizeof(UnkStruct_ov12_022224F8)); @@ -2988,7 +2853,7 @@ static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC *param0) static BOOL ov12_022224E4(UnkStruct_ov12_02221BBC *param0) { - UnkStruct_ov12_0221FCDC *v0 = param0->unk_48; + MoveEffectSystem *v0 = param0->unk_48; UnkStruct_ov12_022222D4 *v1 = param0->unk_48->unk_17C; param0->unk_44_1 = 1; @@ -3026,7 +2891,7 @@ static void ov12_022224F8(SysTask *param0, void *param1) } } -void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1) +void ov12_02222590(MoveEffectSystem *param0, int param1) { int v0 = ov12_02223428(param0, 2); @@ -3051,7 +2916,7 @@ void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1) Graphics_LoadTilemapToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->heapID); } -void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1) +void ov12_02222664(MoveEffectSystem *param0, int param1) { int v0 = ov12_02223428(param0, 1); @@ -3092,7 +2957,7 @@ static void ov12_022226F4(SysTask *param0, void *param1) } } -static void ov12_02222724(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222724(MoveEffectSystem *param0) { UnkStruct_ov12_02221BBC *v0; int v1; @@ -3114,7 +2979,7 @@ static void ov12_02222724(UnkStruct_ov12_0221FCDC *param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_02222774(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222774(MoveEffectSystem *param0) { int v0; s16 v1; @@ -3145,7 +3010,7 @@ static void ov12_02222774(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_022227CC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022227CC(MoveEffectSystem *param0) { UnkStruct_ov12_02221BBC *v0; int v1; @@ -3167,7 +3032,7 @@ static void ov12_022227CC(UnkStruct_ov12_0221FCDC *param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_02222820(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222820(MoveEffectSystem *param0) { if (param0->unk_178 == 2) { param0->unk_18 += 1; @@ -3177,7 +3042,7 @@ static void ov12_02222820(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02222840(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222840(MoveEffectSystem *param0) { if (param0->unk_178 == 0) { param0->unk_18 += 1; @@ -3187,7 +3052,7 @@ static void ov12_02222840(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222860(MoveEffectSystem *param0) { int v0; @@ -3200,7 +3065,7 @@ static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0) Graphics_LoadTilemapToBgLayer(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, ov12_022234E4(v0, HEAP_ID_DEBUG), param0->unk_C0, 3, 0, 0, 1, param0->heapID); } -static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022228DC(MoveEffectSystem *param0) { UnkStruct_ov12_02221BBC *v0; int v1, v2, v3; @@ -3231,32 +3096,32 @@ static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_0222293C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222293C(MoveEffectSystem *param0) { return; } -static void ov12_02222940(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222940(MoveEffectSystem *param0) { return; } -static void ov12_02222944(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222944(MoveEffectSystem *param0) { return; } -static void ov12_02222948(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222948(MoveEffectSystem *param0) { return; } -static void ov12_0222294C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222294C(MoveEffectSystem *param0) { return; } -static void ov12_02222950(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222950(MoveEffectSystem *param0) { u16 v0; @@ -3267,7 +3132,7 @@ static void ov12_02222950(UnkStruct_ov12_0221FCDC *param0) Sound_PlayEffect(v0); } -static void ov12_02222968(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222968(MoveEffectSystem *param0) { u16 v0; @@ -3279,7 +3144,7 @@ static void ov12_02222968(UnkStruct_ov12_0221FCDC *param0) Sound_StopEffect(v0, 0); } -static void ov12_02222984(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222984(MoveEffectSystem *param0) { u16 v0; int v1; @@ -3298,7 +3163,7 @@ static void ov12_02222984(UnkStruct_ov12_0221FCDC *param0) Sound_PanEffect(v0, SOUND_PLAYBACK_TRACK_ALL, v1); } -static void ov12_022229BC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022229BC(MoveEffectSystem *param0) { int v0; @@ -3311,7 +3176,7 @@ static void ov12_022229BC(UnkStruct_ov12_0221FCDC *param0) Sound_PanAllEffects(v0); } -static void ov12_022229D8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022229D8(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -3346,7 +3211,7 @@ static void ov12_022229D8(UnkStruct_ov12_0221FCDC *param0) ov12_02220344(param0, v0); } -static void ov12_02222A78(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222A78(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -3377,7 +3242,7 @@ static void ov12_02222A78(UnkStruct_ov12_0221FCDC *param0) ov12_02220344(param0, v0); } -static void ov12_02222AF0(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222AF0(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -3412,7 +3277,7 @@ static void ov12_02222AF0(UnkStruct_ov12_0221FCDC *param0) ov12_02220344(param0, v0); } -static void ov12_02222B94(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222B94(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -3440,7 +3305,7 @@ static void ov12_02222B94(UnkStruct_ov12_0221FCDC *param0) ov12_02220344(param0, v0); } -static void ov12_02222BF8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222BF8(MoveEffectSystem *param0) { UnkStruct_ov12_02220314 *v0 = NULL; @@ -3465,12 +3330,12 @@ static void ov12_02222BF8(UnkStruct_ov12_0221FCDC *param0) ov12_02220344(param0, v0); } -static void ov12_02222C50(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222C50(MoveEffectSystem *param0) { (void)0; } -static void ov12_02222C54(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222C54(MoveEffectSystem *param0) { if (param0->unk_8C) { param0->unk_89 = 1; @@ -3494,7 +3359,7 @@ static void ov12_02222C54(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02222CAC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222CAC(MoveEffectSystem *param0) { u16 v0; u16 v1; @@ -3510,17 +3375,17 @@ static void ov12_02222CAC(UnkStruct_ov12_0221FCDC *param0) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1, v0, v1); } -static void ov12_02222CDC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222CDC(MoveEffectSystem *param0) { ov12_02220474(); } -static void ov12_02222CE4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222CE4(MoveEffectSystem *param0) { return; } -static void ov12_02222CE8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222CE8(MoveEffectSystem *param0) { int v0; int v1; @@ -3553,7 +3418,7 @@ static void ov12_02222CE8(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02222D84(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222D84(MoveEffectSystem *param0) { int v0; int v1; @@ -3566,10 +3431,10 @@ static void ov12_02222D84(UnkStruct_ov12_0221FCDC *param0) v1 = inline_ov12_022204C4(param0->unk_18); param0->unk_18 += 1; - SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[2], v1, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, v1 + 5000); + SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->arcs[2], v1, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, v1 + 5000); } -static void ov12_02222DCC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222DCC(MoveEffectSystem *param0) { int v0; int v1; @@ -3586,10 +3451,10 @@ static void ov12_02222DCC(UnkStruct_ov12_0221FCDC *param0) v2 = inline_ov12_022204C4(param0->unk_18); param0->unk_18 += 1; - SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[3], v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v2, v1 + 5000); + SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->arcs[3], v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v2, v1 + 5000); } -static void ov12_02222E2C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222E2C(MoveEffectSystem *param0) { int v0; int v1; @@ -3602,10 +3467,10 @@ static void ov12_02222E2C(UnkStruct_ov12_0221FCDC *param0) v1 = inline_ov12_022204C4(param0->unk_18); param0->unk_18 += 1; - SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[4], v1, 1, v1 + 5000); + SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->arcs[4], v1, 1, v1 + 5000); } -static void ov12_02222E74(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222E74(MoveEffectSystem *param0) { int v0; int v1; @@ -3618,10 +3483,10 @@ static void ov12_02222E74(UnkStruct_ov12_0221FCDC *param0) v1 = inline_ov12_022204C4(param0->unk_18); param0->unk_18 += 1; - SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[5], v1, 1, v1 + 5000); + SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->arcs[5], v1, 1, v1 + 5000); } -static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222EBC(MoveEffectSystem *param0) { int v0; int v1; @@ -3680,7 +3545,7 @@ static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0) v5(param0, param0->unk_BC->unk_AC, param0->unk_C8[v2], v4); } -static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02222FC8(MoveEffectSystem *param0) { int v0; int v1; @@ -3725,7 +3590,7 @@ static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_0222307C(UnkStruct_ov12_0221FCDC *param0) +static void ov12_0222307C(MoveEffectSystem *param0) { int v0; @@ -3741,7 +3606,7 @@ static void ov12_0222307C(UnkStruct_ov12_0221FCDC *param0) param0->unk_C8[v0] = NULL; } -static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022230A8(MoveEffectSystem *param0) { int v0; int v1; @@ -3757,12 +3622,12 @@ static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0) ManagedSprite_SetDrawFlag(param0->unk_138[v0], v1); } -static void ov12_022230CC(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022230CC(MoveEffectSystem *param0) { GF_ASSERT(FALSE); } -static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0) +static void ov12_022230D4(MoveEffectSystem *param0) { enum PokemonCryMod cryMod; s16 v1; @@ -3788,7 +3653,7 @@ static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0) Pokemon_PlayCry(param0->unk_BC->unk_10C, cryMod, v3, v4, v1, v2, param0->unk_BC->unk_118, param0->heapID); } -static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02223134(MoveEffectSystem *param0) { int v0; @@ -3803,7 +3668,7 @@ static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02223160(UnkStruct_ov12_0221FCDC *param0) +static void ov12_02223160(MoveEffectSystem *param0) { return; } @@ -3822,7 +3687,7 @@ int ov12_02223178(UnkStruct_ov12_02223178 *param0) return param0->unk_01; } -s8 ov12_0222317C(UnkStruct_ov12_0221FCDC *param0, s8 param1) +s8 ov12_0222317C(MoveEffectSystem *param0, s8 param1) { int v0 = param1; @@ -3869,7 +3734,7 @@ s8 ov12_02223234(s8 param0, s8 param1, s8 param2) return v0; } -BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC *param0, int param1[], int param2) +BOOL ov12_0222325C(MoveEffectSystem *param0, int param1[], int param2) { int v0, v1; @@ -3891,37 +3756,37 @@ BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC *param0, int param1[], int param2) return 1; } -SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC *param0) +SpriteTemplate ov12_0222329C(MoveEffectSystem *param0) { return param0->unk_100; } -int ov12_022232B8(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022232B8(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_C0[param1]; } -int ov12_022232C4(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022232C4(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_E0[param1]; } -int ov12_022232D0(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022232D0(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_D8[param1]; } -int ov12_022232E0(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022232E0(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_E8[param1]; } -int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022232EC(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_EC[param1]; } -PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1) +PokemonSprite *ov12_022232FC(MoveEffectSystem *param0, int param1) { if (param0->unk_BC->unk_C4[param1] == NULL) { return NULL; @@ -3934,39 +3799,39 @@ PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1) } } -PaletteData *ov12_0222332C(UnkStruct_ov12_0221FCDC *param0) +PaletteData *ov12_0222332C(MoveEffectSystem *param0) { return param0->unk_C4; } -int ov12_02223334(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02223334(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_08; } -int ov12_02223344(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02223344(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_04; } -int ov12_02223354(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02223354(MoveEffectSystem *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_0C; } -BOOL ov12_02223364(UnkStruct_ov12_0221FCDC *param0) +BOOL ov12_02223364(MoveEffectSystem *param0) { u32 v0 = (param0->unk_BC->battleType & BATTLE_TYPE_DOUBLES); return (v0 != 0) ? 1 : 0; } -BOOL ov12_0222337C(UnkStruct_ov12_0221FCDC *param0, int param1) +BOOL ov12_0222337C(MoveEffectSystem *param0, int param1) { int v0 = param0->unk_BC->unk_FC[param1] & (0x40 | 0x80 | 0x40000 | 0x20000000); return (v0 != 0) ? 1 : 0; } -int ov12_0222339C(UnkStruct_ov12_0221FCDC *param0) +int ov12_0222339C(MoveEffectSystem *param0) { int v0; @@ -3979,7 +3844,7 @@ int ov12_0222339C(UnkStruct_ov12_0221FCDC *param0) return v0; } -int ov12_022233B0(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022233B0(MoveEffectSystem *param0, int param1) { int v0; int v1[][3] = { @@ -3996,7 +3861,7 @@ int ov12_022233B0(UnkStruct_ov12_0221FCDC *param0, int param1) return v0; } -int ov12_022233EC(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022233EC(MoveEffectSystem *param0, int param1) { int v0; int v1[][3] = { @@ -4013,7 +3878,7 @@ int ov12_022233EC(UnkStruct_ov12_0221FCDC *param0, int param1) return v0; } -int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02223428(MoveEffectSystem *param0, int param1) { int v0; @@ -4047,17 +3912,17 @@ int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1) return v0; } -void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1) +void ov12_02223460(MoveEffectSystem *param0, int param1) { Bg_LoadTiles(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0); } -void ov12_02223488(UnkStruct_ov12_0221FCDC *param0) +void ov12_02223488(MoveEffectSystem *param0) { PaletteData_LoadBuffer(param0->unk_C4, param0->unk_BC->unk_114, 0, 0, 0x200); } -BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC *param0, int param1) +BOOL ov12_022234A8(MoveEffectSystem *param0, int param1) { int v0; int v1; diff --git a/src/overlay012/ov12_0222389C.c b/src/overlay012/ov12_0222389C.c index 6c714aa2b9..368f6cb930 100644 --- a/src/overlay012/ov12_0222389C.c +++ b/src/overlay012/ov12_0222389C.c @@ -11,7 +11,7 @@ #include "particle_system.h" #include "spl.h" -static s8 ov12_0222389C(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); +static s8 ov12_0222389C(MoveEffectSystem *param0, int param1, int param2); static const VecFx32 Unk_ov12_0223A218 = { 0x1700, @@ -25,7 +25,7 @@ static const VecFx32 Unk_ov12_0223A224 = { 0x0 }; -static s8 ov12_0222389C(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) +static s8 ov12_0222389C(MoveEffectSystem *param0, int param1, int param2) { s8 v0 = 1; int v1 = ov12_02235254(param0, param1); @@ -60,7 +60,7 @@ void ov12_022238DC(SPLEmitter *param0) void ov12_022238E0(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; ParticleSystem *v1; int v2, v3, v4; VecFx32 v5, v6, v7; @@ -119,7 +119,7 @@ void ov12_022238E0(SPLEmitter *param0) void ov12_02223998(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; ParticleSystem *v1; int v2; VecFx32 v3, v4; @@ -140,7 +140,7 @@ void ov12_02223998(SPLEmitter *param0) void ov12_022239F4(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; int v1; VecFx32 v2; @@ -156,7 +156,7 @@ void ov12_022239F4(SPLEmitter *param0) void ov12_02223A38(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; int v1; VecFx32 v2; @@ -172,7 +172,7 @@ void ov12_02223A38(SPLEmitter *param0) void ov12_02223A7C(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; int v1; int v2; VecFx32 v3; @@ -190,7 +190,7 @@ void ov12_02223A7C(SPLEmitter *param0) void ov12_02223AC8(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; VecFx32 v1; ParticleSystem *v2; int v3; @@ -219,7 +219,7 @@ void ov12_02223AC8(SPLEmitter *param0) void ov12_02223B30(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; VecFx32 v1; ParticleSystem *v2; int v3; @@ -249,7 +249,7 @@ void ov12_02223B30(SPLEmitter *param0) void ov12_02223B98(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; int v1; int v2; int v3; @@ -328,7 +328,7 @@ static void ov12_02223C40(int param0, s8 param1, VecFx32 *param2) } } -static void ov12_02223CD4(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) +static void ov12_02223CD4(MoveEffectSystem *param0, SPLEmitter *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) { VecFx32 v0 = { 0, 0, 0 }; @@ -368,7 +368,7 @@ static void ov12_02223CD4(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, i ParticleSystem_SetEmitterConvergenceTarget(param1, &v0); } -static void ov12_02223DA4(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) +static void ov12_02223DA4(MoveEffectSystem *param0, SPLEmitter *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) { VecFx32 v0 = { 0, 0, 0 }; @@ -408,7 +408,7 @@ static void ov12_02223DA4(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, i ParticleSystem_SetEmitterMagnetTarget(param1, &v0); } -static void ov12_02223E74(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, int param2, int param3, int param4, int param5) +static void ov12_02223E74(MoveEffectSystem *param0, SPLEmitter *param1, int param2, int param3, int param4, int param5) { ParticleSystem *v0; VecFx32 v1; @@ -534,7 +534,7 @@ static void ov12_02223E74(UnkStruct_ov12_0221FCDC *param0, SPLEmitter *param1, i static void ov12_02224138(SPLEmitter *param0, int param1, int param2) { int v0, v1; - UnkStruct_ov12_0221FCDC *v2 = ParticleSystem_GetEmitterCallbackParam(); + MoveEffectSystem *v2 = ParticleSystem_GetEmitterCallbackParam(); v0 = ov12_02220240(v2); v1 = ov12_02220248(v2); @@ -599,7 +599,7 @@ void ov12_022241E0(SPLEmitter *param0) void ov12_022241EC(SPLEmitter *param0) { int v0, v1; - UnkStruct_ov12_0221FCDC *v2 = ParticleSystem_GetEmitterCallbackParam(); + MoveEffectSystem *v2 = ParticleSystem_GetEmitterCallbackParam(); v0 = ov12_02220240(v2); v1 = ov12_02220248(v2); diff --git a/src/overlay012/ov12_0222421C.c b/src/overlay012/ov12_0222421C.c index 386ce13575..6c0894167b 100644 --- a/src/overlay012/ov12_0222421C.c +++ b/src/overlay012/ov12_0222421C.c @@ -53,7 +53,7 @@ static void ov12_0222421C(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1) static void ov12_02224260(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1, VecFx32 *param2) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; ParticleSystem *v1; int v2; int v3; @@ -78,7 +78,7 @@ static void ov12_02224260(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1, V static void ov12_022242A0(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1, VecFx32 *param2) { - UnkStruct_ov12_0221FCDC *v0; + MoveEffectSystem *v0; ParticleSystem *v1; int v2; int v3; @@ -670,7 +670,7 @@ static void ov12_02224EB8(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1) void ov12_02224F14(SPLEmitter *param0) { - UnkStruct_ov12_0221FCDC *v0 = ParticleSystem_GetEmitterCallbackParam(); + MoveEffectSystem *v0 = ParticleSystem_GetEmitterCallbackParam(); UnkStruct_ov12_02225640 *v1 = Heap_AllocFromHeap(ov12_0221FDE4(v0), sizeof(UnkStruct_ov12_02225640)); v1->unk_00 = v0; diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c index c50d379284..7176eab25d 100644 --- a/src/overlay012/ov12_02225864.c +++ b/src/overlay012/ov12_02225864.c @@ -102,7 +102,7 @@ void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3) } } -void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3) +void ov12_02225898(MoveEffectSystem *param0, int param1, s16 *param2, s16 *param3) { if (ov12_0221FDD4(param0) == 1) { ov12_02225864(0, param1 + 2, param2, param3); @@ -115,7 +115,7 @@ void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 } } -s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) +s16 ov12_022258E0(MoveEffectSystem *param0, int param1, int param2) { int v0, v1; @@ -149,7 +149,7 @@ u8 ov12_02225950(ManagedSprite *param0) return PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(param0->sprite), NNS_G2D_VRAM_TYPE_2DMAIN); } -int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02225964(MoveEffectSystem *param0, int param1) { int v0; int v1 = 1; @@ -169,7 +169,7 @@ int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1) return v1; } -int ov12_0222598C(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_0222598C(MoveEffectSystem *param0, int param1) { int v0; int v1 = 1; @@ -1190,7 +1190,7 @@ static void ov12_022268DC(u16 *param0, u16 param1) } } -void ov12_02226924(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226924(MoveEffectSystem *param0) { PaletteData *v0 = ov12_0222332C(param0); u16 *v1 = PaletteData_GetFadedBuffer(v0, 0); @@ -1202,7 +1202,7 @@ void ov12_02226924(UnkStruct_ov12_0221FCDC *param0) } } -void ov12_02226954(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226954(MoveEffectSystem *param0) { PaletteData *v0 = ov12_0222332C(param0); diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c index 234d093b2f..6cdd6f9150 100644 --- a/src/overlay012/ov12_022269C0.c +++ b/src/overlay012/ov12_022269C0.c @@ -14,22 +14,22 @@ typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; } UnkStruct_ov12_022269C4; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; } UnkStruct_ov12_02226A14; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; } UnkStruct_ov12_02226A64; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; SpriteSystem *unk_08; SpriteManager *unk_0C; ManagedSprite *unk_10; @@ -37,7 +37,7 @@ typedef struct { Sprite *unk_1A4[10]; } UnkStruct_ov12_02226AAC; -void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0) +void ov12_022269C0(MoveEffectSystem *param0) { return; } @@ -57,7 +57,7 @@ static void ov12_022269C4(SysTask *param0, void *param1) } } -void ov12_022269EC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022269EC(MoveEffectSystem *param0) { UnkStruct_ov12_022269C4 *v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov12_022269C4)); @@ -82,7 +82,7 @@ static void ov12_02226A14(SysTask *param0, void *param1) } } -void ov12_02226A3C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226A3C(MoveEffectSystem *param0) { UnkStruct_ov12_02226A14 *v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov12_02226A14)); @@ -107,7 +107,7 @@ static void ov12_02226A64(SysTask *param0, void *param1) } } -void ov12_02226A88(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226A88(MoveEffectSystem *param0) { UnkStruct_ov12_02226A64 *v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov12_02226A64)); @@ -134,7 +134,7 @@ static void ov12_02226AAC(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_0C); break; case 1: { - UnkStruct_ov12_0221FCDC *v1 = v0->unk_04; + MoveEffectSystem *v1 = v0->unk_04; Sprite_DeleteAndFreeResources(v0->unk_10); Heap_Free(v0); @@ -143,7 +143,7 @@ static void ov12_02226AAC(SysTask *param0, void *param1) } } -void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02226B1C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02226AAC *v0; SpriteTemplate v1; diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index 9c7bb1bd7d..c0190aba70 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -59,7 +59,7 @@ typedef struct { typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; PokemonSprite *unk_08; UnkStruct_ov12_02225D50 unk_0C; s32 unk_20; @@ -69,7 +69,7 @@ typedef struct { } UnkStruct_ov12_02227390; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; UnkStruct_ov12_02225F6C unk_04; PokemonSprite *unk_28; s16 unk_2C; @@ -77,7 +77,7 @@ typedef struct { } UnkStruct_ov12_022274E4; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -93,12 +93,12 @@ typedef struct { } UnkStruct_ov12_02227620; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; PaletteData *unk_04; } UnkStruct_ov12_02227808; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; PokemonSprite *unk_04; int unk_08; int unk_0C; @@ -109,7 +109,7 @@ typedef struct { } UnkStruct_ov12_022278D0; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; int unk_08; s16 unk_0C; @@ -126,7 +126,7 @@ typedef struct { } UnkStruct_ov12_02227B4C; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; s16 unk_08; s16 unk_0A; @@ -143,7 +143,7 @@ typedef struct { } UnkStruct_ov12_02227DE0; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; UnkStruct_ov12_02226454 unk_08; } UnkStruct_ov12_0222813C; @@ -154,7 +154,7 @@ typedef struct { int unk_08; UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; - UnkStruct_ov12_0221FCDC *unk_3C; + MoveEffectSystem *unk_3C; } UnkStruct_ov12_02228268; typedef struct { @@ -183,7 +183,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_10; UnkStruct_ov12_0223595C unk_24; UnkStruct_ov12_02225F6C unk_40; - UnkStruct_ov12_0221FCDC *unk_64; + MoveEffectSystem *unk_64; } UnkStruct_ov12_0222830C; typedef struct { @@ -193,7 +193,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; UnkStruct_ov12_02225F6C unk_3C; - UnkStruct_ov12_0221FCDC *unk_60; + MoveEffectSystem *unk_60; s16 unk_64; } UnkStruct_ov12_02228488; @@ -205,7 +205,7 @@ typedef struct { u8 unk_08; u8 unk_09; u8 unk_0A; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; PokemonSprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; @@ -222,7 +222,7 @@ typedef struct { int unk_0C; int unk_10; int unk_14; - UnkStruct_ov12_0221FCDC *unk_18; + MoveEffectSystem *unk_18; PokemonSprite *unk_1C; UnkStruct_ov12_02225F6C unk_20; UnkStruct_ov12_02225F6C unk_44; @@ -242,7 +242,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; UnkStruct_ov12_02225F6C unk_3C; - UnkStruct_ov12_0221FCDC *unk_60; + MoveEffectSystem *unk_60; s16 unk_64; s16 unk_66; } UnkStruct_ov12_02228BD0; @@ -311,7 +311,7 @@ typedef struct { int unk_20; int unk_24; BgConfig *unk_28; - UnkStruct_ov12_0221FCDC *unk_2C; + MoveEffectSystem *unk_2C; SpriteManager *unk_30; UnkStruct_ov12_02235998 unk_34[4]; UnkStruct_ov12_02235998 unk_84[4]; @@ -425,7 +425,7 @@ typedef struct { UnkStruct_ov12_0222660C *unk_24; } UnkStruct_ov12_0222ABBC; -static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1); +static int ov12_02229454(MoveEffectSystem *param0, int param1); static void ov12_02226B84(PokemonSprite *param0) { @@ -481,7 +481,7 @@ static void ov12_02226BA0(SysTask *param0, void *param1) } } -void ov12_02226CB0(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226CB0(MoveEffectSystem *param0) { UnkStruct_ov12_02226BA0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226BA0)); int v1; @@ -599,7 +599,7 @@ static void ov12_02226D38(SysTask *param0, void *param1) Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } -void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) +void ov12_02226EB0(MoveEffectSystem *param0) { UnkStruct_ov12_02226D38 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226D38)); int v1; @@ -757,7 +757,7 @@ static void ov12_02227064(SysTask *param0, void *param1) Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } -void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) +void ov12_022271D8(MoveEffectSystem *param0) { UnkStruct_ov12_02227064 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227064)); int v1; @@ -845,7 +845,7 @@ static void ov12_02227390(SysTask *param0, void *param1) } } -void ov12_02227408(UnkStruct_ov12_0221FCDC *param0) +void ov12_02227408(MoveEffectSystem *param0) { UnkStruct_ov12_02227390 *v0; int v1; @@ -907,7 +907,7 @@ static void ov12_022274E4(SysTask *param0, void *param1) } } -void ov12_02227534(UnkStruct_ov12_0221FCDC *param0) +void ov12_02227534(MoveEffectSystem *param0) { UnkStruct_ov12_022274E4 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_022274E4)); v0->unk_00 = param0; @@ -1019,7 +1019,7 @@ static void ov12_02227738(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222777C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02227620 *v0; PokemonSprite *v1; @@ -1057,7 +1057,7 @@ static void ov12_02227808(SysTask *param0, void *param1) } } -void ov12_02227828(UnkStruct_ov12_0221FCDC *param0) +void ov12_02227828(MoveEffectSystem *param0) { UnkStruct_ov12_02227808 *v0; u16 v1; @@ -1129,7 +1129,7 @@ static void ov12_022278D0(SysTask *param0, void *param1) } } -void ov12_0222797C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222797C(MoveEffectSystem *param0) { UnkStruct_ov12_022278D0 *v0; int v1; @@ -1327,7 +1327,7 @@ static void ov12_02227B4C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04); } -void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0) +void ov12_02227CBC(MoveEffectSystem *param0) { UnkStruct_ov12_02227B4C *v0; PokemonSprite *v1; @@ -1427,7 +1427,7 @@ static void ov12_02227DE0(SysTask *param0, void *param1) } } -void ov12_02227F30(UnkStruct_ov12_0221FCDC *param0) +void ov12_02227F30(MoveEffectSystem *param0) { UnkStruct_ov12_02227DE0 *v0; UnkStruct_ov12_02235998 v1[4]; @@ -1571,7 +1571,7 @@ static void ov12_0222813C(SysTask *param0, void *param1) } } -void ov12_02228168(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228168(MoveEffectSystem *param0) { UnkStruct_ov12_0222813C *v0; int v1; @@ -1602,7 +1602,7 @@ void ov12_02228168(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v0->unk_00, ov12_0222813C, v0); } -void ov12_02228214(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228214(MoveEffectSystem *param0) { UnkStruct_ov12_02235998 v0; int v1; @@ -1642,7 +1642,7 @@ static void ov12_02228268(SysTask *param0, void *param1) } } -void ov12_022282BC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022282BC(MoveEffectSystem *param0) { UnkStruct_ov12_02228268 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228268)); @@ -1678,7 +1678,7 @@ static void ov12_0222830C(SysTask *param0, void *param1) } } -void ov12_02228394(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228394(MoveEffectSystem *param0) { int v0; int v1; @@ -1761,7 +1761,7 @@ static void ov12_02228488(SysTask *param0, void *param1) } } -void ov12_02228520(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228520(MoveEffectSystem *param0) { int v0; int v1; @@ -1888,7 +1888,7 @@ static void ov12_0222862C(SysTask *param0, void *param1) } } -void ov12_022287CC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022287CC(MoveEffectSystem *param0) { UnkStruct_ov12_0222862C *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222862C)); @@ -1981,7 +1981,7 @@ static void ov12_02228868(SysTask *param0, void *param1) } } -void ov12_02228A0C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228A0C(MoveEffectSystem *param0) { UnkStruct_ov12_02228868 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_02228868)); @@ -2034,7 +2034,7 @@ static void ov12_02228B10(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04.unk_0C); } -void ov12_02228B40(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228B40(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_02228B10 *v1 = NULL; @@ -2081,7 +2081,7 @@ static void ov12_02228BD0(SysTask *param0, void *param1) } } -void ov12_02228C6C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228C6C(MoveEffectSystem *param0) { int v0; int v1; @@ -2169,7 +2169,7 @@ static void ov12_02228DB8(SysTask *param0, void *param1) } } -void ov12_02228E00(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228E00(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_02228DB8 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228DB8)); @@ -2209,7 +2209,7 @@ static void ov12_02228E78(SysTask *param0, void *param1) } } -void ov12_02228EC0(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228EC0(MoveEffectSystem *param0) { UnkStruct_ov12_02235350 v0; int v1; @@ -2257,7 +2257,7 @@ void ov12_02228EC0(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v5->unk_00.unk_04, ov12_02228E78, v5); } -void ov12_02228FB4(UnkStruct_ov12_0221FCDC *param0) +void ov12_02228FB4(MoveEffectSystem *param0) { UnkStruct_ov12_02235350 v0; int v1; @@ -2315,7 +2315,7 @@ void ov12_02228FB4(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v6->unk_00.unk_04, ov12_02228E78, v6); } -void ov12_022290DC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022290DC(MoveEffectSystem *param0) { int v0; int v1; @@ -2365,7 +2365,7 @@ static void ov12_02229184(SysTask *param0, void *param1) } } -void ov12_022291AC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022291AC(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_02229184 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229184)); @@ -2434,7 +2434,7 @@ static void ov12_02229278(SysTask *param0, void *param1) } } -void ov12_02229304(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229304(MoveEffectSystem *param0) { UnkStruct_ov12_02229278 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229278)); @@ -2493,7 +2493,7 @@ void ov12_02229304(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v0->unk_00.unk_04, ov12_02229278, v0); } -static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1) +static int ov12_02229454(MoveEffectSystem *param0, int param1) { int v0 = 0; @@ -2614,7 +2614,7 @@ static void ov12_022295C4(SysTask *param0, void *param1) } } -void ov12_02229638(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229638(MoveEffectSystem *param0) { UnkStruct_ov12_022294AC *v0; int v1; @@ -2708,7 +2708,7 @@ static void ov12_02229738(SysTask *param0, void *param1) } } -void ov12_02229810(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229810(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_02229738 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229738)); @@ -2766,7 +2766,7 @@ static void ov12_0222988C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_0C); } -void ov12_02229908(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229908(MoveEffectSystem *param0) { UnkStruct_ov12_0222988C *v0; int v1; @@ -2798,7 +2798,7 @@ void ov12_02229908(UnkStruct_ov12_0221FCDC *param0) } } -static void ov12_02229980(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02229980 *param1) +static void ov12_02229980(MoveEffectSystem *param0, UnkStruct_ov12_02229980 *param1) { param1->unk_00 = ov12_02220280(param0, 0); param1->unk_0C.unk_00 = ov12_02220280(param0, 1); @@ -2899,7 +2899,7 @@ static void ov12_02229A6C(SysTask *param0, void *param1) } } -void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229B28(MoveEffectSystem *param0) { int v0; VecFx32 v1; @@ -2939,7 +2939,7 @@ void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v3->unk_3C.unk_04, ov12_02229A6C, v3); } -void ov12_02229C5C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229C5C(MoveEffectSystem *param0) { VecFx32 v0; VecFx32 v1; @@ -3035,7 +3035,7 @@ static void ov12_02229DF0(SysTask *param0, void *param1) } } -void ov12_02229E54(UnkStruct_ov12_0221FCDC *param0) +void ov12_02229E54(MoveEffectSystem *param0) { int v0; VecFx32 v1; @@ -3095,7 +3095,7 @@ static void ov12_02229F9C(SysTask *param0, void *param1) } } -void ov12_0222A00C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222A00C(MoveEffectSystem *param0) { UnkStruct_ov12_02229F9C *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229F9C)); @@ -3158,7 +3158,7 @@ static void ov12_0222A178(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_00.unk_10); } -void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222A1AC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222A178 *v0 = NULL; @@ -3301,7 +3301,7 @@ static void ov12_0222A1F4(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222A34C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222A1F478 *v0 = NULL; @@ -3348,7 +3348,7 @@ static void ov12_0222A3DC(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222A410(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222A3DC *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A1F478)); ov12_0223595C(param0, &v0->unk_00); @@ -3434,7 +3434,7 @@ static void ov12_0222A4A0(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222A5C0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222A4A0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A4A0)); ov12_0223595C(param0, &v0->unk_00); @@ -3446,7 +3446,7 @@ void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite ov12_022201E8(v0->unk_00.unk_04, ov12_0222A4A0, v0); } -void ov12_0222A604(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222A604(MoveEffectSystem *param0) { int v0 = ov12_02220280(param0, 0); @@ -3588,7 +3588,7 @@ static void ov12_0222A878(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_0C); } -void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222A8F4(MoveEffectSystem *param0) { UnkStruct_ov12_0222A624 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A624)); ov12_0223595C(param0, &v0->unk_00); @@ -3729,7 +3729,7 @@ static void ov12_0222AB10(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_00.unk_0C); } -void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222AB50(MoveEffectSystem *param0) { UnkStruct_ov12_0222AB10 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222AB10)); ov12_0223595C(param0, &v0->unk_00); @@ -3790,7 +3790,7 @@ static void ov12_0222ABBC(SysTask *param0, void *param1) } } -void ov12_0222AC40(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222AC40(MoveEffectSystem *param0) { UnkStruct_ov12_0222ABBC *v0 = NULL; diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index 924cf0be4e..daa94c5e62 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -31,7 +31,7 @@ typedef struct { u8 unk_04; u8 unk_05; u8 unk_06; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; SpriteSystem *unk_0C; SpriteManager *unk_10; ManagedSprite *unk_14[3]; @@ -44,7 +44,7 @@ typedef struct { s16 unk_02; int unk_04; u8 unk_08; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; PokemonSprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; @@ -55,7 +55,7 @@ typedef struct { u8 unk_01; s16 unk_02; int unk_04; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; PokemonSprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225F6C unk_34; @@ -70,7 +70,7 @@ typedef struct { u16 unk_06; s16 unk_08; s16 unk_0A; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; PokemonSprite *unk_10; SpriteManager *unk_14; ManagedSprite *unk_18[4]; @@ -81,7 +81,7 @@ typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; PokemonSprite *unk_08; UnkStruct_ov12_02225F6C unk_0C; } UnkStruct_ov12_0222B914; @@ -91,7 +91,7 @@ typedef struct { u8 unk_01; s16 unk_02; s16 unk_04; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; PokemonSprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; } UnkStruct_ov12_0222BA18; @@ -102,7 +102,7 @@ typedef struct { s16 unk_02; s16 unk_04; s16 unk_06; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; PokemonSprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; } UnkStruct_ov12_0222BB30; @@ -111,7 +111,7 @@ typedef struct { u8 unk_00; u8 unk_01; PaletteData *unk_04; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; UnkStruct_ov12_022267D4 *unk_0C; PokemonSprite *unk_10; } UnkStruct_ov12_0222BD48; @@ -122,7 +122,7 @@ typedef struct { u8 unk_02; s16 unk_04; s16 unk_06; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; PokemonSprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225F6C unk_34; @@ -131,7 +131,7 @@ typedef struct { typedef struct { u8 unk_00; u8 unk_01; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; SpriteManager *unk_08; ManagedSprite *unk_0C; ManagedSprite *unk_10; @@ -151,7 +151,7 @@ typedef struct { int unk_04; s8 unk_08; PokemonSprite *unk_0C; - UnkStruct_ov12_0221FCDC *unk_10; + MoveEffectSystem *unk_10; SpriteManager *unk_14; UnkStruct_ov12_0222C1A4_sub1 unk_18[3]; } UnkStruct_ov12_0222C1A4; @@ -163,7 +163,7 @@ typedef struct { u8 unk_03; int unk_04; BgConfig *unk_08; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; SpriteManager *unk_10; UnkStruct_ov12_02235998 unk_14[4]; UnkStruct_ov12_02235998 unk_64[4]; @@ -177,7 +177,7 @@ typedef struct { u8 unk_03; UnkStruct_ov12_02235350 unk_04; BgConfig *unk_08; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; SpriteManager *unk_10; PokemonSprite *unk_14; ManagedSprite *unk_18; @@ -261,7 +261,7 @@ typedef struct { int unk_04; int unk_08; u8 unk_0C; - UnkStruct_ov12_0221FCDC *unk_10; + MoveEffectSystem *unk_10; SpriteSystem *unk_14; SpriteManager *unk_18; PokemonSprite *unk_1C; @@ -372,7 +372,7 @@ static void ov12_0222AC70(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_10); } -void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222AE68(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; UnkStruct_ov12_0222AC70 *v1; @@ -504,7 +504,7 @@ static void ov12_0222AFA0(SysTask *param0, void *param1) } } -void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222B194(MoveEffectSystem *param0) { UnkStruct_ov12_0222AFA0 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222AFA0)); @@ -599,7 +599,7 @@ static void ov12_0222B220(SysTask *param0, void *param1) } } -void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222B45C(MoveEffectSystem *param0) { UnkStruct_ov12_0222B220 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222B220)); @@ -683,7 +683,7 @@ static void ov12_0222B4C8(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v2->unk_14); } -void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222B68C(MoveEffectSystem *param0) { UnkStruct_ov12_0222B4C8 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222B4C8)); @@ -795,7 +795,7 @@ static void ov12_0222B914(SysTask *param0, void *param1) } } -void ov12_0222B9E0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222B9E0(MoveEffectSystem *param0) { UnkStruct_ov12_0222B914 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222B914)); @@ -848,7 +848,7 @@ static void ov12_0222BA18(SysTask *param0, void *param1) } } -void ov12_0222BAE4(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222BAE4(MoveEffectSystem *param0) { UnkStruct_ov12_0222BA18 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BA18)); @@ -922,7 +922,7 @@ static void ov12_0222BB30(SysTask *param0, void *param1) } } -void ov12_0222BCF4(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222BCF4(MoveEffectSystem *param0) { UnkStruct_ov12_0222BB30 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BB30)); @@ -974,7 +974,7 @@ static void ov12_0222BD48(SysTask *param0, void *param1) } } -void ov12_0222BE48(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222BE48(MoveEffectSystem *param0) { UnkStruct_ov12_0222BD48 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BD48)); @@ -1043,7 +1043,7 @@ static void ov12_0222BE80(SysTask *param0, void *param1) } } -void ov12_0222BFA8(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222BFA8(MoveEffectSystem *param0) { UnkStruct_ov12_0222BE80 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BE80)); @@ -1096,7 +1096,7 @@ static void ov12_0222BFF4(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_0222C0C0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222C0C0(MoveEffectSystem *param0) { UnkStruct_ov12_0222BFF4 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BFF4)); @@ -1231,7 +1231,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v2->unk_14); } -void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222C3C0(MoveEffectSystem *param0) { UnkStruct_ov12_0222C1A4 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C1A4)); @@ -1352,7 +1352,7 @@ static void ov12_0222C4A8(SysTask *param0, void *param1) } } -void ov12_0222C5FC(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222C5FC(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_0222C4A8 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C4A8)); @@ -1410,7 +1410,7 @@ static void ov12_0222C678(SysTask *param0, void *param1) } } -void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222C6D4(MoveEffectSystem *param0) { UnkStruct_ov12_0222C678 *v0; int v1; @@ -1526,7 +1526,7 @@ static void ov12_0222C884(SysTask *param0, void *param1) } } -void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222C8F8(MoveEffectSystem *param0) { UnkStruct_ov12_0222C7E0 *v0; int v1 = 0; @@ -1587,7 +1587,7 @@ static void ov12_0222C994(SysTask *param0, void *param1) } } -void ov12_0222CA2C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222CA2C(MoveEffectSystem *param0) { UnkStruct_ov12_0222C994 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C994)); int v1; @@ -1665,7 +1665,7 @@ static void ov12_0222CACC(SysTask *param0, void *param1) } } -void ov12_0222CB90(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222CB90(MoveEffectSystem *param0) { UnkStruct_ov12_0222CACC *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CACC)); int v1; @@ -1703,7 +1703,7 @@ static void ov12_0222CBFC(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_10.unk_10); } -void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222CC54(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; int v1; @@ -1822,7 +1822,7 @@ static void ov12_0222CDF0(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_18.unk_10); } -void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222CFA0(MoveEffectSystem *param0) { UnkStruct_ov12_0222CDF0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CDF0)); @@ -2093,7 +2093,7 @@ static void ov12_0222D128(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_18); } -void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222D56C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; UnkStruct_ov12_0222D128 *v1; diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c index 7e4e50d46b..3cc6c80da1 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/overlay012/ov12_0222D6B0.c @@ -28,7 +28,7 @@ typedef struct { u8 unk_05; u8 unk_06; u8 unk_07; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; SpriteSystem *unk_0C; SpriteManager *unk_10; ManagedSprite *unk_14[3]; @@ -42,7 +42,7 @@ typedef struct { u8 unk_08; u8 unk_09; u8 unk_0A; - UnkStruct_ov12_0221FCDC *unk_0C; + MoveEffectSystem *unk_0C; SpriteSystem *unk_10; SpriteManager *unk_14; ManagedSprite *unk_18[6]; @@ -54,7 +54,7 @@ typedef struct { } UnkStruct_ov12_0222D934; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; u8 unk_0C; @@ -73,7 +73,7 @@ typedef struct { u8 unk_02; u8 unk_03; u8 unk_04; - UnkStruct_ov12_0221FCDC *unk_08; + MoveEffectSystem *unk_08; SpriteSystem *unk_0C; SpriteManager *unk_10; UnkStruct_ov12_0222DC98 unk_14[20]; @@ -183,7 +183,7 @@ static void ov12_0222D6B0(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v1->unk_10); } -void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222D7C0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; UnkStruct_ov12_0222D6B0 *v1; @@ -402,7 +402,7 @@ static void ov12_0222D934(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v2->unk_14); } -void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222DB60(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; UnkStruct_ov12_0222D934 *v1; @@ -618,7 +618,7 @@ static const s16 Unk_ov12_0223A19A[][4] = { { 0x50, 0x92, 0x32, 0x35 } }; -void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222DEFC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { int v0; int v1; @@ -741,7 +741,7 @@ static void ov12_0222E080(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04.unk_0C); } -void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222E1A8(MoveEffectSystem *param0) { UnkStruct_ov12_0222E080 *v0 = NULL; @@ -813,7 +813,7 @@ static void ov12_0222E25C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222E2F8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222E25C *v0 = NULL; @@ -952,7 +952,7 @@ static void ov12_0222E390(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222E61C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222E390 *v0 = NULL; diff --git a/src/overlay012/ov12_0222E784.c b/src/overlay012/ov12_0222E784.c index 0aefb7a06f..ec3b27b800 100644 --- a/src/overlay012/ov12_0222E784.c +++ b/src/overlay012/ov12_0222E784.c @@ -61,7 +61,7 @@ static void ov12_0222E784(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_0C); } -void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222E810(MoveEffectSystem *param0) { UnkStruct_ov12_0222E784 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E784)); diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index 24dbf54954..971ad9e06f 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -140,7 +140,7 @@ static void ov12_0222E91C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_0C); } -void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222EAA0(MoveEffectSystem *param0) { UnkStruct_ov12_0222E91C *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E91C)); @@ -221,7 +221,7 @@ static void ov12_0222EC18(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_10); } -void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222EC90(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222EC18 *v0 = NULL; @@ -379,7 +379,7 @@ static void ov12_0222EE50(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_00.unk_0C); } -void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222EFB0(MoveEffectSystem *param0) { UnkStruct_ov12_0222EE50 *v0; int v1; @@ -523,7 +523,7 @@ static void ov12_0222F208(SysTask *param0, void *param1) } } -void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222F2F8(MoveEffectSystem *param0) { int v0; UnkStruct_ov12_0222F208 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222F208)); @@ -646,7 +646,7 @@ static void ov12_0222F464(SysTask *param0, void *param1) } } -void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222F5EC(MoveEffectSystem *param0) { UnkStruct_ov12_0222F464 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222F464)); ov12_0223595C(param0, &v0->unk_20); diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index 7d8603d509..134263bf52 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -25,7 +25,7 @@ #include "sys_task_manager.h" typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; PokemonSprite *unk_08; UnkStruct_ov12_02225F6C unk_0C; @@ -37,7 +37,7 @@ typedef struct { } UnkStruct_ov12_0222F700; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; s16 unk_08; PokemonSprite *unk_0C; @@ -59,7 +59,7 @@ typedef struct { } UnkStruct_ov12_0222FAFC; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; UnkStruct_ov12_0222FAFC unk_0C; @@ -71,7 +71,7 @@ typedef struct { } UnkStruct_ov12_0222FC44; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; int unk_08; int unk_0C; @@ -86,7 +86,7 @@ typedef struct { } UnkStruct_ov12_0222FF80; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; PokemonSprite *unk_0C; @@ -100,7 +100,7 @@ typedef struct { } UnkStruct_ov12_02230194; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; int unk_08; int unk_0C; @@ -111,7 +111,7 @@ typedef struct { } UnkStruct_ov12_02230540; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; PokemonSprite *unk_08; ManagedSprite *unk_0C; @@ -123,7 +123,7 @@ typedef struct { } UnkStruct_ov12_02230600; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; int unk_0C; @@ -136,7 +136,7 @@ typedef struct { } UnkStruct_ov12_02230910; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -158,7 +158,7 @@ typedef struct { } UnkStruct_ov12_02230E24; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -173,7 +173,7 @@ typedef struct { } UnkStruct_ov12_02230F3C; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -191,7 +191,7 @@ typedef struct { } UnkStruct_ov12_022310D4; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; int unk_08; int unk_0C; @@ -205,7 +205,7 @@ typedef struct { } UnkStruct_ov12_02231390; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -222,7 +222,7 @@ typedef struct { } UnkStruct_ov12_02231508; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -237,7 +237,7 @@ typedef struct { } UnkStruct_ov12_02231760; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -254,7 +254,7 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; PokemonSprite *unk_08; s16 unk_0C; s16 unk_0E; @@ -267,7 +267,7 @@ typedef struct { } UnkStruct_ov12_02231CD4; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; PokemonSprite *unk_0C; @@ -279,7 +279,7 @@ typedef struct { } UnkStruct_ov12_02231F18; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -298,7 +298,7 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; PokemonSprite *unk_08; s16 unk_0C; s16 unk_0E; @@ -308,7 +308,7 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC *unk_04; + MoveEffectSystem *unk_04; int unk_08; PokemonSprite *unk_0C; s16 unk_10; @@ -321,7 +321,7 @@ typedef struct { } UnkStruct_ov12_022324E0; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -338,7 +338,7 @@ typedef struct { } UnkStruct_ov12_02232720; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -353,7 +353,7 @@ typedef struct { } UnkStruct_ov12_02232B40; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; int unk_08; int unk_0C; @@ -375,7 +375,7 @@ typedef struct { } UnkStruct_ov12_02232D38; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -389,7 +389,7 @@ typedef struct { } UnkStruct_ov12_022332E8; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -403,7 +403,7 @@ typedef struct { } UnkStruct_ov12_0223351C; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -416,7 +416,7 @@ typedef struct { } UnkStruct_ov12_02233900; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; UnkStruct_ov12_02226504 *unk_04; int unk_08; PokemonSprite *unk_0C; @@ -432,14 +432,14 @@ typedef struct { } UnkStruct_ov12_02233AA0; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; UnkStruct_ov12_02225F6C unk_0C; } UnkStruct_ov12_02233DCC; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -448,7 +448,7 @@ typedef struct { } UnkStruct_ov12_02233F4C; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; s16 unk_08; s16 unk_0A; @@ -466,14 +466,14 @@ typedef struct { } UnkStruct_ov12_02234044; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteManager *unk_04; UnkStruct_ov12_02225F6C unk_08; ManagedSprite *unk_2C; } UnkStruct_ov12_02234290; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; int unk_0C; @@ -486,7 +486,7 @@ typedef struct { } UnkStruct_ov12_022343A0; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; int unk_0C; @@ -521,7 +521,7 @@ static void ov12_0222F700(SysTask *param0, void *param1) Heap_Free(v0); } -void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222F770(MoveEffectSystem *param0) { UnkStruct_ov12_0222F700 *v0; int v1; @@ -619,7 +619,7 @@ static void ov12_0222F888(SysTask *param0, void *param1) } } -void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0) +void ov12_0222F9E4(MoveEffectSystem *param0) { UnkStruct_ov12_0222F888 *v0; int v1; @@ -806,7 +806,7 @@ static void ov12_0222FC44(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_0222FE30(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0222FC44 *v0; SpriteTemplate v1; @@ -915,7 +915,7 @@ static void ov12_02230018(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04); } -void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0) +void ov12_022300C4(MoveEffectSystem *param0) { UnkStruct_ov12_0222FF80 *v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222FF80)); @@ -1035,7 +1035,7 @@ static void ov12_0223025C(SysTask *param0, void *param1) } } -void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0) +void ov12_022303D0(MoveEffectSystem *param0) { UnkStruct_ov12_02230194 *v0; int v1; @@ -1189,7 +1189,7 @@ static void ov12_02230600(SysTask *param0, void *param1) } } -void ov12_02230754(UnkStruct_ov12_0221FCDC *param0) +void ov12_02230754(MoveEffectSystem *param0) { UnkStruct_ov12_02230540 *v0; int v1; @@ -1221,7 +1221,7 @@ void ov12_02230754(UnkStruct_ov12_0221FCDC *param0) ov12_022201E8(v0->unk_00, ov12_02230540, v0); } -void ov12_02230804(UnkStruct_ov12_0221FCDC *param0) +void ov12_02230804(MoveEffectSystem *param0) { UnkStruct_ov12_02230600 *v0; int v1; @@ -1338,7 +1338,7 @@ static void ov12_02230994(SysTask *param0, void *param1) } } -void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02230A8C(MoveEffectSystem *param0) { UnkStruct_ov12_02230910 *v0; int v1; @@ -1441,7 +1441,7 @@ static void ov12_02230BE0(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02230CEC(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02230BE0 *v0; int v1; @@ -1612,7 +1612,7 @@ static void ov12_02230F3C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02231010(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02230F3C *v0; int v1; @@ -1718,7 +1718,7 @@ static void ov12_022310D4(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_022312A4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_022310D4 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022310D4)); @@ -1782,7 +1782,7 @@ static void ov12_02231390(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04); } -void ov12_02231444(UnkStruct_ov12_0221FCDC *param0) +void ov12_02231444(MoveEffectSystem *param0) { UnkStruct_ov12_02231390 *v0; int v1; @@ -1898,7 +1898,7 @@ static void ov12_02231608(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02231650(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02231508 *v0; int v1; @@ -2032,7 +2032,7 @@ static void ov12_0223181C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02231950(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02231760 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231760)); @@ -2164,7 +2164,7 @@ static void ov12_02231A38(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02231C1C(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_022319AC *v0; int v1; @@ -2288,7 +2288,7 @@ static void ov12_02231E28(SysTask *param0, void *param1) } } -void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0) +void ov12_02231E7C(MoveEffectSystem *param0) { UnkStruct_ov12_02231CD4 *v0; int v1; @@ -2382,7 +2382,7 @@ static void ov12_02231FD8(SysTask *param0, void *param1) } } -void ov12_02232024(UnkStruct_ov12_0221FCDC *param0) +void ov12_02232024(MoveEffectSystem *param0) { UnkStruct_ov12_02231F18 *v0; PokemonSprite *v1; @@ -2543,7 +2543,7 @@ static void ov12_0223223C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02232378(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02232084 *v0; PokemonSprite *v1; @@ -2612,7 +2612,7 @@ static void ov12_02232430(SysTask *param0, void *param1) } } -void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0223249C(MoveEffectSystem *param0) { UnkStruct_ov12_022323E4 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022323E4)); @@ -2689,7 +2689,7 @@ static void ov12_022324E0(SysTask *param0, void *param1) } } -void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022326AC(MoveEffectSystem *param0) { UnkStruct_ov12_022324E0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022324E0)); @@ -2849,7 +2849,7 @@ static void ov12_022328B8(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_022329E0(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02232720 *v0; SpriteTemplate v1; @@ -2963,7 +2963,7 @@ static void ov12_02232B40(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02232CA8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02232B40 *v0; s16 v1, v2; @@ -3201,7 +3201,7 @@ static void ov12_02233094(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04); } -void ov12_02233178(UnkStruct_ov12_0221FCDC *param0) +void ov12_02233178(MoveEffectSystem *param0) { UnkStruct_ov12_02232D38 *v0; PokemonSprite *v1; @@ -3310,7 +3310,7 @@ static void ov12_02233394(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02233454(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_022332E8 *v0; int v1; @@ -3431,7 +3431,7 @@ static void ov12_02233644(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02233734(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_0223351C *v0; int v1; @@ -3549,7 +3549,7 @@ static void ov12_02233988(SysTask *param0, void *param1) } } -void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_022339C4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02233900 *v0; int v1; @@ -3703,7 +3703,7 @@ static void ov12_02233BD8(SysTask *param0, void *param1) } } -void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0) +void ov12_02233CD4(MoveEffectSystem *param0) { UnkStruct_ov12_02233AA0 *v0; PokemonSprite *v1; @@ -3788,7 +3788,7 @@ static void ov12_02233DCC(SysTask *param0, void *param1) } } -void ov12_02233F30(UnkStruct_ov12_0221FCDC *param0) +void ov12_02233F30(MoveEffectSystem *param0) { UnkStruct_ov12_02233DCC *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233AA0)); v0->unk_00 = param0; @@ -3832,7 +3832,7 @@ static void ov12_02233F4C(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02234008(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02233F4C *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233F4C)); @@ -3904,7 +3904,7 @@ static void ov12_02234044(SysTask *param0, void *param1) } } -void ov12_02234214(UnkStruct_ov12_0221FCDC *param0) +void ov12_02234214(MoveEffectSystem *param0) { UnkStruct_ov12_02234044 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234044)); @@ -3939,7 +3939,7 @@ static void ov12_02234290(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_04); } -void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0) +void ov12_022342C4(MoveEffectSystem *param0) { UnkStruct_ov12_02234290 *v0; int v1; @@ -4018,7 +4018,7 @@ static void ov12_022343A0(SysTask *param0, void *param1) } } -void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0) +void ov12_022344D0(MoveEffectSystem *param0) { UnkStruct_ov12_022343A0 *v0; int v1; @@ -4076,7 +4076,7 @@ static void ov12_02234528(SysTask *param0, void *param1) } } -void ov12_0223464C(UnkStruct_ov12_0221FCDC *param0) +void ov12_0223464C(MoveEffectSystem *param0) { UnkStruct_ov12_02234528 *v0; int v1; diff --git a/src/overlay012/ov12_022346A4.c b/src/overlay012/ov12_022346A4.c index bbd81e10d4..042660ecfa 100644 --- a/src/overlay012/ov12_022346A4.c +++ b/src/overlay012/ov12_022346A4.c @@ -17,7 +17,7 @@ #include "sys_task_manager.h" typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; SpriteManager *unk_0C; @@ -28,7 +28,7 @@ typedef struct { } UnkStruct_ov12_022346A4; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; int unk_08; SpriteManager *unk_0C; @@ -37,7 +37,7 @@ typedef struct { } UnkStruct_ov12_022348C8; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; int unk_04; SpriteManager *unk_08; ManagedSprite *unk_0C[6]; @@ -46,7 +46,7 @@ typedef struct { } UnkStruct_ov12_02234A10; typedef struct { - UnkStruct_ov12_0221FCDC *unk_00; + MoveEffectSystem *unk_00; SpriteSystem *unk_04; SpriteManager *unk_08; int unk_0C; @@ -68,7 +68,7 @@ static BOOL ov12_02234B34(ManagedSprite *param0, int *param1, int *param2); static void ov12_02234AE0(ManagedSprite *param0, int *param1, int *param2, int param3, int param4); static void ov12_02234CA8(SysTask *param0, void *param1); -void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_022346A4(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { SpriteTemplate v0; UnkStruct_ov12_022346A4 *v1; @@ -176,7 +176,7 @@ static BOOL ov12_0223489C(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1 return 1; } -void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_022348C8(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_022348C8 *v0; int v1; @@ -244,7 +244,7 @@ static void ov12_02234918(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_0C); } -void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02234A10(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { SpriteTemplate v0; UnkStruct_ov12_02234A10 *v1; @@ -429,7 +429,7 @@ static void ov12_02234CA8(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_08); } -void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) +void ov12_02234D98(MoveEffectSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3) { UnkStruct_ov12_02234BD8 *v0; int v1; diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index 95959ec499..f142fa915c 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -132,14 +132,14 @@ static void ov12_02234EF0(SysTask *param0, void *param1) SpriteSystem_DrawSprites(v0->unk_18.unk_0C); } -static void ov12_0223505C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E44 *param1) +static void ov12_0223505C(MoveEffectSystem *param0, UnkStruct_ov12_02234E44 *param1) { (*param1).unk_00 = 7; (*param1).unk_04 = ov12_02220280(param0, 0); (*param1).unk_08 = ov12_02220280(param0, 1); } -static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E44 *param1) +static void ov12_0223507C(MoveEffectSystem *param0, UnkStruct_ov12_02234E44 *param1) { UnkStruct_ov12_02234E54 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234E54)); @@ -210,7 +210,7 @@ static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E ov12_022201E8(v0->unk_18.unk_04, ov12_02234EF0, v0); } -void ov12_022351A4(UnkStruct_ov12_0221FCDC *param0) +void ov12_022351A4(MoveEffectSystem *param0) { UnkStruct_ov12_02234E44 v0; @@ -220,7 +220,7 @@ void ov12_022351A4(UnkStruct_ov12_0221FCDC *param0) ov12_0223507C(param0, &v0); } -void ov12_022351D0(UnkStruct_ov12_0221FCDC *param0) +void ov12_022351D0(MoveEffectSystem *param0) { UnkStruct_ov12_02234E44 v0; @@ -230,7 +230,7 @@ void ov12_022351D0(UnkStruct_ov12_0221FCDC *param0) ov12_0223507C(param0, &v0); } -void ov12_022351FC(UnkStruct_ov12_0221FCDC *param0) +void ov12_022351FC(MoveEffectSystem *param0) { UnkStruct_ov12_02234E44 v0; @@ -240,7 +240,7 @@ void ov12_022351FC(UnkStruct_ov12_0221FCDC *param0) ov12_0223507C(param0, &v0); } -void ov12_02235228(UnkStruct_ov12_0221FCDC *param0) +void ov12_02235228(MoveEffectSystem *param0) { UnkStruct_ov12_02234E44 v0; s16 v1 = 3 + 3; diff --git a/src/overlay012/ov12_02235254.c b/src/overlay012/ov12_02235254.c index 9fe823533f..e19f7e6293 100644 --- a/src/overlay012/ov12_02235254.c +++ b/src/overlay012/ov12_02235254.c @@ -35,12 +35,12 @@ void include_unk_ov12_0223A218(VecFx32 *dummy) *dummy = Unk_ov12_0223A218; } -int ov12_02235254(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02235254(MoveEffectSystem *param0, int param1) { return ov12_022232B8(param0, param1); } -int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_0223525C(MoveEffectSystem *param0, int param1) { int v0; int v1; @@ -63,7 +63,7 @@ int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1) return v1; } -int ov12_02235288(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_02235288(MoveEffectSystem *param0, int param1) { int v0; int v1; @@ -79,7 +79,7 @@ int ov12_02235288(UnkStruct_ov12_0221FCDC *param0, int param1) return 0; } -int ov12_022352AC(UnkStruct_ov12_0221FCDC *param0, int param1) +int ov12_022352AC(MoveEffectSystem *param0, int param1) { int v0; int v1; @@ -171,7 +171,7 @@ void ov12_02235350(int param0, int param1, UnkStruct_ov12_02235350 *param2) *param2 = v0[param0]; } -void ov12_022353AC(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235350 *param2) +void ov12_022353AC(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235350 *param2) { int v0 = ov12_02235254(param0, param1); int v1 = ov12_0221FDD4(param0); @@ -474,7 +474,7 @@ void ov12_022354F8(int param0, VecFx32 *param1, int param2, int param3) ov12_022353CC(param0, param1, param2, param3, 11); } -void ov12_02235508(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235508(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -486,7 +486,7 @@ void ov12_02235508(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235448(v0, param2, v1, v2); } -void ov12_02235538(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235538(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -498,7 +498,7 @@ void ov12_02235538(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235458(v0, param2, v1, v2); } -void ov12_02235568(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235568(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -510,7 +510,7 @@ void ov12_02235568(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235468(v0, param2, v1, v2); } -void ov12_02235598(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235598(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -522,7 +522,7 @@ void ov12_02235598(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235478(v0, param2, v1, v2); } -void ov12_022355C8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_022355C8(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -534,7 +534,7 @@ void ov12_022355C8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235488(v0, param2, v1, v2); } -void ov12_022355F8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_022355F8(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -546,7 +546,7 @@ void ov12_022355F8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_02235498(v0, param2, v1, v2); } -void ov12_02235628(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235628(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -558,7 +558,7 @@ void ov12_02235628(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_022354A8(v0, param2, v1, v2); } -void ov12_02235658(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235658(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -570,7 +570,7 @@ void ov12_02235658(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_022354B8(v0, param2, v1, v2); } -void ov12_02235688(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235688(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -582,7 +582,7 @@ void ov12_02235688(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_022354C8(v0, param2, v1, v2); } -void ov12_022356B8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_022356B8(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -594,7 +594,7 @@ void ov12_022356B8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_022354D8(v0, param2, v1, v2); } -void ov12_022356E8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_022356E8(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -606,7 +606,7 @@ void ov12_022356E8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) ov12_022354E8(v0, param2, v1, v2); } -void ov12_02235718(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) +void ov12_02235718(MoveEffectSystem *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; @@ -639,7 +639,7 @@ void ov12_02235760(int param0, VecFx32 *param1) } } -void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) +void ov12_02235780(MoveEffectSystem *param0, int param1, int param2) { int v0 = param1; int v1 = param2; @@ -655,7 +655,7 @@ void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, (1 << ov12_022233EC(param0, 2)) | GX_BLEND_PLANEMASK_BG0, v0, v1); } -void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int param3) +void ov12_022357BC(MoveEffectSystem *param0, int param1, int param2, int param3) { int v0 = param2; int v1 = param3; @@ -671,7 +671,7 @@ void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, param1, v0, v1); } -void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) +void ov12_022357EC(MoveEffectSystem *param0, int param1, int param2) { int v0 = param1; int v1 = param2; @@ -687,7 +687,7 @@ void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) G2_SetBlendAlpha((1 << ov12_022233EC(param0, 1)), (1 << ov12_022233EC(param0, 2)) | GX_WND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ, v0, v1); } -void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2) +void ov12_02235838(MoveEffectSystem *param0, int param1, BOOL param2) { if (param1 == 0) { G2_SetWnd0InsidePlane((1 << ov12_022233EC(param0, 2)) | (1 << ov12_022233EC(param0, 0)) | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, param2); @@ -719,7 +719,7 @@ void ov12_02235950(ManagedSprite *param0, UnkStruct_ov12_02235350 *param1) ManagedSprite_GetPositionXY(param0, &(param1->unk_00), &(param1->unk_02)); } -void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1) +void ov12_0223595C(MoveEffectSystem *param0, UnkStruct_ov12_0223595C *param1) { param1->unk_00 = 0; param1->unk_01 = 0; @@ -733,7 +733,7 @@ void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *par param1->unk_18 = ov12_0222332C(param0); } -void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) +void ov12_02235998(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) { *param3 = 0; @@ -874,7 +874,7 @@ void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_0 } } -void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) +void ov12_02235D74(MoveEffectSystem *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) { *param3 = 0; @@ -903,7 +903,7 @@ void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_0 } } -void *ov12_02235E50(UnkStruct_ov12_0221FCDC *param0, int param1) +void *ov12_02235E50(MoveEffectSystem *param0, int param1) { int heapID; void *v1 = NULL; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index adfdc2a251..3a1462b19a 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -200,7 +200,7 @@ int ov17_0223B140(ApplicationManager *appMan, int *param1) v0->unk_0C.unk_04 = PokemonSpriteManager_New(HEAP_ID_21); ov17_0223B884(); - v0->unk_0C.unk_20 = ov12_0221FCDC(HEAP_ID_21); + v0->unk_0C.unk_20 = MoveEffectSystem_New(HEAP_ID_21); ov12_0221FDC0(v0->unk_0C.unk_20, 1); v0->unk_0C.unk_38 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_TEXT, HEAP_ID_21); @@ -320,7 +320,7 @@ int ov17_0223B580(ApplicationManager *appMan, int *param1) ParticleSystem_FreeAll(); - ov12_0221FDF4(v0->unk_0C.unk_20); + MoveEffectSystem_Delete(v0->unk_0C.unk_20); ov17_0223B9A4(v0); ov17_0223BAD0(v0); ov17_0223BCDC(v0);