From 28e8e8199dfb8c815ae9609d9b62de1b1a3ea41e Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:00:58 -0500 Subject: [PATCH 1/6] rename battle_input.c --- include/battle/battle_input.h | 37 + include/battle/ov16_0223DF00.h | 8 +- include/battle/ov16_0226871C.h | 37 - include/battle/ov16_0226DB7C.h | 22 +- include/battle/ov16_0226DE44.h | 18 +- include/battle/struct_ov16_02268A14_decl.h | 2 +- include/battle/struct_ov16_0226DC24_decl.h | 2 +- include/battle/struct_ov16_0226DEEC_decl.h | 2 +- include/overlay013/ov13_02228A38.h | 4 +- include/overlay013/struct_ov13_02227244.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/unk_0207C908.h | 2 +- platinum.us/main.lsf | 2 +- src/battle/battle_controller.c | 26 +- src/battle/battle_display.c | 268 +-- .../{ov16_0226871C.c => battle_input.c} | 1815 ++++++++--------- src/battle/battle_io.c | 18 +- src/battle/battle_io_command.c | 22 +- src/battle/battle_lib.c | 42 +- src/battle/battle_script.c | 112 +- src/battle/healthbar.c | 16 +- src/battle/ov16_0223B140.c | 24 +- src/battle/ov16_0223DF00.c | 33 +- src/battle/ov16_02264798.c | 2 +- src/battle/ov16_02268520.c | 4 +- src/battle/ov16_0226DB7C.c | 44 +- src/battle/ov16_0226DE44.c | 48 +- src/battle/ov16_0226E148.c | 14 +- src/battle/trainer_ai/trainer_ai.c | 16 +- src/meson.build | 2 +- src/overlay012/ov12_0221FC20.c | 2 +- src/overlay013/ov13_0221FC20.c | 8 +- src/overlay013/ov13_02224500.c | 12 +- src/overlay013/ov13_022264F4.c | 8 +- src/overlay013/ov13_02227BDC.c | 20 +- src/overlay013/ov13_02228A38.c | 6 +- src/unk_0207C908.c | 2 +- 37 files changed, 1326 insertions(+), 1378 deletions(-) create mode 100644 include/battle/battle_input.h delete mode 100644 include/battle/ov16_0226871C.h rename src/battle/{ov16_0226871C.c => battle_input.c} (57%) diff --git a/include/battle/battle_input.h b/include/battle/battle_input.h new file mode 100644 index 0000000000..7595df8632 --- /dev/null +++ b/include/battle/battle_input.h @@ -0,0 +1,37 @@ +#ifndef POKEPLATINUM_OV16_0226871C_H +#define POKEPLATINUM_OV16_0226871C_H + +#include "struct_decls/battle_system.h" + +#include "battle/move_display_info.h" +#include "battle/struct_ov16_02268A14_decl.h" + +#include "bg_window.h" +#include "narc.h" + +void ov16_02268744(BgConfig *bgConfig); +void ov16_022687A0(BgConfig *bgConfig); +void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4); +void BattleInput_Free(BattleInput *input); +void ov16_02268A88(BattleInput *input); +void ov16_02268B8C(BattleInput *input); +void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *param2, int param3, int param4, void *param5); +void ov16_02268D40(NARC *param0, BattleInput *param1); +void ov16_0226914C(BattleInput *input, const u8 *param1); +void ov16_02269168(BattleInput *input, u8 param1[], u8 param2[]); +void ov16_022691BC(BattleInput *input); +void ov16_02269218(BattleInput *input); +int BattleInput_CheckTouch(BattleInput *input); +BOOL ov16_02269348(BattleInput *input); +int ov16_02269368(int param0, int param1); +void ov16_0226940C(BattleInput *input); +void ov16_0226947C(BattleInput *input, int param1, int param2); +void ov16_0226AC98(BattleInput *input, int param1, const MoveDisplayInfo *param2); +void ov16_0226BCCC(BattleInput *input, int param1); +BOOL ov16_0226BCD0(BattleInput *input); +int ov16_0226CD08(BattleInput *input); +void ov16_0226CD10(BattleInput *input, int param1); +void ov16_0226CEB0(BattleInput *input, int param1); +u8 ov16_0226D088(BattleInput *input); + +#endif // POKEPLATINUM_OV16_0226871C_H diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index e035a4fd5d..4708a522bb 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -40,7 +40,7 @@ #define ENEMY_IN_SLOT_RIGHT 0 #define ENEMY_IN_SLOT_LEFT 2 -BgConfig *BattleSystem_BGL(BattleSystem *battleSys); +BgConfig *BattleSystem_GetBgConfig(BattleSystem *battleSys); /** * @brief Get one of the allocated windows for the battle display. @@ -50,7 +50,7 @@ BgConfig *BattleSystem_BGL(BattleSystem *battleSys); * @return */ Window *BattleSystem_Window(BattleSystem *battleSys, int idx); -u32 BattleSystem_BattleType(BattleSystem *battleSys); +u32 BattleSystem_GetBattleType(BattleSystem *battleSys); BattleContext *BattleSystem_Context(BattleSystem *battleSys); BattlerData *BattleSystem_BattlerData(BattleSystem *battleSys, int param1); int BattleSystem_MaxBattlers(BattleSystem *battleSys); @@ -89,14 +89,14 @@ UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSys); SpriteRenderer *ov16_0223E010(BattleSystem *battleSys); SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSys); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSys, int param1); -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSys); +BattleInput *BattleSystem_GetBattleInput(BattleSystem *battleSys); PartyGauge *ov16_0223E034(BattleSystem *battleSys, enum PartyGaugeSide param1); void ov16_0223E040(BattleSystem *battleSys, enum PartyGaugeSide param1, PartyGauge *param2); UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSys); UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSys); MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSys); MessageLoader *ov16_0223E060(BattleSystem *battleSys); -PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSys); +PaletteData *BattleSystem_GetPaletteData(BattleSystem *battleSys); Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSys); u8 *ov16_0223E06C(BattleSystem *battleSys); u8 *ov16_0223E074(BattleSystem *battleSys); diff --git a/include/battle/ov16_0226871C.h b/include/battle/ov16_0226871C.h deleted file mode 100644 index 565cdc75a0..0000000000 --- a/include/battle/ov16_0226871C.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef POKEPLATINUM_OV16_0226871C_H -#define POKEPLATINUM_OV16_0226871C_H - -#include "struct_decls/battle_system.h" - -#include "battle/move_display_info.h" -#include "battle/struct_ov16_02268A14_decl.h" - -#include "bg_window.h" -#include "narc.h" - -void ov16_02268744(BgConfig *param0); -void ov16_022687A0(BgConfig *param0); -void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4); -void ov16_02268A14(UnkStruct_ov16_02268A14 *param0); -void ov16_02268A88(UnkStruct_ov16_02268A14 *param0); -void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0); -void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, int param3, int param4, void *param5); -void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1); -void ov16_0226914C(UnkStruct_ov16_02268A14 *param0, const u8 *param1); -void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]); -void ov16_022691BC(UnkStruct_ov16_02268A14 *param0); -void ov16_02269218(UnkStruct_ov16_02268A14 *param0); -int ov16_0226925C(UnkStruct_ov16_02268A14 *param0); -BOOL ov16_02269348(UnkStruct_ov16_02268A14 *param0); -int ov16_02269368(int param0, int param1); -void ov16_0226940C(UnkStruct_ov16_02268A14 *param0); -void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDisplayInfo *param2); -void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1); -BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0); -int ov16_0226CD08(UnkStruct_ov16_02268A14 *param0); -void ov16_0226CD10(UnkStruct_ov16_02268A14 *param0, int param1); -void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1); -u8 ov16_0226D088(UnkStruct_ov16_02268A14 *param0); - -#endif // POKEPLATINUM_OV16_0226871C_H diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index 58df2ce9c9..8358c6398d 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -8,16 +8,16 @@ #include "palette.h" -void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0); -void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); -void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4); -void ov16_0226DD9C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, fx32 param5); -void ov16_0226DDC0(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, fx32 param4); -void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0); -void ov16_0226DE04(UnkStruct_ov16_0226DC24 *param0); +void BattleCursor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); +void BattleCursor_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +BattleCursor *BattleCursor_New(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void BattleCursor_Free(BattleCursor *param0); +void ov16_0226DCCC(BattleCursor *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); +void ov16_0226DD54(BattleCursor *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +void ov16_0226DD7C(BattleCursor *param0, int param1, int param2, int param3, int param4); +void ov16_0226DD9C(BattleCursor *param0, int param1, int param2, int param3, int param4, fx32 param5); +void ov16_0226DDC0(BattleCursor *param0, int param1, int param2, int param3, fx32 param4); +void ov16_0226DDE8(BattleCursor *param0); +void ov16_0226DE04(BattleCursor *param0); #endif // POKEPLATINUM_OV16_0226DB7C_H diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index d884ea41e5..a0c04ce867 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -8,14 +8,14 @@ #include "palette.h" -void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0); -void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3); -void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2); -void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0); -void ov16_0226DFD0(UnkStruct_ov16_0226DEEC *param0, int param1); -BOOL ov16_0226DFD4(UnkStruct_ov16_0226DEEC *param0); +void CatchingTutorialFinger_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); +void CatchingTutorialFinger_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +CatchingTutorialFinger *CatchingTutorialFinger_Create(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void CatchingTutorialFinger_Free(CatchingTutorialFinger *param0); +void ov16_0226DF80(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3); +void ov16_0226DFB0(CatchingTutorialFinger *param0, int param1, int param2); +void ov16_0226DFBC(CatchingTutorialFinger *param0); +void ov16_0226DFD0(CatchingTutorialFinger *param0, int param1); +BOOL ov16_0226DFD4(CatchingTutorialFinger *param0); #endif // POKEPLATINUM_OV16_0226DE44_H diff --git a/include/battle/struct_ov16_02268A14_decl.h b/include/battle/struct_ov16_02268A14_decl.h index c0c00efe18..864adc0c47 100644 --- a/include/battle/struct_ov16_02268A14_decl.h +++ b/include/battle/struct_ov16_02268A14_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H #define POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H -typedef struct UnkStruct_ov16_02268A14_t UnkStruct_ov16_02268A14; +typedef struct BattleInput_t BattleInput; #endif // POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H diff --git a/include/battle/struct_ov16_0226DC24_decl.h b/include/battle/struct_ov16_0226DC24_decl.h index d1292bfaf5..cc1197ddbd 100644 --- a/include/battle/struct_ov16_0226DC24_decl.h +++ b/include/battle/struct_ov16_0226DC24_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H #define POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H -typedef struct UnkStruct_ov16_0226DC24_t UnkStruct_ov16_0226DC24; +typedef struct UnkStruct_ov16_0226DC24_t BattleCursor; #endif // POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H diff --git a/include/battle/struct_ov16_0226DEEC_decl.h b/include/battle/struct_ov16_0226DEEC_decl.h index fc460579d6..b7de0e388e 100644 --- a/include/battle/struct_ov16_0226DEEC_decl.h +++ b/include/battle/struct_ov16_0226DEEC_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H #define POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H -typedef struct UnkStruct_ov16_0226DEEC_t UnkStruct_ov16_0226DEEC; +typedef struct CatchingTutorialFinger_t CatchingTutorialFinger; #endif // POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H diff --git a/include/overlay013/ov13_02228A38.h b/include/overlay013/ov13_02228A38.h index e7379b0bf3..02d56ec054 100644 --- a/include/overlay013/ov13_02228A38.h +++ b/include/overlay013/ov13_02228A38.h @@ -8,10 +8,10 @@ UnkStruct_ov13_02228A50 *ov13_02228A38(u32 param0); void ov13_02228A50(UnkStruct_ov13_02228A50 *param0); -UnkStruct_ov16_0226DC24 *ov13_02228A58(UnkStruct_ov13_02228A50 *param0); +BattleCursor *ov13_02228A58(UnkStruct_ov13_02228A50 *param0); u8 ov13_02228A5C(UnkStruct_ov13_02228A50 *param0); void ov13_02228A60(UnkStruct_ov13_02228A50 *param0, u8 param1); -void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, UnkStruct_ov16_0226DC24 *param1); +void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *param1); void ov13_02228A68(UnkStruct_ov13_02228A50 *param0, u8 param1); void ov13_02228A90(UnkStruct_ov13_02228A50 *param0); void ov13_02228A9C(UnkStruct_ov13_02228A50 *param0, const ByteFlagSet *param1); diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index fbad6dd8fd..734b9d27ca 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -30,7 +30,7 @@ typedef struct { u8 unk_31; u8 unk_32; UnkStruct_ov13_02228A50 *unk_34; - UnkStruct_ov16_0226DEEC *unk_38; + CatchingTutorialFinger *unk_38; BagItem unk_3C[5][36]; SpriteGfxHandler *unk_30C; CellActorData *unk_310[6]; diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 2fd126e640..e6b75c71d6 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -74,7 +74,7 @@ struct BattleSystem { u8 unk_A8[4]; Trainer trainers[MAX_BATTLERS]; UnkStruct_ov16_02268520 unk_17C[2]; - UnkStruct_ov16_02268A14 *unk_198; + BattleInput *battleInput; PartyGauge *unk_19C[2]; UnkStruct_0200C440 *unk_1A4; UnkStruct_0200C440 *unk_1A8; diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index 01ef934b76..b69927663e 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -18,7 +18,7 @@ u8 sub_0207C92C(int param0); u32 sub_0207C944(void); void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); -void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); +void MoveTypeIcon_LoadPalette(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); void sub_0207CA34(SpriteGfxHandler *param0, u32 param1); void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 7bfad6c8a2..e2e7c409d1 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -700,7 +700,7 @@ Overlay battle Object main.nef.p/src_battle_battle_io.c.o Object main.nef.p/src_battle_healthbar.c.o Object main.nef.p/src_battle_ov16_02268520.c.o - Object main.nef.p/src_battle_ov16_0226871C.c.o + Object main.nef.p/src_battle_battle_input.c.o Object main.nef.p/src_battle_party_gauge.c.o Object main.nef.p/src_battle_ov16_0226DB7C.c.o Object main.nef.p/src_battle_ov16_0226DE44.c.o diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c index 6b251d5d7a..d955234798 100644 --- a/src/battle/battle_controller.c +++ b/src/battle/battle_controller.c @@ -312,7 +312,7 @@ static inline BOOL SingleControllerForSide(BattleContext *battleCtx, int battler static void BattleController_CommandSelectionInput(BattleSystem *battleSys, BattleContext *battleCtx) { int maxBattlers = BattleSystem_MaxBattlers(battleSys); - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); int battlersDone = 0; BattleMessage msg; @@ -460,7 +460,7 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt break; case PLAYER_INPUT_ITEM: - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_ITEMS) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_NO_ITEMS) { msg.id = 593; // "Items can’t be used here." msg.tags = TAG_NONE; BattleIO_SetAlertMessage(battleSys, i, msg); @@ -709,7 +709,7 @@ static void BattleController_CalcTurnOrder(BattleSystem *battleSys, BattleContex int battler, i, j; // Must declare these here to match. int maxBattlers = BattleSystem_MaxBattlers(battleSys); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int order = 0; if (battleType & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK)) { @@ -1955,8 +1955,8 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext case BATTLE_ITEM_CATEGORY_POKE_BALLS: nextSeq = subscript_throw_pokeball; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TRAINER) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) == FALSE) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TRAINER) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) == FALSE) { Bag_TryRemoveItem(BattleSystem_Bag(battleSys), used->item, 1, HEAP_ID_BATTLE); Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), used->item, used->category); } @@ -1990,7 +1990,7 @@ static void BattleController_FleeCommand(BattleSystem *battleSys, BattleContext battleCtx->attacker = battleCtx->battlerActionOrder[battleCtx->turnOrderCounter]; if (Battler_Side(battleSys, battleCtx->attacker) - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { if (ATTACKING_MON.statusVolatile & (VOLATILE_CONDITION_BIND | VOLATILE_CONDITION_MEAN_LOOK)) { LOAD_SUBSEQ(subscript_enemy_escape_failed); battleCtx->scriptCursor = 0; @@ -2110,7 +2110,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex { int rand1, rand2; // must be defined up here to match u8 maxLevel = 0; - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); TrainerInfo *trInfo = BattleSystem_TrainerInfo(battleSys, 0); // These separate sentinels do not match if chained into a single sentinel @@ -2864,7 +2864,7 @@ static inline int CalcMoveType(BattleContext *battleCtx, int attacker, int move) */ static int BattleController_CheckMoveHitAccuracy(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int move) { - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) { return 0; } @@ -3961,7 +3961,7 @@ static void BattleController_UpdateMoveBuffers(BattleSystem *battleSys, BattleCo static void BattleController_MoveEnd(BattleSystem *battleSys, BattleContext *battleCtx) { - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_MOVES) == FALSE) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_NO_MOVES) == FALSE) { if (BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battleCtx->attacker, FALSE) == TRUE || (battleCtx->defender != BATTLER_NONE && BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battleCtx->defender, FALSE) == TRUE) @@ -4040,7 +4040,7 @@ static void BattleController_ScreenWipe(BattleSystem *battleSys, BattleContext * static void BattleController_EndFight(BattleSystem *battleSys, BattleContext *battleCtx) { - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); if ((battleType & BATTLE_TYPE_LINK) == FALSE) { Party *playerParty = BattleSystem_Party(battleSys, BATTLER_US); @@ -4072,7 +4072,7 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte BOOL result = FALSE; int i; // must be declared here to match int maxBattlers = BattleSystem_MaxBattlers(battleSys); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int retCommand = battleCtx->command; for (i = 0; i < maxBattlers; i++) { @@ -4182,7 +4182,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem *battleSys, BattleCont { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); u8 battleResult = BATTLE_IN_PROGRESS; for (i = 0; i < maxBattlers; i++) { @@ -4795,7 +4795,7 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, */ static void BattleController_InitAI(BattleSystem *battleSys, BattleContext *battleCtx) { - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); MI_CpuClear32(&battleCtx->aiContext, sizeof(AIContext)); if ((battleType & BATTLE_TYPE_TRAINER) && (battleType & BATTLE_TYPE_NO_AI_ITEMS) == FALSE) { diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index be91e73f0c..14ec0e2c7d 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -19,6 +19,7 @@ #include "struct_defs/trainer_data.h" #include "battle/battle_context.h" +#include "battle/battle_input.h" #include "battle/battle_io.h" #include "battle/battle_lib.h" #include "battle/battle_message.h" @@ -27,7 +28,6 @@ #include "battle/ov16_0223B140.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_02264798.h" -#include "battle/ov16_0226871C.h" #include "battle/party_gauge.h" #include "battle/struct_ov16_0224DDA8.h" #include "battle/struct_ov16_0225BFFC_decl.h" @@ -266,7 +266,7 @@ void ov16_0225CBDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 u8 v9; v2 = ov16_0223E000(param0); - v5 = BattleSystem_BattleType(param0); + v5 = BattleSystem_GetBattleType(param0); v4 = (UnkStruct_ov16_0225E4E8 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225E4E8)); v4->unk_12 = 0; @@ -343,7 +343,7 @@ void ov16_0225CE1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 UnkStruct_ov16_0225EA80 *v1; int v2; - v2 = BattleSystem_BattleType(param0); + v2 = BattleSystem_GetBattleType(param0); v1 = (UnkStruct_ov16_0225EA80 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225EA80)); if (param1->battlerType & 0x1) { @@ -394,7 +394,7 @@ void ov16_0225CF70(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 UnkStruct_ov16_0225EA80 *v2; int v3; - v3 = BattleSystem_BattleType(param0); + v3 = BattleSystem_GetBattleType(param0); v2 = (UnkStruct_ov16_0225EA80 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225EA80)); v2->unk_83 = 0; @@ -512,7 +512,7 @@ void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 SpriteActor_SetSpritePositionXY(v1->unk_04->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (128 + 8)); } - if ((BattleSystem_BattleType(param0) & 0x8) || ((BattleSystem_BattleType(param0) & 0x10) && (param1->battlerType & 0x1))) { + if ((BattleSystem_GetBattleType(param0) & 0x8) || ((BattleSystem_GetBattleType(param0) & 0x10) && (param1->battlerType & 0x1))) { v2 = param1->battlerType; } else { v2 = param1->battlerType & 1; @@ -529,7 +529,7 @@ void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 v1->unk_1C = 0; if ((v1->unk_14 == 0) || (v1->unk_14 == 2)) { - Bg_SetOffset(BattleSystem_BGL(param0), 3, 2, 4 * 33); + Bg_SetOffset(BattleSystem_GetBgConfig(param0), 3, 2, 4 * 33); } SysTask_Start(ov16_0225FA70, v1, 0); @@ -617,7 +617,7 @@ void BattleDisplay_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battle healthbar->battleSys = battleSys; healthbar->battler = battlerData->battler; - healthbar->type = Healthbar_Type(battlerData->battlerType, BattleSystem_BattleType(battleSys)); + healthbar->type = Healthbar_Type(battlerData->battlerType, BattleSystem_GetBattleType(battleSys)); healthbar->unk_4C = healthbarData->command; healthbar->curHP = healthbarData->curHP; healthbar->maxHP = healthbarData->maxHP; @@ -747,7 +747,7 @@ void ov16_0225D708(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_0223F87C(param0, &v4[0]); v2 = BattleSystem_MaxBattlers(param0); - v3 = BattleSystem_BattleType(param0); + v3 = BattleSystem_GetBattleType(param0); for (i = 0; i < v2; i++) { v0->unk_10[i] = param2->unk_04[i]; @@ -931,7 +931,7 @@ void ov16_0225DA74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 v0->battleSys = param0; v0->unk_4C = param2->unk_00; v0->battler = param1->battler; - v0->type = Healthbar_Type(param1->battlerType, BattleSystem_BattleType(param0)); + v0->type = Healthbar_Type(param1->battlerType, BattleSystem_GetBattleType(param0)); v0->curHP = param2->unk_02; v0->maxHP = param2->unk_04; v0->damage = param2->unk_08; @@ -1198,7 +1198,7 @@ void ov16_0225DF6C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_022661B0(param0, param1->battler); ClearCommand(param0, param1->battler, param2->unk_00); } else { - if ((BattleSystem_BattleType(param0) & 0x4) == 0) { + if ((BattleSystem_GetBattleType(param0) & 0x4) == 0) { ov16_022661B0(param0, param1->battler); } @@ -1216,7 +1216,7 @@ void ov16_0225E008(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 v0->battleSys = param0; v0->battler = param1->battler; - v0->type = Healthbar_Type(param1->battlerType, BattleSystem_BattleType(param0)); + v0->type = Healthbar_Type(param1->battlerType, BattleSystem_GetBattleType(param0)); v0->unk_4C = param2->unk_00; v0->curHP = param2->unk_02; v0->maxHP = param2->unk_04; @@ -1740,7 +1740,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) { v0->unk_10 = NULL; - if (BattleSystem_BattleType(v0->unk_00) & 0x8) { + if (BattleSystem_GetBattleType(v0->unk_00) & 0x8) { if ((BattleSystem_BattleStatus(v0->unk_00) & 0x20) == 0) { if (v0->unk_82 == 2) { v0->unk_10 = ov12_02223764(v0->unk_00, 5); @@ -1948,7 +1948,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) v2.target = v0->unk_81; v2.ballID = v0->unk_8E; v2.cellActorSys = ov16_0223E010(v0->unk_00); - v2.paletteSys = BattleSystem_PaletteSys(v0->unk_00); + v2.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v2.bgPrio = 1; v2.surface = 0; @@ -2201,7 +2201,7 @@ static void ov16_0225F764(SysTask *param0, void *param1) v5.target = v0->unk_69; v5.ballID = v0->unk_6E; v5.cellActorSys = ov16_0223E010(v0->unk_00); - v5.paletteSys = BattleSystem_PaletteSys(v0->unk_00); + v5.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v5.bgPrio = 1; v5.surface = 0; v0->unk_0C = ov12_02237728(&v5); @@ -2217,7 +2217,7 @@ static void ov16_0225F764(SysTask *param0, void *param1) v6.target = v0->unk_69; v6.ballID = v0->unk_6E; v6.cellActorSys = ov16_0223E010(v0->unk_00); - v6.paletteSys = BattleSystem_PaletteSys(v0->unk_00); + v6.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v6.bgPrio = 1; v6.surface = 0; v0->unk_0C = ov12_02237728(&v6); @@ -2308,10 +2308,10 @@ static void ov16_0225FA70(SysTask *param0, void *param1) s16 v1, v2, v3, v4; u32 v5; - v5 = BattleSystem_BattleType(v0->unk_00); + v5 = BattleSystem_GetBattleType(v0->unk_00); if ((v0->unk_1C < 33) && (v0->unk_0E >= 2) && ((v0->unk_14 == 0) || (v0->unk_14 == 2))) { - Bg_SetOffset(BattleSystem_BGL(v0->unk_00), 3, 1, 4); + Bg_SetOffset(BattleSystem_GetBgConfig(v0->unk_00), 3, 1, 4); v0->unk_1C++; } @@ -2519,7 +2519,7 @@ static void ov16_0225FD5C(SysTask *param0, void *param1) }, }; - v4 = BattleSystem_BattleType(v0->unk_00); + v4 = BattleSystem_GetBattleType(v0->unk_00); switch (v0->unk_0A) { case 0: @@ -2557,7 +2557,7 @@ static void ov16_0225FD5C(SysTask *param0, void *param1) v6.mode = 4; v6.target = v0->unk_09; v6.cellActorSys = ov16_0223E010(v0->unk_00); - v6.paletteSys = BattleSystem_PaletteSys(v0->unk_00); + v6.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v6.surface = 0; v6.battleSys = v0->unk_00; @@ -2870,17 +2870,17 @@ static void ov16_022604C8(SysTask *param0, void *param1) { UnkStruct_ov16_0225D5B8 *v0; BgConfig *v1; - UnkStruct_ov16_02268A14 *v2; + BattleInput *battleInput; BattlerData *v3; u32 v4; int v5; Healthbar *v6; v0 = (UnkStruct_ov16_0225D5B8 *)param1; - v1 = BattleSystem_BGL(v0->unk_00); - v2 = ov16_0223E02C(v0->unk_00); + v1 = BattleSystem_GetBgConfig(v0->unk_00); + battleInput = BattleSystem_GetBattleInput(v0->unk_00); v3 = BattleSystem_BattlerData(v0->unk_00, v0->unk_09); - v4 = BattleSystem_BattleType(v0->unk_00); + v4 = BattleSystem_GetBattleType(v0->unk_00); v5 = BattleSystem_Partner(v0->unk_00, v0->unk_09); if (v5 != v0->unk_09) { @@ -2902,7 +2902,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) v7.maxPP[i] = v0->unk_30[i]; } - ov16_0226AC98(ov16_0223E02C(v0->unk_00), v0->unk_34, &v7); + ov16_0226AC98(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_34, &v7); } v0->unk_0A++; @@ -2957,7 +2957,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) ov16_02264798(v3, v0->unk_00); v0->unk_0A = 4; case 4: - if (ov16_02269348(v2) == 0) { + if (ov16_02269348(battleInput) == 0) { break; } @@ -2978,40 +2978,40 @@ static void ov16_022604C8(SysTask *param0, void *param1) v11.unk_08 = ov16_0223EC58(v0->unk_00, v0->unk_09, v0->unk_3B); if (v3->unk_193) { - ov16_0226BCCC(v2, 1); + ov16_0226BCCC(battleInput, 1); if (BattleSystem_BattleStatus(v0->unk_00) & 0x1) { - ov16_02268C04(v12, v13, v2, 6, 0, &v11); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x200) { - ov16_02268C04(v12, v13, v2, 10, 0, &v11); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x20) { - ov16_02268C04(v12, v13, v2, 8, 0, &v11); - } else if ((v11.unk_00 == 4) && ((BattleSystem_BattleType(v0->unk_00) & 0x8) == 0)) { - ov16_02268C04(v12, v13, v2, 4, 0, &v11); + ov16_02268C04(v12, v13, battleInput, 6, 0, &v11); + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x200) { + ov16_02268C04(v12, v13, battleInput, 10, 0, &v11); + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x20) { + ov16_02268C04(v12, v13, battleInput, 8, 0, &v11); + } else if ((v11.unk_00 == 4) && ((BattleSystem_GetBattleType(v0->unk_00) & 0x8) == 0)) { + ov16_02268C04(v12, v13, battleInput, 4, 0, &v11); } else { - ov16_02268C04(v12, v13, v2, 3, 0, &v11); + ov16_02268C04(v12, v13, battleInput, 3, 0, &v11); } BattleSystem_SetCommandSelectionFlags(v0->unk_00, 1); } else { if (BattleSystem_BattleStatus(v0->unk_00) & 0x1) { - ov16_02268C04(v12, v13, v2, 5, 0, &v11); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x200) { - ov16_02268C04(v12, v13, v2, 9, 0, &v11); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x20) { - ov16_02268C04(v12, v13, v2, 7, 0, &v11); + ov16_02268C04(v12, v13, battleInput, 5, 0, &v11); + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x200) { + ov16_02268C04(v12, v13, battleInput, 9, 0, &v11); + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x20) { + ov16_02268C04(v12, v13, battleInput, 7, 0, &v11); } else if (v11.unk_00 != 4) { - ov16_02268C04(v12, v13, v2, 1, 0, &v11); + ov16_02268C04(v12, v13, battleInput, 1, 0, &v11); } else { - ov16_02268C04(v12, v13, v2, 2, 0, &v11); + ov16_02268C04(v12, v13, battleInput, 2, 0, &v11); } v3->unk_193 = 1; } - ov16_0226914C(v2, v0->unk_1C); - ov16_02269168(v2, v0->unk_10[0], v0->unk_10[1]); - ov16_022691BC(v2); + ov16_0226914C(battleInput, v0->unk_1C); + ov16_02269168(battleInput, v0->unk_10[0], v0->unk_10[1]); + ov16_022691BC(battleInput); NARC_dtor(v12); NARC_dtor(v13); } @@ -3033,7 +3033,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) } } - v0->unk_0C = ov16_0226925C(v2); + v0->unk_0C = BattleInput_CheckTouch(battleInput); if (v0->unk_0C != 0xffffffff) { v0->unk_0B = 10; @@ -3042,10 +3042,10 @@ static void ov16_022604C8(SysTask *param0, void *param1) } break; case 6: - if ((ov16_02269348(v2) == 1) || (v0->unk_0C == 1)) { + if ((ov16_02269348(battleInput) == 1) || (v0->unk_0C == 1)) { switch (v0->unk_0C) { case 1: - if (BattleSystem_BattleType(v0->unk_00) & (0x20 | 0x200)) { + if (BattleSystem_GetBattleType(v0->unk_00) & (0x20 | 0x200)) { v0->unk_0A = 7; } break; @@ -3053,8 +3053,8 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v16 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v17 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v16, v17, v2, 0, 0, NULL); - ov16_0226BCCC(v2, 0); + ov16_02268C04(v16, v17, battleInput, 0, 0, NULL); + ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); ov16_022647D8(v3); @@ -3065,8 +3065,8 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v18 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v19 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v18, v19, v2, 0, 0, NULL); - ov16_0226BCCC(v2, 0); + ov16_02268C04(v18, v19, battleInput, 0, 0, NULL); + ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); ov16_022647D8(v3); @@ -3077,12 +3077,12 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v20 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v21 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - if (ov16_0226D088(v2) == 1) { + if (ov16_0226D088(battleInput) == 1) { ov16_0226846C(v6); v0->unk_0C = 0xff; } - ov16_02268C04(v20, v21, v2, 0, 0, NULL); + ov16_02268C04(v20, v21, battleInput, 0, 0, NULL); NARC_dtor(v20); NARC_dtor(v21); } break; @@ -3091,21 +3091,21 @@ static void ov16_022604C8(SysTask *param0, void *param1) break; } - ov16_02269218(v2); + ov16_02269218(battleInput); v0->unk_0A = 8; } break; case 7: - if (ov16_02269348(v2) == 1) { + if (ov16_02269348(battleInput) == 1) { NARC *v22 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v23 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v22, v23, v2, 0, 0, NULL); - ov16_0226BCCC(v2, 0); + ov16_02268C04(v22, v23, battleInput, 0, 0, NULL); + ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); ov16_022647D8(v3); - ov16_02269218(v2); + ov16_02269218(battleInput); v0->unk_0A = 8; @@ -3114,7 +3114,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) } break; case 8: - if (ov16_0226BCD0(v2) == 1) { + if (ov16_0226BCD0(battleInput) == 1) { ov16_022656D4(v0->unk_00, v0->unk_09, v0->unk_0C); ClearCommand(v0->unk_00, v0->unk_09, v0->unk_08); Heap_FreeToHeap(param1); @@ -3221,13 +3221,13 @@ static void ov16_02260BAC(SysTask *param0, void *param1) static void ov16_02260C00(SysTask *param0, void *param1) { UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; - BgConfig *v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 *v2; + BgConfig *v1 = BattleSystem_GetBgConfig(v0->unk_00); + BattleInput *battleInput; int v3; Healthbar *v4; BattlerData *v5; - v2 = ov16_0223E02C(v0->unk_00); + battleInput = BattleSystem_GetBattleInput(v0->unk_00); v5 = BattleSystem_BattlerData(v0->unk_00, v0->unk_1D); v3 = BattleSystem_Partner(v0->unk_00, v0->unk_1D); @@ -3239,7 +3239,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) switch (v0->unk_20) { case 0: - if (ov16_02269348(v2) == 0) { + if (ov16_02269348(battleInput) == 0) { break; } @@ -3255,7 +3255,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) BattleMessage_Print(v0->unk_00, v6, &v7, 0); } - ov16_02269218(v2); + ov16_02269218(battleInput); { UnkStruct_ov16_02260C00 v8; @@ -3271,14 +3271,14 @@ static void ov16_02260C00(SysTask *param0, void *param1) v8.unk_10 = v0->unk_1E; - ov16_02268C04(v10, v11, v2, 11, 0, &v8); + ov16_02268C04(v10, v11, battleInput, 11, 0, &v8); NARC_dtor(v10); NARC_dtor(v11); } v0->unk_20++; break; case 1: - v0->unk_08 = ov16_0226925C(v2); + v0->unk_08 = BattleInput_CheckTouch(battleInput); if (v0->unk_08 != 0xffffffff) { Sound_PlayEffect(1501); @@ -3288,8 +3288,8 @@ static void ov16_02260C00(SysTask *param0, void *param1) case 2: if (1) { if (v0->unk_08 != 0xff) { - if ((BattleSystem_BattleType(v0->unk_00) & 0x2) == 0) { - ov16_0226BCCC(v2, 0); + if ((BattleSystem_GetBattleType(v0->unk_00) & 0x2) == 0) { + ov16_0226BCCC(battleInput, 0); ov16_0226846C(v4); ov16_022675AC(v0->unk_04); ov16_022647D8(v5); @@ -3303,7 +3303,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) case 3: v0->unk_20++; default: - if (ov16_0226BCD0(v2) == 1) { + if (ov16_0226BCD0(battleInput) == 1) { ov16_0223F234(v0->unk_00, 1); ClearCommand(v0->unk_00, v0->unk_1D, v0->unk_1C); Heap_FreeToHeap(param1); @@ -3320,7 +3320,7 @@ static void ov16_02260DB0(SysTask *param0, void *param1) int v2; u32 v3; - v3 = BattleSystem_BattleType(v0->unk_00); + v3 = BattleSystem_GetBattleType(v0->unk_00); v1 = BattleSystem_Context(v0->unk_00); if ((v3 & (0x1 | 0x100)) || (BattleSystem_BattleStatus(v0->unk_00) & 0x1) || (Battler_Side(v0->unk_00, v0->unk_1D) == 0)) { @@ -3404,14 +3404,14 @@ static void ov16_02260E98(SysTask *param0, void *param1) static void ov16_02260F14(SysTask *param0, void *param1) { UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; - BgConfig *v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 *v2; + BgConfig *v1 = BattleSystem_GetBgConfig(v0->unk_00); + BattleInput *battleInput; int v3; Healthbar *v4; BattlerData *v5; v5 = BattleSystem_BattlerData(v0->unk_00, v0->unk_0D); - v2 = ov16_0223E02C(v0->unk_00); + battleInput = BattleSystem_GetBattleInput(v0->unk_00); v3 = BattleSystem_Partner(v0->unk_00, v0->unk_0D); if (v3 != v0->unk_0D) { @@ -3422,7 +3422,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) switch (v0->unk_0F) { case 0: - if (ov16_02269348(v2) == 0) { + if (ov16_02269348(battleInput) == 0) { break; } @@ -3439,7 +3439,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) v6.unk_20 = v0->unk_0E; v6.unk_21 = ov16_02269368(v0->unk_30, v0->unk_0E); - ov16_02268C04(v8, v9, v2, 12, 0, &v6); + ov16_02268C04(v8, v9, battleInput, 12, 0, &v6); NARC_dtor(v8); NARC_dtor(v9); } @@ -3447,7 +3447,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) v0->unk_0F++; break; case 1: - v0->unk_08 = ov16_0226925C(v2); + v0->unk_08 = BattleInput_CheckTouch(battleInput); if (v0->unk_08 != 0xffffffff) { Sound_PlayEffect(1501); @@ -3462,7 +3462,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) ov16_0226846C(v4); if (v0->unk_32 == 1) { - ov16_0226BCCC(v2, 0); + ov16_0226BCCC(battleInput, 0); } } @@ -3472,14 +3472,14 @@ static void ov16_02260F14(SysTask *param0, void *param1) case 3: v0->unk_0F++; default: - if (ov16_0226BCD0(v2) == 1) { + if (ov16_0226BCD0(battleInput) == 1) { { u8 v10[6]; u32 v11; int v12; v12 = v0->unk_08; - v11 = BattleSystem_BattleType(v0->unk_00); + v11 = BattleSystem_GetBattleType(v0->unk_00); if (v12 != 0xff) { ov16_0223F858(v0->unk_00, &v10[0]); @@ -3584,11 +3584,11 @@ static void ov16_022611DC(SysTask *param0, void *param1) UnkStruct_ov16_0225D794 *v0 = (UnkStruct_ov16_0225D794 *)param1; PaletteData *v1; - v1 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetPaletteData(v0->unk_00); switch (v0->unk_0E) { case 0: - v0->unk_10 = ov16_0226CD08(ov16_0223E02C(v0->unk_00)); + v0->unk_10 = ov16_0226CD08(BattleSystem_GetBattleInput(v0->unk_00)); sub_02015738(ov16_0223E220(v0->unk_00), 1); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 0, 7, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 0, 16, 0x0); @@ -3650,7 +3650,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) Party *v5 = BattleSystem_Party(v0->unk_00, v0->unk_0D); Pokemon *v6; - if ((BattleSystem_BattleType(v0->unk_00) & 0x2) && ((BattleSystem_BattleType(v0->unk_00) & 0x8) == 0)) { + if ((BattleSystem_GetBattleType(v0->unk_00) & 0x2) && ((BattleSystem_GetBattleType(v0->unk_00) & 0x8) == 0)) { v4 = v0->unk_0D & 1; } else { v4 = v0->unk_0D; @@ -3702,7 +3702,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) break; case 6: ov16_0223B430(v0->unk_00); - ov16_0226CD10(ov16_0223E02C(v0->unk_00), v0->unk_10); + ov16_0226CD10(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_10); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 7, 0, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 16, 0, 0x0); v0->unk_0E++; @@ -3718,7 +3718,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) case 1: if ((v0->unk_04->unk_1C == 28) || (v0->unk_04->unk_1C == 29)) { v0->unk_0E = 8; - } else if (((v0->unk_08->unk_04->unk_11 < 2) && ((BattleSystem_BattleType(v0->unk_00) == (0x2 | 0x1)) || (BattleSystem_BattleType(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) { + } else if (((v0->unk_08->unk_04->unk_11 < 2) && ((BattleSystem_GetBattleType(v0->unk_00) == (0x2 | 0x1)) || (BattleSystem_GetBattleType(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) { if (v0->unk_04->unk_1C == 23) { if (BattleSystem_AnimationsOn(v0->unk_00) == 1) { v0->unk_12 = 17; @@ -3739,7 +3739,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) } break; case 0: - if ((((v0->unk_08->unk_04->unk_11 < 2) && ((BattleSystem_BattleType(v0->unk_00) == (0x2 | 0x1)) || (BattleSystem_BattleType(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) && (Item_LoadParam(v0->unk_04->unk_1C, 38, 5))) { + if ((((v0->unk_08->unk_04->unk_11 < 2) && ((BattleSystem_GetBattleType(v0->unk_00) == (0x2 | 0x1)) || (BattleSystem_GetBattleType(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) && (Item_LoadParam(v0->unk_04->unk_1C, 38, 5))) { if (BattleSystem_AnimationsOn(v0->unk_00) == 1) { v0->unk_12 = 17; } else { @@ -3929,7 +3929,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) v18 = ov16_0223F35C(v0->unk_00, v20); MI_CpuClear8(&v18->state, sizeof(u8)); - v18->type = Healthbar_Type(BattleSystem_BattlerSlot(v0->unk_00, v20), BattleSystem_BattleType(v0->unk_00)); + v18->type = Healthbar_Type(BattleSystem_BattlerSlot(v0->unk_00, v20), BattleSystem_GetBattleType(v0->unk_00)); v19 = BattleSystem_PartyPokemon(v0->unk_00, v20, v21); v18->curHP = Pokemon_GetValue(v19, MON_DATA_CURRENT_HP, NULL) - v0->unk_08->unk_04->unk_20; @@ -4170,7 +4170,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) UnkStruct_ov16_0225D840 *v0 = (UnkStruct_ov16_0225D840 *)param1; PaletteData *v1; - v1 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetPaletteData(v0->unk_00); switch (v0->unk_0A) { case 0: @@ -4182,7 +4182,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) Window_LoadTiles(v2); } - v0->unk_17 = ov16_0226CD08(ov16_0223E02C(v0->unk_00)); + v0->unk_17 = ov16_0226CD08(BattleSystem_GetBattleInput(v0->unk_00)); sub_02015738(ov16_0223E220(v0->unk_00), 1); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 0, 7, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 0, 16, 0x0); @@ -4203,7 +4203,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) v0->unk_04 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov13_0221FC20)); v0->unk_04->unk_00 = Party_New(5); - if (((BattleSystem_BattleType(v0->unk_00) & (0x4 | 0x8)) == (0x4 | 0x8)) || (BattleSystem_BattleType(v0->unk_00) == (((0x2 | 0x1) | 0x8 | 0x40) | 0x80))) { + if (((BattleSystem_GetBattleType(v0->unk_00) & (0x4 | 0x8)) == (0x4 | 0x8)) || (BattleSystem_GetBattleType(v0->unk_00) == (((0x2 | 0x1) | 0x8 | 0x40) | 0x80))) { if (BattleSystem_BattlerSlot(v0->unk_00, v0->unk_09) == 2) { v6 = v0->unk_09; v7 = BattleSystem_Partner(v0->unk_00, v0->unk_09); @@ -4240,7 +4240,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) v0->unk_04->unk_11 = 0; } } else { - if ((BattleSystem_BattleType(v0->unk_00) & 0x2) && ((BattleSystem_BattleType(v0->unk_00) & 0x8) == 0)) { + if ((BattleSystem_GetBattleType(v0->unk_00) & 0x2) && ((BattleSystem_GetBattleType(v0->unk_00) & 0x8) == 0)) { v5 = v0->unk_09 & 1; } else { v5 = v0->unk_09; @@ -4277,7 +4277,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) v0->unk_04->unk_14 = 6; } - if (BattleSystem_BattleType(v0->unk_00) & 0x8) { + if (BattleSystem_GetBattleType(v0->unk_00) & 0x8) { v0->unk_04->unk_15 = 6; } else if ((v0->unk_18 & FlagIndex(BattleSystem_Partner(v0->unk_00, v0->unk_09))) == 0) { v0->unk_04->unk_15 = v0->unk_0C[BattleSystem_Partner(v0->unk_00, v0->unk_09)]; @@ -4293,7 +4293,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) case 2: if (v0->unk_04->unk_36) { ov16_0223B430(v0->unk_00); - ov16_0226CD10(ov16_0223E02C(v0->unk_00), v0->unk_04->unk_32); + ov16_0226CD10(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_04->unk_32); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 7, 0, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 16, 0, 0x0); v0->unk_0A++; @@ -4328,7 +4328,7 @@ static void ov16_02262258(SysTask *param0, void *param1) int v4, v5; u32 v6; - v6 = BattleSystem_BattleType(v0->unk_00); + v6 = BattleSystem_GetBattleType(v0->unk_00); v4 = v0->unk_09; if ((v6 & 0x10) || (v6 & 0x8)) { @@ -4419,8 +4419,8 @@ static void ov16_0226232C(SysTask *param0, void *param1) static void ov16_022623F0(SysTask *param0, void *param1) { UnkStruct_ov16_0225D8AC *v0 = param1; - BgConfig *v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 *v2 = ov16_0223E02C(v0->unk_00); + BgConfig *v1 = BattleSystem_GetBgConfig(v0->unk_00); + BattleInput *battleInput = BattleSystem_GetBattleInput(v0->unk_00); int v3; Healthbar *v4; BattlerData *v5; @@ -4436,7 +4436,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) switch (v0->unk_0E) { case 0: - if (ov16_02269348(v2) == 0) { + if (ov16_02269348(battleInput) == 0) { break; } @@ -4469,26 +4469,26 @@ static void ov16_022623F0(SysTask *param0, void *param1) NARC *v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); UnkStruct_ov16_022623F0 v11; - ov16_02269218(v2); + ov16_02269218(battleInput); v11.unk_00 = v0->unk_18; switch (v0->unk_0F) { case 0: case 5: - ov16_02268C04(v9, v10, v2, 13, 0, &v11); + ov16_02268C04(v9, v10, battleInput, 13, 0, &v11); break; case 1: - ov16_02268C04(v9, v10, v2, 14, 0, &v11); + ov16_02268C04(v9, v10, battleInput, 14, 0, &v11); break; case 2: - ov16_02268C04(v9, v10, v2, 15, 0, &v11); + ov16_02268C04(v9, v10, battleInput, 15, 0, &v11); break; case 3: - ov16_02268C04(v9, v10, v2, 16, 0, &v11); + ov16_02268C04(v9, v10, battleInput, 16, 0, &v11); break; case 4: - ov16_02268C04(v9, v10, v2, 17, 0, &v11); + ov16_02268C04(v9, v10, battleInput, 17, 0, &v11); break; default: GF_ASSERT(0); @@ -4503,7 +4503,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) } break; case 2: - v0->unk_08 = ov16_0226925C(v2); + v0->unk_08 = BattleInput_CheckTouch(battleInput); if (v0->unk_08 != 0xffffffff) { Sound_PlayEffect(1501); @@ -4511,7 +4511,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) } break; case 3: - if (ov16_02269348(v2) == 1) { + if (ov16_02269348(battleInput) == 1) { { NARC *v12 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v13 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -4519,11 +4519,11 @@ static void ov16_022623F0(SysTask *param0, void *param1) ov16_022675AC(v0->unk_04); ov16_022647D8(v5); ov16_0226846C(v4); - ov16_02269218(v2); - ov16_02268C04(v12, v13, v2, 0, 0, NULL); + ov16_02269218(battleInput); + ov16_02268C04(v12, v13, battleInput, 0, 0, NULL); if (v0->unk_08 == 1) { - ov16_0226BCCC(v2, 0); + ov16_0226BCCC(battleInput, 0); } v0->unk_0E = 4; @@ -4534,7 +4534,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) } break; case 4: - if (ov16_0226BCD0(v2) == 1) { + if (ov16_0226BCD0(battleInput) == 1) { ov16_022656D4(v0->unk_00, v0->unk_0D, v0->unk_08); ClearCommand(v0->unk_00, v0->unk_0D, v0->unk_0C); Heap_FreeToHeap(param1); @@ -4902,7 +4902,7 @@ static void ov16_02262D28(SysTask *param0, void *param1) PaletteData *v1; UnkStruct_02007768 *v2; - v1 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetPaletteData(v0->unk_00); v2 = ov16_0223E000(v0->unk_00); switch (v0->unk_06) { @@ -5109,8 +5109,8 @@ static void ov16_02263014(SysTask *param0, void *param1) int v3; int v4; - v1 = BattleSystem_BGL(v0->unk_00); - v2 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetBgConfig(v0->unk_00); + v2 = BattleSystem_GetPaletteData(v0->unk_00); v3 = BattleSystem_Terrain(v0->unk_00); v4 = Unk_ov16_0226F1D0[ov16_0223E240(v0->unk_00)]; @@ -5174,11 +5174,11 @@ static void ov16_02263014(SysTask *param0, void *param1) if (v0->unk_15 == 28) { MI_CpuCopy16(ov16_0223F204(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 0), 0x20 * 7); - if (BattleSystem_BattleType(v0->unk_00) == (0x2 | 0x8 | 0x40)) { + if (BattleSystem_GetBattleType(v0->unk_00) == (0x2 | 0x8 | 0x40)) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 5); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x2) { + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x2) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 7); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x1) { + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x1) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 5); } else { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 4); @@ -5212,11 +5212,11 @@ static void ov16_02263014(SysTask *param0, void *param1) case 5: MI_CpuCopy16(ov16_0223F204(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 0), 0x20 * 7); - if (BattleSystem_BattleType(v0->unk_00) == (0x2 | 0x8 | 0x40)) { + if (BattleSystem_GetBattleType(v0->unk_00) == (0x2 | 0x8 | 0x40)) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 5); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x2) { + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x2) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 7); - } else if (BattleSystem_BattleType(v0->unk_00) & 0x1) { + } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x1) { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 5); } else { MI_CpuCopy16(ov16_0223F210(v0->unk_00), PaletteData_GetUnfadedBuffer(v2, 2), 0x20 * 4); @@ -5235,7 +5235,7 @@ static void ov16_022633A4(SysTask *param0, void *param1) UnkStruct_ov16_0225E0BC *v0 = (UnkStruct_ov16_0225E0BC *)param1; PaletteData *v1; - v1 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetPaletteData(v0->unk_00); switch (v0->unk_0A) { case 0: @@ -5462,7 +5462,7 @@ static void ov16_022636D4(SysTask *param0, void *param1) void ov16_02263730(BattleSystem *param0, BattlerData *param1) { - u32 v0 = BattleSystem_BattleType(param0); + u32 v0 = BattleSystem_GetBattleType(param0); u32 v1 = BattleSystem_BattleStatus(param0); if (v0 & 0x40) { @@ -5740,7 +5740,7 @@ static Sprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, A static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2, BattleMessage *param3) { if (param1->battlerType & 0x1) { - if (BattleSystem_BattleType(param0) & 0x4) { + if (BattleSystem_GetBattleType(param0) & 0x4) { param3->id = 990; param3->tags = 27; param3->params[0] = param1->battler; @@ -5753,7 +5753,7 @@ static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_o param3->params[2] = param1->battler | (param2->unk_01 << 8); } } else { - if (((BattleSystem_BattleType(param0) & 0x2) == 0) && ((BattleSystem_BattleType(param0) & 0x4) == 0)) { + if (((BattleSystem_GetBattleType(param0) & 0x2) == 0) && ((BattleSystem_GetBattleType(param0) & 0x4) == 0)) { if (param2->unk_02 == 0) { param3->id = 984; } else if (param2->unk_02 < 25) { @@ -5777,7 +5777,7 @@ static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_o static void ov16_02263CF0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2, BattleMessage *param3) { if (param1->battlerType & 0x1) { - if ((BattleSystem_BattleType(param0) & 0x4) == 0) { + if ((BattleSystem_GetBattleType(param0) & 0x4) == 0) { param3->id = 972; param3->tags = 50; param3->params[0] = param1->battler; @@ -5790,7 +5790,7 @@ static void ov16_02263CF0(BattleSystem *param0, BattlerData *param1, UnkStruct_o param3->params[1] = param1->battler | (param2->unk_01 << 8); } } else { - if (((BattleSystem_BattleType(param0) & 0x2) == 0) && ((BattleSystem_BattleType(param0) & 0x4) == 0)) { + if (((BattleSystem_GetBattleType(param0) & 0x2) == 0) && ((BattleSystem_GetBattleType(param0) & 0x4) == 0)) { if (param2->unk_02 < 100) { param3->id = 982; } else if (param2->unk_02 < 325) { @@ -5817,7 +5817,7 @@ static void ov16_02263DD0(BattleSystem *param0, BattlerData *param1, BattleMessa int v1; int v2; - v0 = BattleSystem_BattleType(param0); + v0 = BattleSystem_GetBattleType(param0); if (v0 & 0x2) { v1 = BattleSystem_BattlerOfType(param0, 3); @@ -5868,7 +5868,7 @@ static void ov16_02263E7C(BattleSystem *param0, BattlerData *param1, UnkStruct_o int v1; int v2; - v0 = BattleSystem_BattleType(param0); + v0 = BattleSystem_GetBattleType(param0); if (param1->battlerType & 0x1) { if (v0 & 0x2) { @@ -6016,7 +6016,7 @@ static void ov16_022641B4(BattleSystem *param0, BattlerData *param1, BattleMessa int v2; int v3; - v0 = BattleSystem_BattleType(param0); + v0 = BattleSystem_GetBattleType(param0); v3 = BattleSystem_ResultMask(param0); if (v0 & 0x2) { @@ -6092,12 +6092,12 @@ static void ov16_02264270(BattleSystem *param0, BattlerData *param1, UnkStruct_o param3->tags = 0; BattleSystem_SetResultFlag(param0, 0x2 | 0x80 | 0x40); } else { - if (BattleSystem_BattleType(param0) & 0x8) { + if (BattleSystem_GetBattleType(param0) & 0x8) { param3->id = 792; param3->tags = 26; param3->params[0] = BattleSystem_BattlerOfType(param0, 3); param3->params[1] = BattleSystem_BattlerOfType(param0, 5); - } else if (BattleSystem_BattleType(param0) & 0x2) { + } else if (BattleSystem_GetBattleType(param0) & 0x2) { param3->id = 791; param3->tags = 8; param3->params[0] = BattleSystem_BattlerOfType(param0, 3); @@ -6116,7 +6116,7 @@ static void ov16_02264360(BattleSystem *param0, BattlerData *param1, BattleMessa param2->id = 956; param2->tags = 8; - if (BattleSystem_BattleType(param0) & 0x4) { + if (BattleSystem_GetBattleType(param0) & 0x4) { if (ov16_0223F6F0(param0, ov16_0223F6E4(param0))) { param2->params[0] = BattleSystem_BattlerOfType(param0, 4); } else { @@ -6139,7 +6139,7 @@ static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2 v0 = ov16_0223E010(param0); v1 = ov16_0223E018(param0); - v2 = BattleSystem_PaletteSys(param0); + v2 = BattleSystem_GetPaletteData(param0); if (param1 & 0x1) { v4 = 2; @@ -6166,8 +6166,8 @@ static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_o v2 = param3->unk_50; } - v0.unk_04 = BattleSystem_BGL(param0); - v0.unk_08 = BattleSystem_PaletteSys(param0); + v0.unk_04 = BattleSystem_GetBgConfig(param0); + v0.unk_08 = BattleSystem_GetPaletteData(param0); v0.unk_00 = ov16_0223E010(param0); for (i = 0; i < 4; i++) { @@ -6183,7 +6183,7 @@ static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_o ov16_0223F87C(param0, &(v0.unk_1C[0])); ov16_0223F8AC(param0, &(v0.unk_20[0])); - v0.unk_30 = BattleSystem_BattleType(param0); + v0.unk_30 = BattleSystem_GetBattleType(param0); v0.unk_6C = BattleSystem_ChatotVoice(param0, param1->battler); v0.unk_70 = ov16_0223F1E8(param0); v0.unk_74 = ov16_0223F1F0(param0); @@ -6334,7 +6334,7 @@ static void ov16_0226474C(BattleSystem *param0) static u8 ov16_02264768(BattleSystem *param0, u8 param1, u8 param2) { - if (BattleSystem_BattleType(param0) & 0x4) { + if (BattleSystem_GetBattleType(param0) & 0x4) { if ((TrainerInfo_GameCode(BattleSystem_TrainerInfo(param0, param1)) == 0) && (param2 <= 1)) { param2 += 103; } diff --git a/src/battle/ov16_0226871C.c b/src/battle/battle_input.c similarity index 57% rename from src/battle/ov16_0226871C.c rename to src/battle/battle_input.c index df764b4952..aeb0de6c2c 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/battle_input.c @@ -1,4 +1,4 @@ -#include "battle/ov16_0226871C.h" +#include "battle/battle_input.h" #include #include @@ -62,7 +62,7 @@ #include "unk_0208C098.h" typedef struct { - UnkStruct_ov16_02268A14 *unk_00; + BattleInput *battleInput; SysTask *unk_04; s16 unk_08; s16 unk_0A; @@ -194,8 +194,8 @@ typedef struct { UnkStruct_ov16_0226AEA0 unk_C8[4]; } UnkStruct_ov16_0226ABD4; -typedef struct UnkStruct_ov16_02268A14_t { - BattleSystem *unk_00; +struct BattleInput_t { + BattleSystem *battleSystem; u8 *unk_04; SysTask *unk_08; SysTask *unk_0C; @@ -237,17 +237,17 @@ typedef struct UnkStruct_ov16_02268A14_t { s32 unk_6AC; s32 unk_6B0; s32 unk_6B4; - UnkStruct_ov16_0226DC24 *unk_6B8; + BattleCursor *cursor; UnkStruct_ov16_0226CB10 unk_6BC; u8 unk_6C0; u8 unk_6C1; struct { - UnkStruct_ov16_0226DEEC *unk_00; + CatchingTutorialFinger *finger; u8 unk_04; u8 unk_05; u8 unk_06; - } unk_6C4; -} UnkStruct_ov16_02268A14; + } catchingTutorial; +}; typedef struct { u16 unk_00; @@ -273,98 +273,98 @@ typedef struct { const TouchScreenRect *unk_14; const int *unk_18; const u8 *unk_1C; - int (*unk_20)(UnkStruct_ov16_02268A14 *param0, int param1); - void (*unk_24)(UnkStruct_ov16_02268A14 *param0, int param1); - void (*unk_28)(UnkStruct_ov16_02268A14 *param0, int param1, int param2); - int (*unk_2C)(UnkStruct_ov16_02268A14 *param0, int param1, int param2); + int (*unk_20)(BattleInput *battleInput, int param1); + void (*unk_24)(BattleInput *battleInput, int param1); + void (*unk_28)(BattleInput *battleInput, int param1, int param2); + int (*unk_2C)(BattleInput *battleInput, int param1, int param2); } UnkStruct_ov16_02270670; -static void *ov16_0226871C(void); -static void ov16_02269654(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_022698A8(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269924(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226AFF4(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226B028(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226B2BC(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1); -static void ov16_0226B2F0(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226A4A4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static int ov16_0226A634(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269C7C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269D14(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226B06C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226B088(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1); +static void *BattleInput_New(void); +static void ov16_02269654(BattleInput *battleInput, int param1, int param2); +static void ov16_02269668(BattleInput *battleInput, int param1, int param2); +static void ov16_022698A8(BattleInput *battleInput, int param1, int param2); +static void ov16_022698BC(BattleInput *battleInput, int param1, int param2); +static void ov16_02269924(BattleInput *battleInput, int param1, int param2); +static void ov16_02269938(BattleInput *battleInput, int param1, int param2); +static void ov16_02269E94(BattleInput *battleInput, int param1, int param2); +static int ov16_0226A318(BattleInput *battleInput, int param1, int param2); +static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2); +static void ov16_022699AC(BattleInput *battleInput, int param1, int param2); +static void ov16_0226AF0C(BattleInput *battleInput); +static void ov16_0226AFF4(BattleInput *battleInput); +static void ov16_0226B028(BattleInput *battleInput); +static void ov16_0226B2BC(SysTaskFunc param0, BattleInput *battleInput); +static void ov16_0226B2F0(BattleInput *battleInput); +static int ov16_0226A4A4(BattleInput *battleInput, int param1, int param2); +static int ov16_0226A634(BattleInput *battleInput, int param1, int param2); +static int ov16_0226A528(BattleInput *battleInput, int param1, int param2); +static void ov16_02269C7C(BattleInput *battleInput, int param1, int param2); +static void ov16_02269D14(BattleInput *battleInput, int param1, int param2); +static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2); +static void ov16_02269F68(BattleInput *battleInput, int param1, int param2); +static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2); +static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2); +static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2); +static void ov16_0226B088(BattleInput *battleInput, int param1); +static void ov16_0226B0DC(BattleInput *battleInput, int param1); static int ov16_0226A934(u8 param0); -static void ov16_02268F00(UnkStruct_ov16_02268A14 *param0); -void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]); -void ov16_022691BC(UnkStruct_ov16_02268A14 *param0); -void ov16_02269218(UnkStruct_ov16_02268A14 *param0); +static void ov16_02268F00(BattleInput *battleInput); +void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]); +void ov16_022691BC(BattleInput *battleInput); +void ov16_02269218(BattleInput *battleInput); static void ov16_0226BC50(SysTask *param0, void *param1); static void ov16_0226B198(void); static void ov16_0226BCBC(SysTask *param0, void *param1); -static void ov16_0226B1C4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); -static void ov16_0226B1E8(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2); +static void ov16_0226B1E8(BattleInput *battleInput); static void ov16_0226B390(SysTask *param0, void *param1); static void ov16_0226B4E0(SysTask *param0, void *param1); static void ov16_0226B780(SysTask *param0, void *param1); -static void ov16_0226B264(UnkStruct_ov16_02268A14 *param0, int param1, u8 *param2, int param3); -static void ov16_0226B20C(UnkStruct_ov16_02268A14 *param0, u8 *param1, int param2); -static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1); -void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int param3); +static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2); +static void ov16_0226B318(BattleInput *battleInput, int param1); +void ov16_0226947C(BattleInput *battleInput, int param1, int param2); static void ov16_022694A8(SysTask *param0, void *param1); -static void ov16_0226B314(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10); -static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0); -static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0); -static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5); +static void ov16_0226B314(BattleInput *battleInput, int param1); +static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10); +static void ov16_0226AAC0(BattleInput *battleInput); +static void ov16_0226A698(BattleInput *battleInput); +static void ov16_0226A718(BattleInput *battleInput); +static void ov16_0226A768(BattleInput *battleInput); +static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5); static void ov16_0226A928(SysTask *param0, void *param1); static void ov16_0226B988(SysTask *param0, void *param1); static void ov16_0226BA88(SysTask *param0, void *param1); static void ov16_0226BB94(void *param0); static TextColor ov16_0226B924(int param0, int param1); -void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1); -BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0); +void ov16_0226BCCC(BattleInput *battleInput, int param1); +BOOL ov16_0226BCD0(BattleInput *battleInput); static void ov16_0226BCE4(SysTask *param0, void *param1); static void ov16_02268FCC(SysTask *param0, void *param1); -static int ov16_0226BE48(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1); -static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1); -static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1); -static int ov16_0226CA14(UnkStruct_ov16_02268A14 *param0, int param1); +static int ov16_0226BE48(BattleInput *battleInput); +static int ov16_0226BEC0(BattleInput *battleInput, int param1); +static int ov16_0226C1F8(BattleInput *battleInput, int param1); +static int ov16_0226C3C8(BattleInput *battleInput, int param1); +static int ov16_0226CA14(BattleInput *battleInput, int param1); static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2, const u8 *param3); -static void ov16_0226C0A0(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4); -static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(UnkStruct_ov16_02268A14 *param0, int param1); -static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226C0A0(BattleInput *battleInput, int param1); +static void ov16_0226C378(BattleInput *battleInput, int param1); +static void ov16_0226C9B8(BattleInput *battleInput, int param1); +static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4); +static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(BattleInput *battleInput, int param1); +static void ov16_0226ABE8(BattleInput *battleInput); static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3); -static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4); -static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4); +static void ov16_0226AAF8(BattleInput *battleInput); +static int ov16_0226C100(BattleInput *battleInput, int param1); static void ov16_0226BD74(SysTask *param0, void *param1); -static int ov16_0226CD18(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226CD84(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226CDDC(UnkStruct_ov16_02268A14 *param0); -static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0); -static void inline_ov16_0226B314(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1); +static int ov16_0226CD18(BattleInput *battleInput); +static int ov16_0226CD84(BattleInput *battleInput); +static int ov16_0226CDDC(BattleInput *battleInput); +static int ov16_0226CE34(BattleInput *battleInput); +static void inline_ov16_0226B314(SysTaskFunc param0, BattleInput *battleInput); static void inline_ov16_0226B318_1(SysTask *param0, void *param1); -static void inline_ov16_0226B318_1_sub(UnkStruct_ov16_02268A14 *param0); +static void inline_ov16_0226B318_1_sub(BattleInput *battleInput); static void inline_ov16_0226B314_1(SysTask *param0, void *param1); __attribute__((aligned(4))) static const u16 Unk_ov16_02270264[] = { @@ -1016,234 +1016,210 @@ static const struct { { 0xFFFF, 0xFFFF }, }; -static void *ov16_0226871C(void) +static void *BattleInput_New(void) { - UnkStruct_ov16_02268A14 *v0; - - v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_02268A14)); - MI_CpuClear8(v0, sizeof(UnkStruct_ov16_02268A14)); - v0->unk_66B = -1; + BattleInput *battleInput = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleInput)); + MI_CpuClear8(battleInput, sizeof(BattleInput)); + battleInput->unk_66B = -1; - return v0; + return battleInput; } -void ov16_02268744(BgConfig *param0) +void ov16_02268744(BgConfig *bgConfig) { - int i; - - for (i = 0; i < NELEMS(Unk_ov16_02270540); i++) { - Bg_InitFromTemplate(param0, 4 + i, &Unk_ov16_02270540[i], 0); - Bg_FillTilemap(param0, 4 + i, (0x6000 / 0x20 - 1)); - Bg_SetOffset(param0, 4 + i, 0, 0); - Bg_SetOffset(param0, 4 + i, 3, 0); + for (int i = 0; i < NELEMS(Unk_ov16_02270540); i++) { + Bg_InitFromTemplate(bgConfig, 4 + i, &Unk_ov16_02270540[i], 0); + Bg_FillTilemap(bgConfig, 4 + i, (0x6000 / 0x20 - 1)); + Bg_SetOffset(bgConfig, 4 + i, 0, 0); + Bg_SetOffset(bgConfig, 4 + i, 3, 0); } } -void ov16_022687A0(BgConfig *param0) +void ov16_022687A0(BgConfig *bgConfig) { - int i; - - for (i = 0; i < NELEMS(Unk_ov16_02270540); i++) { + for (int i = 0; i < NELEMS(Unk_ov16_02270540); i++) { Bg_ToggleLayer(4 + i, 0); - Bg_FreeTilemapBuffer(param0, 4 + i); + Bg_FreeTilemapBuffer(bgConfig, 4 + i); } } -void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4) +void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem, int gender, u8 *param4) { - UnkStruct_ov16_02268A14 *v0; - PaletteData *v1; + BattleInput *battleInput; + PaletteData *palette; int v2; - v0 = ov16_0226871C(); - v0->unk_00 = param2; - v0->unk_66D = param3; - v0->unk_04 = param4; + battleInput = BattleInput_New(); + battleInput->battleSystem = battleSystem; + battleInput->unk_66D = gender; + battleInput->unk_04 = param4; - if (v0->unk_04 != NULL) { - v0->unk_6C0 = *param4; - } else { - (void)0; + if (battleInput->unk_04 != NULL) { + battleInput->unk_6C0 = *param4; } - v1 = BattleSystem_PaletteSys(param2); - v2 = ov16_0223E240(param2); + palette = BattleSystem_GetPaletteData(battleSystem); + v2 = ov16_0223E240(battleSystem); if (v2 >= NELEMS(Unk_ov16_022704E4)) { v2 = 0; GF_ASSERT(0); } - v0->unk_4C8 = sub_02012744(13, 5); - v0->unk_678 = SysTask_Start(ov16_0226BCE4, v0, 1310); + battleInput->unk_4C8 = sub_02012744(13, 5); + battleInput->unk_678 = SysTask_Start(ov16_0226BCE4, battleInput, 1310); - { - NNSG2dScreenData *v3; - void *v4; - int i; - int v6; + NNSG2dScreenData *screenData; + void *v4; + int i; + int v6; - for (i = 0; i < 7; i++) { - v0->unk_3C[i] = Heap_AllocFromHeap(5, 0x800); + for (i = 0; i < 7; i++) { + battleInput->unk_3C[i] = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x800); - if ((BattleSystem_BattleType(param2) & 0x80) && (Unk_ov16_02270264[i] == 49)) { - v6 = 170; - } else { - v6 = Unk_ov16_02270264[i]; - } + if ((BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) && (Unk_ov16_02270264[i] == 49)) { + v6 = 170; + } else { + v6 = Unk_ov16_02270264[i]; + } - v4 = Graphics_GetScrnData(7, v6, 1, &v3, 5); + v4 = Graphics_GetScrnData(7, v6, 1, &screenData, HEAP_ID_BATTLE); - MI_CpuCopy32(v3->rawData, v0->unk_3C[i], 0x800); - Heap_FreeToHeap(v4); - } + MI_CpuCopy32(screenData->rawData, battleInput->unk_3C[i], 0x800); + Heap_FreeToHeap(v4); } - { - u16 *v7; - int v8; - - v8 = (BattleSystem_BattleType(param2) & 0x80) ? 340 : 242; - v0->unk_58 = Heap_AllocFromHeap(5, 0x200); + u16 *v7; + int v8; - PaletteData_LoadBufferFromFileStart(v1, 7, v8, 5, 1, 0, 0); + v8 = (BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) ? 340 : 242; + battleInput->unk_58 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x200); - if (Unk_ov16_022704E4[v2].unk_00 != 0xffff) { - PaletteData_LoadBufferFromFileStart(v1, 7, Unk_ov16_022704E4[v2].unk_00, 5, 1, 0x20, 0); - } + PaletteData_LoadBufferFromFileStart(palette, 7, v8, 5, 1, 0, 0); - v7 = PaletteData_GetUnfadedBuffer(v1, 1); - MI_CpuCopy16(v7, v0->unk_58, 0x200); + if (Unk_ov16_022704E4[v2].unk_00 != 0xffff) { + PaletteData_LoadBufferFromFileStart(palette, 7, Unk_ov16_022704E4[v2].unk_00, 5, 1, 0x20, 0); } - { - int i; + v7 = PaletteData_GetUnfadedBuffer(palette, 1); + MI_CpuCopy16(v7, battleInput->unk_58, 0x200); - for (i = 0; i < 4; i++) { - MI_CpuFill8(&v0->unk_68[i].unk_00, 0xff, sizeof(MoveDisplayInfo)); - } + for (int i = 0; i < 4; i++) { + MI_CpuFill8(&battleInput->unk_68[i].unk_00, 0xff, sizeof(MoveDisplayInfo)); } - { - int i, j; - - for (i = 0; i < 4; i++) { - for (j = 0; j < 4; j++) { - v0->unk_68[i].unk_18[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); - } + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + battleInput->unk_68[i].unk_18[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); } } - { - NNSG2dPaletteData *v13; - void *v14; - int v15; + NNSG2dPaletteData *v13; + void *v14; + int v15; - v0->unk_5C = Heap_AllocFromHeap(5, 0x40); - v0->unk_60 = Heap_AllocFromHeap(5, 0x40); + battleInput->unk_5C = Heap_AllocFromHeap(5, 0x40); + battleInput->unk_60 = Heap_AllocFromHeap(5, 0x40); - MI_CpuCopy16(v0->unk_58, v0->unk_5C, 0x20); - MI_CpuCopy16(&v0->unk_58[7 * 16], &v0->unk_5C[16 * 1], 0x20); + MI_CpuCopy16(battleInput->unk_58, battleInput->unk_5C, 0x20); + MI_CpuCopy16(&battleInput->unk_58[7 * 16], &battleInput->unk_5C[16 * 1], 0x20); - if (BattleSystem_BattleType(param2) & 0x80) { - v15 = 341; - } else if (Unk_ov16_022704E4[v2].unk_02 != 0xffff) { - v15 = Unk_ov16_022704E4[v2].unk_02; - } else { - v15 = 267; - } + if (BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) { + v15 = 341; + } else if (Unk_ov16_022704E4[v2].unk_02 != 0xffff) { + v15 = Unk_ov16_022704E4[v2].unk_02; + } else { + v15 = 267; + } - v14 = Graphics_GetPlttData(7, v15, &v13, 5); + v14 = Graphics_GetPlttData(7, v15, &v13, 5); - if (BattleSystem_BattleType(param2) & 0x80) { - MI_CpuCopy16(v13->pRawData, v0->unk_60, 0x40); - } else { - MI_CpuCopy16(v13->pRawData, v0->unk_60, 0x20); - } + if (BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) { + MI_CpuCopy16(v13->pRawData, battleInput->unk_60, 0x40); + } else { + MI_CpuCopy16(v13->pRawData, battleInput->unk_60, 0x20); + } - Heap_FreeToHeap(v14); - RenderControlFlags_ZeroSpeedUpBattle(); - RenderControlFlags_ZeroWaitBattle(); + Heap_FreeToHeap(v14); + RenderControlFlags_ZeroSpeedUpBattle(); + RenderControlFlags_ZeroWaitBattle(); - v0->unk_64 = SysTask_Start(ov16_0226BD74, v0, 55000); - } + battleInput->unk_64 = SysTask_Start(ov16_0226BD74, battleInput, 55000); - return v0; + return battleInput; } -void ov16_02268A14(UnkStruct_ov16_02268A14 *param0) +void BattleInput_Free(BattleInput *battleInput) { int i; - if (param0->unk_04 != NULL) { - *param0->unk_04 = param0->unk_6C0; + if (battleInput->unk_04 != NULL) { + *battleInput->unk_04 = battleInput->unk_6C0; } - ov16_0226B1E8(param0); - ov16_02268F00(param0); - ov16_02268B8C(param0); + ov16_0226B1E8(battleInput); + ov16_02268F00(battleInput); + ov16_02268B8C(battleInput); - sub_020127BC(param0->unk_4C8); - SysTask_Done(param0->unk_678); + sub_020127BC(battleInput->unk_4C8); + SysTask_Done(battleInput->unk_678); for (i = 0; i < 7; i++) { - Heap_FreeToHeap(param0->unk_3C[i]); + Heap_FreeToHeap(battleInput->unk_3C[i]); } - Heap_FreeToHeap(param0->unk_58); - ov16_0226ABE8(param0); - Heap_FreeToHeap(param0->unk_5C); - Heap_FreeToHeap(param0->unk_60); - SysTask_Done(param0->unk_64); - Heap_FreeToHeap(param0); + Heap_FreeToHeap(battleInput->unk_58); + ov16_0226ABE8(battleInput); + Heap_FreeToHeap(battleInput->unk_5C); + Heap_FreeToHeap(battleInput->unk_60); + SysTask_Done(battleInput->unk_64); + Heap_FreeToHeap(battleInput); } -void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) +void ov16_02268A88(BattleInput *battleInput) { - BgConfig *v0; - SpriteRenderer *v1; + BgConfig *bgConfig; + SpriteRenderer *spriteRenderer; SpriteGfxHandler *v2; PaletteData *v3; int i; - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); - v0 = BattleSystem_BGL(param0->unk_00); - v3 = BattleSystem_PaletteSys(param0->unk_00); - - { - int v5; + spriteRenderer = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); - if (BattleSystem_BattleType(param0->unk_00) & 0x80) { - v5 = 169; - } else { - v5 = 28; - } + int v5; - Graphics_LoadTilesToBgLayer(7, v5, v0, 4, 0, 0x6000, 1, 5); + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_FRONTIER) { + v5 = 169; + } else { + v5 = 28; } - sub_0207C9EC(v1, v2, 20017, 20017); - sub_0207C9B0(BattleSystem_PaletteSys(param0->unk_00), 3, v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); + Graphics_LoadTilesToBgLayer(7, v5, bgConfig, 4, 0, 0x6000, 1, HEAP_ID_BATTLE); + + sub_0207C9EC(spriteRenderer, v2, 20017, 20017); + MoveTypeIcon_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (i = 0; i < 4; i++) { - sub_0207C948(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + i); + sub_0207C948(spriteRenderer, v2, NNS_G2D_VRAM_TYPE_2DSUB, TYPE_NORMAL, 20025 + i); } - if (BattleSystem_BattleType(param0->unk_00) & 0x400) { - ov16_0226DE44(v1, v2, 5, v3, 20412, 20036, 20406, 20395); - param0->unk_6C4.unk_00 = ov16_0226DEEC(v1, v2, 5, 20412, 20036, 20406, 20395, 10, 0); + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { + CatchingTutorialFinger_LoadResources(spriteRenderer, v2, HEAP_ID_BATTLE, v3, 20412, 20036, 20406, 20395); + battleInput->catchingTutorial.finger = CatchingTutorialFinger_Create(spriteRenderer, v2, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0); } } -void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0) +void ov16_02268B8C(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); for (i = 0; i < 4; i++) { sub_0207CA34(v2, 20025 + i); @@ -1252,13 +1228,13 @@ void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0) sub_0207CA3C(v2, 20020); sub_0207CA44(v2, 20017, 20017); - if (BattleSystem_BattleType(param0->unk_00) & 0x400) { - ov16_0226DF68(param0->unk_6C4.unk_00); - ov16_0226DEC4(v2, 20412, 20036, 20406, 20395); + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { + CatchingTutorialFinger_Free(battleInput->catchingTutorial.finger); + CatchingTutorialFinger_FreeResources(v2, 20412, 20036, 20406, 20395); } } -void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, int param3, int param4, void *param5) +void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int param3, int param4, void *param5) { const UnkStruct_ov16_02270670 *v0, *v1; int i; @@ -1267,76 +1243,56 @@ void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, SpriteGfxHandler *v5; if (param5 != NULL) { - MI_CpuCopy8(param5, ¶m2->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2)); + MI_CpuCopy8(param5, &battleInput->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2)); } - param2->unk_66E = 0; + battleInput->unk_66E = 0; - v3 = BattleSystem_BGL(param2->unk_00); - v4 = ov16_0223E010(param2->unk_00); - v5 = ov16_0223E018(param2->unk_00); + v3 = BattleSystem_GetBgConfig(battleInput->battleSystem); + v4 = ov16_0223E010(battleInput->battleSystem); + v5 = ov16_0223E018(battleInput->battleSystem); - if (param2->unk_66B == -1) { + if (battleInput->unk_66B == -1) { param4 = 1; v1 = NULL; } else { - v1 = &Unk_ov16_02270670[param2->unk_66B]; + v1 = &Unk_ov16_02270670[battleInput->unk_66B]; } v0 = &Unk_ov16_02270670[param3]; - if (0) { - int v6; - - if (BattleSystem_BattleType(param2->unk_00) & 0x80) { - v6 = 169; - } else { - v6 = v0->unk_00; - } - - Graphics_LoadTilesToBgLayerFromOpenNARC(param0, v6, v3, 4, 0, (0x6000 - (32 * 12 * 0x20)), 1, 5); - - if (param2->unk_66D == 0) { - Graphics_LoadTilesToBgLayerFromOpenNARC(param0, 37, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); - } else { - Graphics_LoadTilesToBgLayerFromOpenNARC(param0, 38, v3, 4, ((0x6000 - (32 * 12 * 0x20)) / 0x20), (32 * 12 * 0x20), 1, 5); - } - } - - if (1) { - PaletteData_LoadBuffer(BattleSystem_PaletteSys(param2->unk_00), param2->unk_58, 1, 0, 0x200); - } + PaletteData_LoadBuffer(BattleSystem_GetPaletteData(battleInput->battleSystem), battleInput->unk_58, 1, 0, 0x200); for (i = 0; i < 4; i++) { if ((v0->unk_04_val2[i] != 0xffff) && ((param4 == 1) || (v0->unk_04_val2[i] != v1->unk_04_val2[i]))) { - Bg_LoadTilemapBuffer(v3, 4 + i, param2->unk_3C[v0->unk_04_val2[i]], 0x800); + Bg_LoadTilemapBuffer(v3, 4 + i, battleInput->unk_3C[v0->unk_04_val2[i]], 0x800); Bg_ScheduleTilemapTransfer(v3, 4 + i); } } - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param2->unk_00), 3, v4, v5, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - param2->unk_66B = param3; + SpriteRenderer_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, v4, v5, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + battleInput->unk_66B = param3; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 8, 12); - ov16_0226B1E8(param2); + ov16_0226B1E8(battleInput); if (v0->unk_28 != NULL) { - v0->unk_28(param2, param3, param4); + v0->unk_28(battleInput, param3, param4); } - SysTask_ExecuteAfterVBlank(ov16_0226BC50, param2, 10); + SysTask_ExecuteAfterVBlank(ov16_0226BC50, battleInput, 10); } -void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1) +void ov16_02268D40(NARC *param0, BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - GF_ASSERT(param1->unk_5BC[0] == NULL && param1->unk_5D4[0] == NULL); + GF_ASSERT(battleInput->unk_5BC[0] == NULL && battleInput->unk_5D4[0] == NULL); - v1 = ov16_0223E010(param1->unk_00); - v2 = ov16_0223E018(param1->unk_00); + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, 207, 1, 20015); @@ -1347,38 +1303,36 @@ void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, 206, 1, 20016); for (i = 0; i < 6; i++) { - param1->unk_5BC[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270414); - sub_0200D4D0(param1->unk_5BC[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); - sub_0200D6A4(param1->unk_5BC[i], 1); + battleInput->unk_5BC[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270414); + sub_0200D4D0(battleInput->unk_5BC[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D6A4(battleInput->unk_5BC[i], 1); - param1->unk_5D4[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270448); - sub_0200D4D0(param1->unk_5D4[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); + battleInput->unk_5D4[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270448); + sub_0200D4D0(battleInput->unk_5D4[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); } - ov16_02269218(param1); + ov16_02269218(battleInput); - GF_ASSERT(param1->unk_08 == NULL); - param1->unk_08 = SysTask_Start(ov16_02268FCC, param1, 1300); + GF_ASSERT(battleInput->unk_08 == NULL); + battleInput->unk_08 = SysTask_Start(ov16_02268FCC, battleInput, 1300); - { - PaletteData *v3; + PaletteData *v3; - v3 = BattleSystem_PaletteSys(param1->unk_00); - ov16_0226DB7C(v1, v2, v3, 5, 20411, 20035, 20405, 20394); - param1->unk_6B8 = ov16_0226DC24(v1, v2, 5, 20411, 20035, 20405, 20394, 5, 0); - } + v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); + BattleCursor_LoadResources(v1, v2, v3, 5, 20411, 20035, 20405, 20394); + battleInput->cursor = BattleCursor_New(v1, v2, 5, 20411, 20035, 20405, 20394, 5, 0); } -static void ov16_02268F00(UnkStruct_ov16_02268A14 *param0) +static void ov16_02268F00(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); SpriteGfxHandler_UnloadCharObjById(v2, 20023); SpriteGfxHandler_UnloadCellObjById(v2, 20015); @@ -1389,33 +1343,33 @@ static void ov16_02268F00(UnkStruct_ov16_02268A14 *param0) SpriteGfxHandler_UnloadPlttObjById(v2, 20023); for (i = 0; i < 6; i++) { - sub_0200D0F4(param0->unk_5BC[i]); - param0->unk_5BC[i] = NULL; + sub_0200D0F4(battleInput->unk_5BC[i]); + battleInput->unk_5BC[i] = NULL; - sub_0200D0F4(param0->unk_5D4[i]); - param0->unk_5D4[i] = NULL; + sub_0200D0F4(battleInput->unk_5D4[i]); + battleInput->unk_5D4[i] = NULL; } - SysTask_Done(param0->unk_08); - param0->unk_08 = NULL; + SysTask_Done(battleInput->unk_08); + battleInput->unk_08 = NULL; - ov16_0226DBFC(v2, 20411, 20035, 20405, 20394); - ov16_0226DCA8(param0->unk_6B8); + BattleCursor_FreeResources(v2, 20411, 20035, 20405, 20394); + BattleCursor_Free(battleInput->cursor); } -static void ov16_02268FCC(SysTask *param0, void *param1) +static void ov16_02268FCC(SysTask *task, void *data) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = data; int i; UnkStruct_ov16_02268FCC *v2; for (i = 0; i < 6; i++) { - v2 = &v0->unk_62C[i]; + v2 = &battleInput->unk_62C[i]; switch (v2->unk_03) { case 0: default: - if (sub_0200D400(v0->unk_5BC[i]->unk_00) == 0) { + if (sub_0200D400(battleInput->unk_5BC[i]->unk_00) == 0) { break; } @@ -1440,10 +1394,10 @@ static void ov16_02268FCC(SysTask *param0, void *param1) break; case 2: case 4: - sub_0200D7C0(v0->unk_5BC[i], 0x800); + sub_0200D7C0(battleInput->unk_5BC[i], 0x800); v2->unk_00 += 0x180; - sub_0200D500(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_06++; if (v2->unk_06 >= v2->unk_07) { @@ -1452,8 +1406,8 @@ static void ov16_02268FCC(SysTask *param0, void *param1) if (v2->unk_03 == 2) { v2->unk_03++; } else { - sub_0200D79C(v0->unk_5BC[i], 0); - sub_0200D500(v0->unk_5BC[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D79C(battleInput->unk_5BC[i], 0); + sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_00 = 0; @@ -1474,10 +1428,10 @@ static void ov16_02268FCC(SysTask *param0, void *param1) break; case 3: - sub_0200D7C0(v0->unk_5BC[i], -0x800); + sub_0200D7C0(battleInput->unk_5BC[i], -0x800); v2->unk_00 -= 0x180; - sub_0200D500(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_06++; if (v2->unk_06 >= v2->unk_07 * 2) { @@ -1489,84 +1443,84 @@ static void ov16_02268FCC(SysTask *param0, void *param1) } } -void ov16_0226914C(UnkStruct_ov16_02268A14 *param0, const u8 *param1) +void ov16_0226914C(BattleInput *battleInput, const u8 *param1) { int i; for (i = 0; i < 6; i++) { - param0->unk_62C[i].unk_02 = param1[i]; + battleInput->unk_62C[i].unk_02 = param1[i]; } } -void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]) +void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]) { int i, v1; for (i = 0; i < 6; i++) { v1 = ov16_0226A934(param1[i]); - CellActor_SetAnim(param0->unk_5BC[i]->unk_00, v1); - SpriteActor_UpdateObject(param0->unk_5BC[i]->unk_00); + CellActor_SetAnim(battleInput->unk_5BC[i]->unk_00, v1); + SpriteActor_UpdateObject(battleInput->unk_5BC[i]->unk_00); v1 = ov16_0226A934(param2[i]); - CellActor_SetAnim(param0->unk_5D4[i]->unk_00, v1); - SpriteActor_UpdateObject(param0->unk_5D4[i]->unk_00); + CellActor_SetAnim(battleInput->unk_5D4[i]->unk_00, v1); + SpriteActor_UpdateObject(battleInput->unk_5D4[i]->unk_00); } } -void ov16_022691BC(UnkStruct_ov16_02268A14 *param0) +void ov16_022691BC(BattleInput *battleInput) { int i; - GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(param0->unk_5BC[i]->unk_00, 1); + SpriteActor_DrawSprite(battleInput->unk_5BC[i]->unk_00, 1); } - if (BattleSystem_BattleType(param0->unk_00) & 0x1) { + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_TRAINER) { for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(param0->unk_5D4[i]->unk_00, 1); + SpriteActor_DrawSprite(battleInput->unk_5D4[i]->unk_00, 1); } } } -void ov16_02269218(UnkStruct_ov16_02268A14 *param0) +void ov16_02269218(BattleInput *battleInput) { int i; - GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(param0->unk_5BC[i]->unk_00, 0); - SpriteActor_DrawSprite(param0->unk_5D4[i]->unk_00, 0); + SpriteActor_DrawSprite(battleInput->unk_5BC[i]->unk_00, 0); + SpriteActor_DrawSprite(battleInput->unk_5D4[i]->unk_00, 0); } } -int ov16_0226925C(UnkStruct_ov16_02268A14 *param0) +int BattleInput_CheckTouch(BattleInput *battleInput) { int v0, v1, v2, v3; const UnkStruct_ov16_02270670 *v4; int v5 = 0; - GF_ASSERT(param0->unk_66B != -1); + GF_ASSERT(battleInput->unk_66B != -1); - v4 = &Unk_ov16_02270670[param0->unk_66B]; + v4 = &Unk_ov16_02270670[battleInput->unk_66B]; - if ((v4->unk_14 == NULL) || (param0->unk_66E == 1)) { + if ((v4->unk_14 == NULL) || (battleInput->unk_66E == 1)) { return 0xffffffff; } GF_ASSERT(v4->unk_18 != NULL); - if (BattleSystem_BattleType(param0->unk_00) & 0x400) { - v1 = ov16_0226CD18(param0); + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { + v1 = ov16_0226CD18(battleInput); } else { v1 = sub_02022664(v4->unk_14); if (v1 == 0xffffffff) { - v1 = ov16_0226BE48(param0); + v1 = ov16_0226BE48(battleInput); v5++; } } @@ -1580,20 +1534,20 @@ int ov16_0226925C(UnkStruct_ov16_02268A14 *param0) } if (v4->unk_2C != NULL) { - v0 = v4->unk_2C(param0, v0, v3); + v0 = v4->unk_2C(battleInput, v0, v3); if (v0 != 0xffffffff) { if (v4->unk_24 != NULL) { - v4->unk_24(param0, v1); + v4->unk_24(battleInput, v1); } - MI_CpuClear8(¶m0->unk_6BC, sizeof(UnkStruct_ov16_0226CB10)); - ov16_0226DDE8(param0->unk_6B8); + MI_CpuClear8(&battleInput->unk_6BC, sizeof(UnkStruct_ov16_0226CB10)); + ov16_0226DDE8(battleInput->cursor); if (v5 > 0) { - param0->unk_6C0 = 1; + battleInput->unk_6C0 = 1; } else { - param0->unk_6C0 = 0; + battleInput->unk_6C0 = 0; } } } @@ -1601,9 +1555,9 @@ int ov16_0226925C(UnkStruct_ov16_02268A14 *param0) return v0; } -BOOL ov16_02269348(UnkStruct_ov16_02268A14 *param0) +BOOL ov16_02269348(BattleInput *battleInput) { - if ((param0->unk_0C == NULL) && (param0->unk_10 == NULL) && (ov16_0226BCD0(param0) == 1)) { + if ((battleInput->unk_0C == NULL) && (battleInput->unk_10 == NULL) && (ov16_0226BCD0(battleInput) == 1)) { return 1; } @@ -1640,7 +1594,7 @@ int ov16_02269368(int param0, int param1) } } -void ov16_0226940C(UnkStruct_ov16_02268A14 *param0) +void ov16_0226940C(BattleInput *battleInput) { int v0; @@ -1648,7 +1602,7 @@ void ov16_0226940C(UnkStruct_ov16_02268A14 *param0) G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); - v0 = 255 - (param0->unk_6AC / 0x100); + v0 = 255 - (battleInput->unk_6AC / 0x100); if (v0 < 0) { v0 = 0; @@ -1657,34 +1611,34 @@ void ov16_0226940C(UnkStruct_ov16_02268A14 *param0) G2S_SetWnd0Position(v0, 0, 255, 192); } -void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +void ov16_0226947C(BattleInput *battleInput, int param1, int param2) { - if (param0->unk_6AC == param2 * 0x100) { + if (battleInput->unk_6AC == param2 * 0x100) { return; } - param0->unk_6B0 = param1; - param0->unk_6B4 = param2 << 8; + battleInput->unk_6B0 = param1; + battleInput->unk_6B4 = param2 << 8; - SysTask_Start(ov16_022694A8, param0, 1200); + SysTask_Start(ov16_022694A8, battleInput, 1200); } static void ov16_022694A8(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; int v1 = 0; BgConfig *v2; - v2 = BattleSystem_BGL(v0->unk_00); - v0->unk_6AC += v0->unk_6B0; + v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); + battleInput->unk_6AC += battleInput->unk_6B0; - if (((v0->unk_6B0 <= 0) && (v0->unk_6AC <= v0->unk_6B4)) || ((v0->unk_6B0 > 0) && (v0->unk_6AC >= v0->unk_6B4))) { - v0->unk_6AC = v0->unk_6B4; + if (((battleInput->unk_6B0 <= 0) && (battleInput->unk_6AC <= battleInput->unk_6B4)) || ((battleInput->unk_6B0 > 0) && (battleInput->unk_6AC >= battleInput->unk_6B4))) { + battleInput->unk_6AC = battleInput->unk_6B4; v1 = 1; } - Bg_SetOffset(v2, 6, 0, v0->unk_6AC / 0x100); - ov16_0226940C(v0); + Bg_SetOffset(v2, 6, 0, battleInput->unk_6AC / 0x100); + ov16_0226940C(battleInput); if (v1 == 1) { Bg_FillTilemap(v2, 7, (0x6000 / 0x20 - 1)); @@ -1696,12 +1650,12 @@ static void ov16_022694A8(SysTask *param0, void *param1) } } -static void ov16_02269550(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_02269550(BattleInput *battleInput, int param1) { BOOL v0; UnkStruct_ov16_0226B988 *v1; - param0->unk_66E = 1; + battleInput->unk_66E = 1; G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); @@ -1713,7 +1667,7 @@ static void ov16_02269550(UnkStruct_ov16_02268A14 *param0, int param1) v1 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0226B988)); MI_CpuClear8(v1, sizeof(UnkStruct_ov16_0226B988)); - v1->unk_00 = param0; + v1->battleInput = battleInput; v1->unk_12 = param1; v1->unk_08 = -(255 * 100); v1->unk_0A = (40 * 100); @@ -1729,37 +1683,37 @@ static void ov16_02269550(UnkStruct_ov16_02268A14 *param0, int param1) v1->unk_04 = SysTask_ExecuteOnVBlank(ov16_0226BA88, v1, 10); } -static void ov16_02269654(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269654(BattleInput *battleInput, int param1, int param2) { int v0; - v0 = param0->unk_1A.val1.unk_00; + v0 = battleInput->unk_1A.val1.unk_00; - ov16_02269668(param0, param1, param2); - ov16_02269550(param0, v0); + ov16_02269668(battleInput, param1, param2); + ov16_02269550(battleInput, v0); } -static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269668(BattleInput *battleInput, int param1, int param2) { Strbuf *v0, *v1, *v2, *v3; MessageLoader *v4; int v5; UnkStruct_ov16_02269668 *v6; - v6 = ¶m0->unk_1A.val1; + v6 = &battleInput->unk_1A.val1; v5 = v6->unk_00; - param0->unk_6C1 = v6->unk_08; + battleInput->unk_6C1 = v6->unk_08; - v4 = BattleSystem_MessageLoader(param0->unk_00); + v4 = BattleSystem_MessageLoader(battleInput->battleSystem); - param0->unk_66A = v5; + battleInput->unk_66A = v5; - if (BattleSystem_BattleType(param0->unk_00) & 0x20) { + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_SAFARI) { v0 = MessageLoader_GetNewStrbuf(v4, 931); v1 = MessageLoader_GetNewStrbuf(v4, 932); v2 = MessageLoader_GetNewStrbuf(v4, 933); - } else if (BattleSystem_BattleType(param0->unk_00) & 0x200) { + } else if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_PAL_PARK) { v0 = MessageLoader_GetNewStrbuf(v4, 1223); v1 = MessageLoader_GetNewStrbuf(v4, 932); v2 = MessageLoader_GetNewStrbuf(v4, 933); @@ -1769,37 +1723,37 @@ static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param v2 = MessageLoader_GetNewStrbuf(v4, 926); } - if (param0->unk_6C1 == 1) { + if (battleInput->unk_6C1 == 1) { v3 = MessageLoader_GetNewStrbuf(v4, 928); - param0->unk_66F = 1; + battleInput->unk_66F = 1; } else { v3 = MessageLoader_GetNewStrbuf(v4, 927); - param0->unk_66F = 0; + battleInput->unk_66F = 0; } - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v0); Strbuf_Free(v1); Strbuf_Free(v2); Strbuf_Free(v3); - if ((BattleSystem_BattleType(param0->unk_00) & (0x20 | 0x200)) == 0) { + if ((BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_NO_MOVES) == 0) { Pokemon *v7; CellActorData *v8; int v9, v10; - v7 = BattleSystem_PartyPokemon(param0->unk_00, v6->unk_01, v6->unk_02); - ov16_0226A698(param0); - v8 = ov16_0226A7A4(param0, v7, v5, v6->unk_04, v6->unk_06, v6->unk_03); + v7 = BattleSystem_PartyPokemon(battleInput->battleSystem, v6->unk_01, v6->unk_02); + ov16_0226A698(battleInput); + v8 = ov16_0226A7A4(battleInput, v7, v5, v6->unk_04, v6->unk_06, v6->unk_03); - sub_020129A4(param0->unk_4CC[0].unk_00, &v9, &v10); + sub_020129A4(battleInput->unk_4CC[0].unk_00, &v9, &v10); if (v5 == 4) { - v9 += param0->unk_4CC[0].unk_10 + 32 / 2; + v9 += battleInput->unk_4CC[0].unk_10 + 32 / 2; } else { v9 -= 32 / 2; } @@ -1808,71 +1762,71 @@ static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param } } -static void ov16_022698A8(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_022698A8(BattleInput *battleInput, int param1, int param2) { int v0; - v0 = param0->unk_1A.val1.unk_00; + v0 = battleInput->unk_1A.val1.unk_00; - ov16_022698BC(param0, param1, param2); - ov16_02269550(param0, v0); + ov16_022698BC(battleInput, param1, param2); + ov16_02269550(battleInput, v0); } -static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_022698BC(BattleInput *battleInput, int param1, int param2) { int v0; - v0 = param0->unk_1A.val1.unk_00; + v0 = battleInput->unk_1A.val1.unk_00; - ov16_02269668(param0, param1, param2); + ov16_02269668(battleInput, param1, param2); { BgConfig *v1; - v1 = BattleSystem_BGL(param0->unk_00); + v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17); Bg_ScheduleTilemapTransfer(v1, 5); } - sub_020129D0(param0->unk_4CC[1].unk_00, 0); - sub_020129D0(param0->unk_4CC[2].unk_00, 0); - sub_020129D0(param0->unk_4CC[3].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[3].unk_00, 0); } -static void ov16_02269924(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269924(BattleInput *battleInput, int param1, int param2) { int v0; - v0 = param0->unk_1A.val1.unk_00; + v0 = battleInput->unk_1A.val1.unk_00; - ov16_02269938(param0, param1, param2); - ov16_02269550(param0, v0); + ov16_02269938(battleInput, param1, param2); + ov16_02269550(battleInput, v0); } -static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269938(BattleInput *battleInput, int param1, int param2) { int v0; - v0 = param0->unk_1A.val1.unk_00; + v0 = battleInput->unk_1A.val1.unk_00; - ov16_02269668(param0, param1, param2); + ov16_02269668(battleInput, param1, param2); { BgConfig *v1; - v1 = BattleSystem_BGL(param0->unk_00); + v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17); Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17); Bg_ScheduleTilemapTransfer(v1, 5); } - sub_020129D0(param0->unk_4CC[1].unk_00, 0); - sub_020129D0(param0->unk_4CC[2].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); } -static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) { UnkStruct_ov16_02260C00 *v0; int i; @@ -1880,28 +1834,28 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param UnkStruct_ov16_0226ABD4 *v3; TextColor v4; - v0 = ¶m0->unk_1A.val2; + v0 = &battleInput->unk_1A.val2; GF_ASSERT(v0 != NULL); - param0->unk_66A = v0->unk_10; + battleInput->unk_66A = v0->unk_10; - v2 = BattleSystem_MessageLoader(param0->unk_00); - v3 = ov16_0226ABD4(param0, v0->unk_10); + v2 = BattleSystem_MessageLoader(battleInput->battleSystem); + v3 = ov16_0226ABD4(battleInput, v0->unk_10); - ov16_0226AF0C(param0); + ov16_0226AF0C(battleInput); { - ov16_0226A98C(param0, ¶m0->unk_4CC[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &v3->unk_28[0]); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 46, 1, &v3->unk_28[1]); - ov16_0226A98C(param0, ¶m0->unk_4CC[2], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 110, 1, &v3->unk_28[2]); - ov16_0226A98C(param0, ¶m0->unk_4CC[3], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 110, 1, &v3->unk_28[3]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &v3->unk_28[0]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 46, 1, &v3->unk_28[1]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[2], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 110, 1, &v3->unk_28[2]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[3], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 110, 1, &v3->unk_28[3]); } { for (i = 0; i < LEARNED_MOVES_MAX; i++) { v4 = ov16_0226B924(v0->unk_08[i], v0->unk_0C[i]); - ov16_0226A98C(param0, ¶m0->unk_4CC[9 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_022702D4[i][0], Unk_ov16_022702D4[i][1], 0, &v3->unk_78[i]); - ov16_0226A98C(param0, ¶m0->unk_4CC[5 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_02270284[i][0], Unk_ov16_02270284[i][1], 0, &v3->unk_C8[i]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[9 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_022702D4[i][0], Unk_ov16_022702D4[i][1], 0, &v3->unk_78[i]); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[5 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_02270284[i][0], Unk_ov16_02270284[i][1], 0, &v3->unk_C8[i]); } } @@ -1909,7 +1863,7 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param Strbuf *v5; v5 = MessageLoader_GetNewStrbuf(v2, 929); - ov16_0226A98C(param0, ¶m0->unk_4CC[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v5); } @@ -1919,9 +1873,9 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (v0->unk_00[i] != 0) { v6 = MoveTable_LoadParam(v0->unk_00[i], MOVEATTRIBUTE_TYPE); - ov16_0226B06C(param0, v6, i); + ov16_0226B06C(battleInput, v6, i); } else { - ov16_0226B088(param0, i); + ov16_0226B088(battleInput, i); break; } } @@ -1930,76 +1884,76 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param { BgConfig *v7; - v7 = BattleSystem_BGL(param0->unk_00); + v7 = BattleSystem_GetBgConfig(battleInput->battleSystem); if (v0->unk_00[0] == 0) { - sub_020129D0(param0->unk_4CC[0].unk_00, 0); - sub_020129D0(param0->unk_4CC[5].unk_00, 0); - sub_020129D0(param0->unk_4CC[9].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[0].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[5].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[9].unk_00, 0); } if (v0->unk_00[1] == 0) { - sub_020129D0(param0->unk_4CC[1].unk_00, 0); - sub_020129D0(param0->unk_4CC[6].unk_00, 0); - sub_020129D0(param0->unk_4CC[10].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[6].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[10].unk_00, 0); } if (v0->unk_00[2] == 0) { - sub_020129D0(param0->unk_4CC[2].unk_00, 0); - sub_020129D0(param0->unk_4CC[7].unk_00, 0); - sub_020129D0(param0->unk_4CC[11].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[7].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[11].unk_00, 0); } if (v0->unk_00[3] == 0) { - sub_020129D0(param0->unk_4CC[3].unk_00, 0); - sub_020129D0(param0->unk_4CC[8].unk_00, 0); - sub_020129D0(param0->unk_4CC[12].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[3].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[8].unk_00, 0); + sub_020129D0(battleInput->unk_4CC[12].unk_00, 0); } } } -static void ov16_02269C7C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269C7C(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1, *v2; - v0 = BattleSystem_MessageLoader(param0->unk_00); + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 940); v2 = MessageLoader_GetNewStrbuf(v0, 941); - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); } -static void ov16_02269D14(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1, *v2; - v0 = BattleSystem_MessageLoader(param0->unk_00); + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 1181); v2 = MessageLoader_GetNewStrbuf(v0, 1182); - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); } -static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = ¶m0->unk_1A.val4; - v0 = BattleSystem_MessageLoader(param0->unk_00); - v5 = BattleSystem_StringTemplate(param0->unk_00); + v6 = &battleInput->unk_1A.val4; + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 1186); v2 = MessageLoader_GetNewStrbuf(v0, 1187); v3 = Strbuf_Init(100, 5); @@ -2009,8 +1963,8 @@ static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -2018,14 +1972,14 @@ static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param Strbuf_Free(v4); } -static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); - v0 = BattleSystem_MessageLoader(param0->unk_00); + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 1260); { @@ -2034,36 +1988,36 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param void *v4; v4 = Graphics_GetScrnData(7, 46, 1, &v3, 5); - MI_CpuCopy32(v3->rawData, param0->unk_3C[6], 0x800); + MI_CpuCopy32(v3->rawData, battleInput->unk_3C[6], 0x800); Heap_FreeToHeap(v4); - v2 = BattleSystem_BGL(param0->unk_00); - Bg_LoadTilemapBuffer(v2, 4, param0->unk_3C[6], 0x800); + v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); + Bg_LoadTilemapBuffer(v2, 4, battleInput->unk_3C[6], 0x800); Bg_ScheduleTilemapTransfer(v2, 4); } { - BgConfig *v5 = BattleSystem_BGL(param0->unk_00); + BgConfig *v5 = BattleSystem_GetBgConfig(battleInput->battleSystem); - MI_CpuClear32(param0->unk_3C[4], 0x800); - Bg_LoadTilemapBuffer(v5, 5, param0->unk_3C[4], 0x800); + MI_CpuClear32(battleInput->unk_3C[4], 0x800); + Bg_LoadTilemapBuffer(v5, 5, battleInput->unk_3C[4], 0x800); Bg_ScheduleTilemapTransfer(v5, 5); } - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v1); } -static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = ¶m0->unk_1A.val4; - v0 = BattleSystem_MessageLoader(param0->unk_00); - v5 = BattleSystem_StringTemplate(param0->unk_00); + v6 = &battleInput->unk_1A.val4; + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 1217); v2 = MessageLoader_GetNewStrbuf(v0, 1218); v3 = Strbuf_Init(100, 5); @@ -2073,8 +2027,8 @@ static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -2082,16 +2036,16 @@ static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param Strbuf_Free(v4); } -static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) { MessageLoader *v0; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = ¶m0->unk_1A.val4; - v0 = BattleSystem_MessageLoader(param0->unk_00); - v5 = BattleSystem_StringTemplate(param0->unk_00); + v6 = &battleInput->unk_1A.val4; + v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(v0, 1215); v2 = MessageLoader_GetNewStrbuf(v0, 1216); v3 = Strbuf_Init(100, 5); @@ -2101,8 +2055,8 @@ static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -2110,7 +2064,7 @@ static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param Strbuf_Free(v4); } -static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) { UnkStruct_ov16_02260F14 *v0; int i; @@ -2125,19 +2079,19 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param u8 v11[6]; int v12; - v0 = ¶m0->unk_1A.val3; + v0 = &battleInput->unk_1A.val3; - param0->unk_66C = v0->unk_21; - param0->unk_66A = v0->unk_20; + battleInput->unk_66C = v0->unk_21; + battleInput->unk_66A = v0->unk_20; - v2 = BattleSystem_MessageLoader(param0->unk_00); - v8 = BattleSystem_StringTemplate(param0->unk_00); + v2 = BattleSystem_MessageLoader(battleInput->battleSystem); + v8 = BattleSystem_StringTemplate(battleInput->battleSystem); - ov16_0226B20C(param0, v3, 0); - ov16_0226A698(param0); - ov16_0226AAF8(param0); - ov16_0223F87C(param0->unk_00, v10); - ov16_0223F858(param0->unk_00, v11); + ov16_0226B20C(battleInput, v3, 0); + ov16_0226A698(battleInput); + ov16_0226AAF8(battleInput); + ov16_0223F87C(battleInput->battleSystem, v10); + ov16_0223F858(battleInput->battleSystem, v11); v4 = Strbuf_Init((12 + 2 + (5 * 2)), 5); @@ -2153,7 +2107,7 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param v5 = MessageLoader_GetNewStrbuf(v2, 964); } - v6 = BattleSystem_PartyPokemon(param0->unk_00, v12, v0->unk_00[v12].unk_00); + v6 = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, v0->unk_00[v12].unk_00); v7 = Pokemon_GetBoxPokemon(v6); StringTemplate_SetNickname(v8, 0, v7); @@ -2165,22 +2119,22 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param v9 = TEXT_COLOR(4, 5, 6); } - ov16_0226A98C(param0, ¶m0->unk_4CC[0 + i], v4, FONT_SUBSCREEN, v9, 6, 20023, Unk_ov16_02270328[i][0], Unk_ov16_02270328[i][1], 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[0 + i], v4, FONT_SUBSCREEN, v9, 6, 20023, Unk_ov16_02270328[i][0], Unk_ov16_02270328[i][1], 1, NULL); Strbuf_Free(v5); { switch (i) { case 1: - ov16_0226A7A4(param0, v6, 3, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, v6, 3, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); break; case 3: - ov16_0226A7A4(param0, v6, 5, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, v6, 5, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); break; } } } else { if (v3[i] == 0) { - ov16_0226B0DC(param0, i); + ov16_0226B0DC(battleInput, i); } } } @@ -2191,12 +2145,12 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param Strbuf *v13; v13 = MessageLoader_GetNewStrbuf(v2, 930); - ov16_0226A98C(param0, ¶m0->unk_4CC[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); Strbuf_Free(v13); } } -static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) { int v0, v1, v2; @@ -2210,13 +2164,13 @@ static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2 v0 = 0; v1 = 0; - switch (param0->unk_66A) { + switch (battleInput->unk_66A) { case 0: - v2 = param0->unk_66A; + v2 = battleInput->unk_66A; break; case 2: case 4: - v2 = param0->unk_66A - 2; + v2 = battleInput->unk_66A - 2; break; } break; @@ -2234,23 +2188,23 @@ static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2 break; } - ov16_0226B318(param0, param2); - ov16_0226B2BC(ov16_0226B390, param0); + ov16_0226B318(battleInput, param2); + ov16_0226B2BC(ov16_0226B390, battleInput); - param0->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703A4[param1 - 1]; - param0->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022702F4[param1 - 1]; - param0->unk_67C.unk_04_val3.unk_0C = 1; - param0->unk_67C.unk_04_val3.unk_08 = param1; - param0->unk_67C.unk_04_val3.unk_0D = v0; - param0->unk_67C.unk_04_val3.unk_0E = v2; - param0->unk_67C.unk_04_val3.unk_0F = v1; - param0->unk_67C.unk_04_val3.unk_11 = Unk_ov16_02270294[param1 - 1]; - param0->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703A4[param1 - 1]; + battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022702F4[param1 - 1]; + battleInput->unk_67C.unk_04_val3.unk_0C = 1; + battleInput->unk_67C.unk_04_val3.unk_08 = param1; + battleInput->unk_67C.unk_04_val3.unk_0D = v0; + battleInput->unk_67C.unk_04_val3.unk_0E = v2; + battleInput->unk_67C.unk_04_val3.unk_0F = v1; + battleInput->unk_67C.unk_04_val3.unk_11 = Unk_ov16_02270294[param1 - 1]; + battleInput->unk_67C.unk_04_val3.unk_10 = 1; return param1; } -static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) { UnkStruct_ov16_02260C00 *v0; u32 v1[2]; @@ -2263,7 +2217,7 @@ static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2 return param1; } - v0 = ¶m0->unk_1A.val2; + v0 = &battleInput->unk_1A.val2; if ((param1 >= 1) && (param1 <= 4)) { if (v0->unk_00[param1 - 1] == 0) { @@ -2290,19 +2244,19 @@ static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2 break; } - ov16_0226B318(param0, param2); - ov16_0226B2BC(ov16_0226B4E0, param0); + ov16_0226B318(battleInput, param2); + ov16_0226B2BC(ov16_0226B4E0, battleInput); - param0->unk_67C.unk_04_val3.unk_00 = v4; - param0->unk_67C.unk_04_val3.unk_04 = v5; - param0->unk_67C.unk_04_val3.unk_0C = 3; - param0->unk_67C.unk_04_val3.unk_08 = param1; - param0->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->unk_67C.unk_04_val3.unk_00 = v4; + battleInput->unk_67C.unk_04_val3.unk_04 = v5; + battleInput->unk_67C.unk_04_val3.unk_0C = 3; + battleInput->unk_67C.unk_04_val3.unk_08 = param1; + battleInput->unk_67C.unk_04_val3.unk_10 = 1; return param1; } -static int ov16_0226A4A4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static int ov16_0226A4A4(BattleInput *battleInput, int param1, int param2) { int v0; @@ -2318,34 +2272,34 @@ static int ov16_0226A4A4(UnkStruct_ov16_02268A14 *param0, int param1, int param2 break; } - ov16_0226B318(param0, param2); - ov16_0226B2BC(ov16_0226B390, param0); + ov16_0226B318(battleInput, param2); + ov16_0226B2BC(ov16_0226B390, battleInput); if (param1 == 1) { - param0->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[1]; - param0->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[1]; + battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[1]; + battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[1]; } else { - param0->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[0]; - param0->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[0]; + battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[0]; + battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[0]; } - param0->unk_67C.unk_04_val3.unk_0C = 6; - param0->unk_67C.unk_04_val3.unk_08 = param1; - param0->unk_67C.unk_04_val3.unk_0D = v0; - param0->unk_67C.unk_04_val3.unk_0F = 3; - param0->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->unk_67C.unk_04_val3.unk_0C = 6; + battleInput->unk_67C.unk_04_val3.unk_08 = param1; + battleInput->unk_67C.unk_04_val3.unk_0D = v0; + battleInput->unk_67C.unk_04_val3.unk_0F = 3; + battleInput->unk_67C.unk_04_val3.unk_10 = 1; return param1; } -static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static int ov16_0226A528(BattleInput *battleInput, int param1, int param2) { UnkStruct_ov16_02260F14 *v0; u8 v1[4]; - v0 = ¶m0->unk_1A.val3; + v0 = &battleInput->unk_1A.val3; - ov16_0226B20C(param0, v1, 1); + ov16_0226B20C(battleInput, v1, 1); switch (param1) { case 0xffffffff: @@ -2372,16 +2326,16 @@ static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2 } break; case 0xff: - ov16_0226B318(param0, NELEMS(Unk_ov16_02270A0C) - 1); - ov16_0226B2BC(ov16_0226B390, param0); + ov16_0226B318(battleInput, NELEMS(Unk_ov16_02270A0C) - 1); + ov16_0226B2BC(ov16_0226B390, battleInput); - param0->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703D4[NELEMS(Unk_ov16_022703D4) - 1]; - param0->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227033C[NELEMS(Unk_ov16_0227033C) - 1]; - param0->unk_67C.unk_04_val3.unk_0C = 4; - param0->unk_67C.unk_04_val3.unk_08 = param1; - param0->unk_67C.unk_04_val3.unk_0D = 4; - param0->unk_67C.unk_04_val3.unk_0F = 3; - param0->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703D4[NELEMS(Unk_ov16_022703D4) - 1]; + battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227033C[NELEMS(Unk_ov16_0227033C) - 1]; + battleInput->unk_67C.unk_04_val3.unk_0C = 4; + battleInput->unk_67C.unk_04_val3.unk_08 = param1; + battleInput->unk_67C.unk_04_val3.unk_0D = 4; + battleInput->unk_67C.unk_04_val3.unk_0F = 3; + battleInput->unk_67C.unk_04_val3.unk_10 = 1; return param1; } @@ -2389,20 +2343,20 @@ static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2 { BgConfig *v2; - v2 = BattleSystem_BGL(param0->unk_00); + v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); Bg_FillTilemap(v2, 5, (0x6000 / 0x20 - 1)); Bg_ScheduleTilemapTransfer(v2, 5); } - ov16_0226B314(param0, param1); - ov16_0226B2BC(ov16_0226B780, param0); + ov16_0226B314(battleInput, param1); + ov16_0226B2BC(ov16_0226B780, battleInput); - param0->unk_67C.unk_04_val4.unk_1C = param1; + battleInput->unk_67C.unk_04_val4.unk_1C = param1; return param1; } -static int ov16_0226A634(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static int ov16_0226A634(BattleInput *battleInput, int param1, int param2) { switch (param1) { case 0xffffffff: @@ -2412,41 +2366,41 @@ static int ov16_0226A634(UnkStruct_ov16_02268A14 *param0, int param1, int param2 break; } - ov16_0226B318(param0, param2); - ov16_0226B2BC(ov16_0226B390, param0); + ov16_0226B318(battleInput, param2); + ov16_0226B2BC(ov16_0226B390, battleInput); - param0->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022701F4; - param0->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022701D0[0]; - param0->unk_67C.unk_04_val3.unk_0C = 6; - param0->unk_67C.unk_04_val3.unk_08 = param1; - param0->unk_67C.unk_04_val3.unk_0D = 0; - param0->unk_67C.unk_04_val3.unk_0F = 3; - param0->unk_67C.unk_04_val3.unk_10 = 0; + battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022701F4; + battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022701D0[0]; + battleInput->unk_67C.unk_04_val3.unk_0C = 6; + battleInput->unk_67C.unk_04_val3.unk_08 = param1; + battleInput->unk_67C.unk_04_val3.unk_0D = 0; + battleInput->unk_67C.unk_04_val3.unk_0F = 3; + battleInput->unk_67C.unk_04_val3.unk_10 = 0; return param1; } -static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226A698(BattleInput *battleInput) { SpriteRenderer *v0; SpriteGfxHandler *v1; int v2, v3, v4; PaletteData *v5; - v0 = ov16_0223E010(param0->unk_00); - v1 = ov16_0223E018(param0->unk_00); - v5 = BattleSystem_PaletteSys(param0->unk_00); + v0 = ov16_0223E010(battleInput->battleSystem); + v1 = ov16_0223E018(battleInput->battleSystem); + v5 = BattleSystem_GetPaletteData(battleInput->battleSystem); sub_0200CD7C(v5, 3, v0, v1, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); sub_0200CE0C(v0, v1, 19, PokeIcon32KCellsFileIndex(), 0, 20021); sub_0200CE3C(v0, v1, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); } -static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226A718(BattleInput *battleInput) { SpriteGfxHandler *v0; - v0 = ov16_0223E018(param0->unk_00); + v0 = ov16_0223E018(battleInput->battleSystem); SpriteGfxHandler_UnloadCharObjById(v0, 20036); SpriteGfxHandler_UnloadCharObjById(v0, 20037); @@ -2456,24 +2410,24 @@ static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0) SpriteGfxHandler_UnloadPlttObjById(v0, 20022); } -static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226A768(BattleInput *battleInput) { int i; for (i = 0; i < 4; i++) { - if (param0->unk_60C[i] != NULL) { - sub_0200D0F4(param0->unk_60C[i]); - param0->unk_60C[i] = NULL; + if (battleInput->unk_60C[i] != NULL) { + sub_0200D0F4(battleInput->unk_60C[i]); + battleInput->unk_60C[i] = NULL; } - if (param0->unk_61C[i] != NULL) { - SysTask_Done(param0->unk_61C[i]); - param0->unk_61C[i] = NULL; + if (battleInput->unk_61C[i] != NULL) { + SysTask_Done(battleInput->unk_61C[i]); + battleInput->unk_61C[i] = NULL; } } } -static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5) +static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5) { SpriteRenderer *v0; SpriteGfxHandler *v1; @@ -2488,8 +2442,8 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa v5 = param2; } - GF_ASSERT(param0->unk_60C[v5] == NULL); - GF_ASSERT(param0->unk_61C[v5] == NULL); + GF_ASSERT(battleInput->unk_60C[v5] == NULL); + GF_ASSERT(battleInput->unk_61C[v5] == NULL); switch (param2) { case 0: @@ -2508,8 +2462,8 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa return NULL; } - v0 = ov16_0223E010(param0->unk_00); - v1 = ov16_0223E018(param0->unk_00); + v0 = ov16_0223E010(battleInput->battleSystem); + v1 = ov16_0223E018(battleInput->battleSystem); sub_0200CBDC(v0, v1, 19, Pokemon_IconSpriteIndex(param1), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); @@ -2551,8 +2505,8 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa sub_0200D330(v4); - param0->unk_60C[v5] = v4; - param0->unk_61C[v5] = SysTask_Start(ov16_0226A928, v4, 1300); + battleInput->unk_60C[v5] = v4; + battleInput->unk_61C[v5] = SysTask_Start(ov16_0226A928, v4, 1300); return v4; } @@ -2601,7 +2555,7 @@ static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *pa *param3 = v1; } -static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10) +static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10) { UnkStruct_020127E8 v0; Window v1; @@ -2614,8 +2568,8 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 GF_ASSERT(param1->unk_00 == NULL); - v6 = ov16_0223E018(param0->unk_00); - v5 = BattleSystem_BGL(param0->unk_00); + v6 = ov16_0223E018(battleInput->battleSystem); + v5 = BattleSystem_GetBgConfig(battleInput->battleSystem); if (param10 == NULL) { ov16_0226A95C(param2, param3, &v7, &v8); @@ -2641,7 +2595,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 param8 += (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT) - 8; - v0.unk_00 = param0->unk_4C8; + v0.unk_00 = battleInput->unk_4C8; v0.unk_04 = &v1; v0.unk_08 = sub_0200D9B0(v6); v0.unk_0C = sub_0200D04C(v6, param6); @@ -2668,33 +2622,33 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9 param1->unk_10 = v7; } -static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226AAC0(BattleInput *battleInput) { int i; for (i = 0; i < 13; i++) { - if (param0->unk_4CC[i].unk_00 != NULL) { - sub_02012870(param0->unk_4CC[i].unk_00); - sub_0201EE28(¶m0->unk_4CC[i].unk_04); - param0->unk_4CC[i].unk_00 = NULL; + if (battleInput->unk_4CC[i].unk_00 != NULL) { + sub_02012870(battleInput->unk_4CC[i].unk_00); + sub_0201EE28(&battleInput->unk_4CC[i].unk_04); + battleInput->unk_4CC[i].unk_00 = NULL; } } } -static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226AAF8(BattleInput *battleInput) { u8 v0[4], v1[4]; int j, i; u16 *v4, *v5; BgConfig *v6; - v6 = BattleSystem_BGL(param0->unk_00); + v6 = BattleSystem_GetBgConfig(battleInput->battleSystem); v4 = Bg_GetTilemapBuffer(v6, 5); - ov16_0226B20C(param0, v0, 0); + ov16_0226B20C(battleInput, v0, 0); if (v0[0] == 1) { - ov16_0226B264(param0, 1, v1, 0); + ov16_0226B264(battleInput, 1, v1, 0); if (v1[3 - 1] == 1) { for (i = 12; i <= 16; i++) { @@ -2718,7 +2672,7 @@ static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) } if (v0[1] == 1) { - ov16_0226B264(param0, 2, v1, 0); + ov16_0226B264(battleInput, 2, v1, 0); if (v1[3 - 1] == 1) { for (i = 10; i <= 10; i++) { @@ -2742,39 +2696,39 @@ static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) } } -static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(UnkStruct_ov16_02268A14 *param0, int param1) +static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(BattleInput *battleInput, int param1) { if (param1 >= 2) { param1 -= 2; } - return ¶m0->unk_68[param1]; + return &battleInput->unk_68[param1]; } -static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226ABE8(BattleInput *battleInput) { int j, i; for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { - Heap_FreeToHeap(param0->unk_68[i].unk_18[j]); + Heap_FreeToHeap(battleInput->unk_68[i].unk_18[j]); - if (param0->unk_68[i].unk_28[j].unk_00.pixels != NULL) { - Window_Remove(¶m0->unk_68[i].unk_28[j].unk_00); + if (battleInput->unk_68[i].unk_28[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].unk_28[j].unk_00); } - if (param0->unk_68[i].unk_78[j].unk_00.pixels != NULL) { - Window_Remove(¶m0->unk_68[i].unk_78[j].unk_00); + if (battleInput->unk_68[i].unk_78[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].unk_78[j].unk_00); } - if (param0->unk_68[i].unk_C8[j].unk_00.pixels != NULL) { - Window_Remove(¶m0->unk_68[i].unk_C8[j].unk_00); + if (battleInput->unk_68[i].unk_C8[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].unk_C8[j].unk_00); } } } } -void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDisplayInfo *param2) +void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo *param2) { UnkStruct_ov16_0226ABD4 *v0; void *v1; @@ -2788,11 +2742,11 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla TextColor v11; MessageLoader *v12; - v12 = BattleSystem_MessageLoader(param0->unk_00); - v0 = ov16_0226ABD4(param0, param1); + v12 = BattleSystem_MessageLoader(battleInput->battleSystem); + v0 = ov16_0226ABD4(battleInput, param1); v3 = sub_0208C098(6); v9 = MessageLoader_GetNewStrbuf(v12, 938); - v10 = BattleSystem_StringTemplate(param0->unk_00); + v10 = BattleSystem_StringTemplate(battleInput->battleSystem); v7 = Strbuf_Init(((2 + 2 + 1 + 2) * 2 + 2), 5); v8 = MessageLoader_GetNewStrbuf(v12, 937); @@ -2806,7 +2760,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla if ((v0->unk_28[i].unk_00.pixels == NULL) || ((param2->move[i] != v0->unk_00.move[i]) && (param2->move[i] != 0))) { v6 = MessageUtil_MoveName(param2->move[i], 5); - ov16_0226AEA0(param0, v6, FONT_SUBSCREEN, &v0->unk_28[i], TEXT_COLOR(7, 8, 9)); + ov16_0226AEA0(battleInput, v6, FONT_SUBSCREEN, &v0->unk_28[i], TEXT_COLOR(7, 8, 9)); Strbuf_Free(v6); } @@ -2818,11 +2772,11 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla v11 = ov16_0226B924(param2->curPP[i], param2->maxPP[i]); if ((v0->unk_78[i].unk_00.pixels == NULL) || (param2->move[i] != v0->unk_00.move[i]) || (param2->curPP[i] != v0->unk_00.curPP[i])) { - ov16_0226AEA0(param0, v7, FONT_SYSTEM, &v0->unk_78[i], v11); + ov16_0226AEA0(battleInput, v7, FONT_SYSTEM, &v0->unk_78[i], v11); } if ((v0->unk_C8[i].unk_00.pixels == NULL) || (param2->move[i] != v0->unk_00.move[i]) || (param2->curPP[i] != v0->unk_00.curPP[i])) { - ov16_0226AEA0(param0, v9, FONT_SYSTEM, &v0->unk_C8[i], v11); + ov16_0226AEA0(battleInput, v9, FONT_SYSTEM, &v0->unk_C8[i], v11); } } } @@ -2834,7 +2788,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla v0->unk_00 = *param2; } -static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4) +static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4) { int v0, v1; @@ -2848,11 +2802,11 @@ static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, } Window_Init(¶m3->unk_00); - Window_AddToTopLeftCorner(BattleSystem_BGL(param0->unk_00), ¶m3->unk_00, v1, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(BattleSystem_GetBgConfig(battleInput->battleSystem), ¶m3->unk_00, v1, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } -static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226AF0C(BattleInput *battleInput) { int i; SpriteRenderer *v1; @@ -2863,14 +2817,14 @@ static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) int v6; UnkStruct_ov16_0226ABD4 *v7; - v4 = ¶m0->unk_1A.val2; - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); - v7 = ov16_0226ABD4(param0, param0->unk_66A); + v4 = &battleInput->unk_1A.val2; + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); + v7 = ov16_0226ABD4(battleInput, battleInput->unk_66A); v3 = Unk_ov16_0227047C; for (i = 0; i < LEARNED_MOVES_MAX; i++) { - GF_ASSERT(param0->unk_5EC[i] == NULL); + GF_ASSERT(battleInput->unk_5EC[i] == NULL); if (v4->unk_00[i] != 0) { v5 = MoveTable_LoadParam(v4->unk_00[i], MOVEATTRIBUTE_TYPE); @@ -2878,16 +2832,16 @@ static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) v3.x = Unk_ov16_022702B4[i][0]; v3.y = Unk_ov16_022702B4[i][1]; - param0->unk_5EC[i] = sub_0207CA58(v1, v2, v5, &v3); + battleInput->unk_5EC[i] = sub_0207CA58(v1, v2, v5, &v3); - sub_0200D500(param0->unk_5EC[i], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->unk_5EC[i], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); { void *v8; NNSG2dImageProxy *v9; v8 = G2S_GetOBJCharPtr(); - v9 = SpriteActor_ImageProxy(param0->unk_5EC[i]->unk_00); + v9 = SpriteActor_ImageProxy(battleInput->unk_5EC[i]->unk_00); MI_CpuCopy16(v7->unk_18[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); } @@ -2895,72 +2849,72 @@ static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) } } -static void ov16_0226AFF4(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226AFF4(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); for (i = 0; i < 4; i++) { - if (param0->unk_5EC[i] != NULL) { - sub_0207CA88(param0->unk_5EC[i]); - param0->unk_5EC[i] = NULL; + if (battleInput->unk_5EC[i] != NULL) { + sub_0207CA88(battleInput->unk_5EC[i]); + battleInput->unk_5EC[i] = NULL; } } } -static void ov16_0226B028(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226B028(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - v1 = ov16_0223E010(param0->unk_00); - v2 = ov16_0223E018(param0->unk_00); + v1 = ov16_0223E010(battleInput->battleSystem); + v2 = ov16_0223E018(battleInput->battleSystem); for (i = 0; i < 4; i++) { - if (param0->unk_5FC[i] != NULL) { - sub_0207CB00(param0->unk_5FC[i]); + if (battleInput->unk_5FC[i] != NULL) { + sub_0207CB00(battleInput->unk_5FC[i]); sub_0207CAF8(v2, 20029 + i); - param0->unk_5FC[i] = NULL; + battleInput->unk_5FC[i] = NULL; } } } -static void ov16_0226B06C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2) { - ov11_0221F81C(BattleSystem_PaletteSys(param0->unk_00), param1, 5, 1, 8 + param2); + ov11_0221F81C(BattleSystem_GetPaletteData(battleInput->battleSystem), param1, 5, 1, 8 + param2); } -static void ov16_0226B088(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226B088(BattleInput *battleInput, int param1) { PaletteData *v0; int i; - v0 = BattleSystem_PaletteSys(param0->unk_00); + v0 = BattleSystem_GetPaletteData(battleInput->battleSystem); for (i = param1; i < 4; i++) { - ov16_0226B31C(param0, &Unk_ov16_0227022C[i], &Unk_ov16_02270274[i], 3, 0); - PaletteData_LoadBuffer(v0, ¶m0->unk_58[0xe * 16], 1, (8 + i) * 16, 0x20); + ov16_0226B31C(battleInput, &Unk_ov16_0227022C[i], &Unk_ov16_02270274[i], 3, 0); + PaletteData_LoadBuffer(v0, &battleInput->unk_58[0xe * 16], 1, (8 + i) * 16, 0x20); } } -static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226B0DC(BattleInput *battleInput, int param1) { PaletteData *v0; int v1; const u8 v2[] = { 6, 0xc, 0xd, 5 }; BgConfig *v3; - v3 = BattleSystem_BGL(param0->unk_00); - v0 = BattleSystem_PaletteSys(param0->unk_00); + v3 = BattleSystem_GetBgConfig(battleInput->battleSystem); + v0 = BattleSystem_GetPaletteData(battleInput->battleSystem); - ov16_0226B31C(param0, &Unk_ov16_022701FC[param1], &Unk_ov16_022702C4[param1], 4, 0); + ov16_0226B31C(battleInput, &Unk_ov16_022701FC[param1], &Unk_ov16_022702C4[param1], 4, 0); - PaletteData_LoadBuffer(v0, ¶m0->unk_58[0xe * 16], 1, v2[param1] * 16, 0x20); + PaletteData_LoadBuffer(v0, &battleInput->unk_58[0xe * 16], 1, v2[param1] * 16, 0x20); Bg_ScheduleTilemapTransfer(v3, 4); Bg_FillTilemapRect(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17); Bg_ScheduleTilemapTransfer(v3, 5); @@ -2979,35 +2933,35 @@ static void ov16_0226B198(void) } } -static void ov16_0226B1C4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) +static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2) { if (param1 == 1) { - ov16_0226B1E8(param0); + ov16_0226B1E8(battleInput); } if (param2 == 1) { - SysTask_ExecuteAfterVBlank(ov16_0226BCBC, param0, 10); + SysTask_ExecuteAfterVBlank(ov16_0226BCBC, battleInput, 10); } } -static void ov16_0226B1E8(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226B1E8(BattleInput *battleInput) { - ov16_0226AFF4(param0); - ov16_0226B028(param0); - ov16_0226AAC0(param0); - ov16_0226A718(param0); - ov16_0226A768(param0); + ov16_0226AFF4(battleInput); + ov16_0226B028(battleInput); + ov16_0226AAC0(battleInput); + ov16_0226A718(battleInput); + ov16_0226A768(battleInput); } -static void ov16_0226B20C(UnkStruct_ov16_02268A14 *param0, u8 *param1, int param2) +static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2) { UnkStruct_ov16_02260F14 *v0; int i; u8 v2[6]; int v3; - v0 = ¶m0->unk_1A.val3; - ov16_0223F858(param0->unk_00, v2); + v0 = &battleInput->unk_1A.val3; + ov16_0223F858(battleInput->battleSystem, v2); for (i = 0; i < 4; i++) { v3 = v2[2 + i]; @@ -3015,19 +2969,19 @@ static void ov16_0226B20C(UnkStruct_ov16_02268A14 *param0, u8 *param1, int param if ((param2 == 1) && (v0->unk_00[v3].unk_01_2 == 0)) { param1[i] = 0; } else { - param1[i] = Unk_ov16_022705B0[param0->unk_66C][i]; + param1[i] = Unk_ov16_022705B0[battleInput->unk_66C][i]; } } } -static void ov16_0226B264(UnkStruct_ov16_02268A14 *param0, int param1, u8 *param2, int param3) +static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int param3) { UnkStruct_ov16_02260F14 *v0; int i; - v0 = ¶m0->unk_1A.val3; + v0 = &battleInput->unk_1A.val3; - switch (param0->unk_66C) { + switch (battleInput->unk_66C) { case 0: case 8: case 9: @@ -3042,54 +2996,54 @@ static void ov16_0226B264(UnkStruct_ov16_02268A14 *param0, int param1, u8 *param } break; default: - ov16_0226B20C(param0, param2, param3); + ov16_0226B20C(battleInput, param2, param3); break; } } -static void ov16_0226B2BC(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1) +static void ov16_0226B2BC(SysTaskFunc param0, BattleInput *battleInput) { - GF_ASSERT(param1->unk_0C == NULL); + GF_ASSERT(battleInput->unk_0C == NULL); - MI_CpuClear8(¶m1->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); - param1->unk_0C = SysTask_Start(param0, param1, 1300); + MI_CpuClear8(&battleInput->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); + battleInput->unk_0C = SysTask_Start(param0, battleInput, 1300); } -static void ov16_0226B2F0(UnkStruct_ov16_02268A14 *param0) +static void ov16_0226B2F0(BattleInput *battleInput) { - if (param0->unk_0C != NULL) { - SysTask_Done(param0->unk_0C); - param0->unk_0C = NULL; - MI_CpuClear8(¶m0->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); + if (battleInput->unk_0C != NULL) { + SysTask_Done(battleInput->unk_0C); + battleInput->unk_0C = NULL; + MI_CpuClear8(&battleInput->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); } } -static void inline_ov16_0226B314(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1) +static void inline_ov16_0226B314(SysTaskFunc param0, BattleInput *battleInput) { - GF_ASSERT(param1->unk_10 == NULL); + GF_ASSERT(battleInput->unk_10 == NULL); - MI_CpuClear8(¶m1->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); - param1->unk_10 = SysTask_Start(param0, param1, 1320); + MI_CpuClear8(&battleInput->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); + battleInput->unk_10 = SysTask_Start(param0, battleInput, 1320); } -static void inline_ov16_0226B318_1_sub(UnkStruct_ov16_02268A14 *param0) +static void inline_ov16_0226B318_1_sub(BattleInput *battleInput) { - if (param0->unk_10 != NULL) { - SysTask_Done(param0->unk_10); - param0->unk_10 = NULL; - MI_CpuClear8(¶m0->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); + if (battleInput->unk_10 != NULL) { + SysTask_Done(battleInput->unk_10); + battleInput->unk_10 = NULL; + MI_CpuClear8(&battleInput->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); } } -static void ov16_0226B314(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226B314(BattleInput *battleInput, int param1) { return; - inline_ov16_0226B314(inline_ov16_0226B314_1, param0); - param0->unk_6A0.unk_00 = param1; + inline_ov16_0226B314(inline_ov16_0226B314_1, battleInput); + battleInput->unk_6A0.unk_00 = param1; } -static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226B318(BattleInput *battleInput, int param1) { return; @@ -3097,20 +3051,20 @@ static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1) return; } - inline_ov16_0226B314(inline_ov16_0226B318_1, param0); - param0->unk_6A0.unk_09 = param1; + inline_ov16_0226B314(inline_ov16_0226B318_1, battleInput); + battleInput->unk_6A0.unk_09 = param1; } static void inline_ov16_0226B318_1(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; UnkStruct_ov16_02268A14_sub4 *v1; BgConfig *v2; PaletteData *v3; int v4, v5; - v1 = &v0->unk_6A0; - v3 = BattleSystem_PaletteSys(v0->unk_00); + v1 = &battleInput->unk_6A0; + v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; switch (v1->unk_08) { @@ -3135,7 +3089,7 @@ static void inline_ov16_0226B318_1(SysTask *param0, void *param1) PaletteData_Blend(v3, 1, v1->unk_09 * 16 + 0xa, 1, v1->unk_04 >> 8, 0x4634); if (v5 == 1) { - inline_ov16_0226B318_1_sub(v0); + inline_ov16_0226B318_1_sub(battleInput); return; } @@ -3145,15 +3099,15 @@ static void inline_ov16_0226B318_1(SysTask *param0, void *param1) static void inline_ov16_0226B314_1(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; UnkStruct_ov16_02268A14_sub4 *v1; BgConfig *v2; PaletteData *v3; int i, v5; u8 v6[4]; - v1 = &v0->unk_6A0; - v3 = BattleSystem_PaletteSys(v0->unk_00); + v1 = &battleInput->unk_6A0; + v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; switch (v1->unk_08) { @@ -3173,7 +3127,7 @@ static void inline_ov16_0226B314_1(SysTask *param0, void *param1) v5 = 1; } - ov16_0226B264(v0, v1->unk_00, v6, 1); + ov16_0226B264(battleInput, v1->unk_00, v6, 1); for (i = 0; i < 4; i++) { if (v6[i] == 1) { @@ -3184,14 +3138,14 @@ static void inline_ov16_0226B314_1(SysTask *param0, void *param1) } if (v5 == 1) { - inline_ov16_0226B318_1_sub(v0); + inline_ov16_0226B318_1_sub(battleInput); return; } break; } } -static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4) +static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4) { int j, i; BgConfig *v2; @@ -3199,9 +3153,9 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co u16 *v5, *v6; int v7; - v2 = BattleSystem_BGL(param0->unk_00); + v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); v3 = Bg_GetTilemapBuffer(v2, 4); - v5 = param0->unk_3C[param3]; + v5 = battleInput->unk_3C[param3]; v7 = param1[param4]; for (i = param2->unk_00; i <= param2->unk_01; i++) { @@ -3218,50 +3172,50 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co static void ov16_0226B390(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; BgConfig *v1; int v2, v3; - v1 = BattleSystem_BGL(v0->unk_00); + v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); - switch (v0->unk_67C.unk_00) { + switch (battleInput->unk_67C.unk_00) { case 0: - ov16_0226B31C(v0, v0->unk_67C.unk_04_val3.unk_00, v0->unk_67C.unk_04_val3.unk_04, v0->unk_67C.unk_04_val3.unk_0C, 2); - sub_020129A4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + -2); + ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); + sub_020129A4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + -2); - if ((v0->unk_67C.unk_04_val3.unk_0E != 0xff) && (v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, -2); + if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { + sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, -2); } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; case 1: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 <= 0) { + if (battleInput->unk_67C.unk_02 <= 0) { break; } - v0->unk_67C.unk_02 = 0; - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_02 = 0; + battleInput->unk_67C.unk_00++; case 2: - ov16_0226B31C(v0, v0->unk_67C.unk_04_val3.unk_00, v0->unk_67C.unk_04_val3.unk_04, v0->unk_67C.unk_04_val3.unk_0C, 1); - sub_020129A4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + 1); + ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); + sub_020129A4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + 1); - if ((v0->unk_67C.unk_04_val3.unk_0E != 0xff) && (v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, 1); + if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { + sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, 1); } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; default: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 > 0) { - ov16_0226B1C4(v0, v0->unk_67C.unk_04_val3.unk_10, 0); - ov16_0226B2F0(v0); + if (battleInput->unk_67C.unk_02 > 0) { + ov16_0226B1C4(battleInput, battleInput->unk_67C.unk_04_val3.unk_10, 0); + ov16_0226B2F0(battleInput); return; } break; @@ -3270,17 +3224,17 @@ static void ov16_0226B390(SysTask *param0, void *param1) static void ov16_0226B4E0(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; BgConfig *v1; int v2, v3; int v4, v5, v6; int v7, v8, v9; UnkStruct_ov16_02260C00 *v10; - v1 = BattleSystem_BGL(v0->unk_00); - v10 = &v0->unk_1A.val2; + v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); + v10 = &battleInput->unk_1A.val2; - switch (v0->unk_67C.unk_04_val3.unk_08) { + switch (battleInput->unk_67C.unk_04_val3.unk_08) { case 1: v4 = 0; v5 = 9; @@ -3324,72 +3278,72 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) break; } - switch (v0->unk_67C.unk_00) { + switch (battleInput->unk_67C.unk_00) { case 0: - ov16_0226B31C(v0, v0->unk_67C.unk_04_val3.unk_00, v0->unk_67C.unk_04_val3.unk_04, v0->unk_67C.unk_04_val3.unk_0C, 2); + ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); - if (v0->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(v0->unk_4CC[v4].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v4].unk_00, v2, v3 + -2); - sub_020129A4(v0->unk_4CC[v5].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v5].unk_00, v2, v3 + -2); - sub_020129A4(v0->unk_4CC[v6].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v6].unk_00, v2, v3 + -2); + if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { + sub_020129A4(battleInput->unk_4CC[v4].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v4].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->unk_4CC[v5].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v5].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->unk_4CC[v6].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v6].unk_00, v2, v3 + -2); if (v9 != 0) { - sub_0200D5AC(v0->unk_5EC[v7]->unk_00, 0, -2); + sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, -2); - if (v0->unk_5FC[v7] != NULL) { - sub_0200D5AC(v0->unk_5FC[v7]->unk_00, 0, -2); + if (battleInput->unk_5FC[v7] != NULL) { + sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, -2); } } } else { - sub_020129A4(v0->unk_4CC[4].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[4].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->unk_4CC[4].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[4].unk_00, v2, v3 + -2); } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; case 1: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 <= 0) { + if (battleInput->unk_67C.unk_02 <= 0) { break; } - v0->unk_67C.unk_02 = 0; - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_02 = 0; + battleInput->unk_67C.unk_00++; case 2: - ov16_0226B31C(v0, v0->unk_67C.unk_04_val3.unk_00, v0->unk_67C.unk_04_val3.unk_04, v0->unk_67C.unk_04_val3.unk_0C, 1); + ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); - if (v0->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(v0->unk_4CC[v4].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v4].unk_00, v2, v3 + 1); - sub_020129A4(v0->unk_4CC[v5].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v5].unk_00, v2, v3 + 1); - sub_020129A4(v0->unk_4CC[v6].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[v6].unk_00, v2, v3 + 1); + if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { + sub_020129A4(battleInput->unk_4CC[v4].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v4].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->unk_4CC[v5].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v5].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->unk_4CC[v6].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[v6].unk_00, v2, v3 + 1); if (v9 != 0) { - sub_0200D5AC(v0->unk_5EC[v7]->unk_00, 0, 1); + sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, 1); - if (v0->unk_5FC[v7] != NULL) { - sub_0200D5AC(v0->unk_5FC[v7]->unk_00, 0, 1); + if (battleInput->unk_5FC[v7] != NULL) { + sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, 1); } } } else { - sub_020129A4(v0->unk_4CC[4].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[4].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->unk_4CC[4].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[4].unk_00, v2, v3 + 1); } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; default: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 > 0) { - ov16_0226B1C4(v0, 1, 1); - ov16_0226B2F0(v0); + if (battleInput->unk_67C.unk_02 > 0) { + ov16_0226B1C4(battleInput, 1, 1); + ov16_0226B2F0(battleInput); return; } break; @@ -3398,74 +3352,74 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) static void ov16_0226B780(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; BgConfig *v1; int i, v2, v3; u8 v4[4]; - v1 = BattleSystem_BGL(v0->unk_00); + v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); - switch (v0->unk_67C.unk_00) { + switch (battleInput->unk_67C.unk_00) { case 0: - ov16_0226B264(v0, v0->unk_67C.unk_04_val4.unk_1C, v4, 1); + ov16_0226B264(battleInput, battleInput->unk_67C.unk_04_val4.unk_1C, v4, 1); for (i = 0; i < 4; i++) { if (v4[i] == 1) { - ov16_0226B31C(v0, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 2); + ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 2); - if (v0->unk_4CC[0 + i].unk_00 != NULL) { - sub_020129A4(v0->unk_4CC[0 + i].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[0 + i].unk_00, v2, v3 + -2); + if (battleInput->unk_4CC[0 + i].unk_00 != NULL) { + sub_020129A4(battleInput->unk_4CC[0 + i].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[0 + i].unk_00, v2, v3 + -2); } - if (v0->unk_60C[i] != NULL) { - sub_0200D5DC(v0->unk_60C[i], 0, -2); + if (battleInput->unk_60C[i] != NULL) { + sub_0200D5DC(battleInput->unk_60C[i], 0, -2); } } } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; case 1: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 <= 0) { + if (battleInput->unk_67C.unk_02 <= 0) { break; } - v0->unk_67C.unk_02 = 0; - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_02 = 0; + battleInput->unk_67C.unk_00++; case 2: - ov16_0226B264(v0, v0->unk_67C.unk_04_val4.unk_1C, v4, 1); + ov16_0226B264(battleInput, battleInput->unk_67C.unk_04_val4.unk_1C, v4, 1); for (i = 0; i < 4; i++) { if (v4[i] == 1) { - ov16_0226B31C(v0, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 1); + ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 1); - if (v0->unk_4CC[0 + i].unk_00 != NULL) { - sub_020129A4(v0->unk_4CC[0 + i].unk_00, &v2, &v3); - sub_020128C4(v0->unk_4CC[0 + i].unk_00, v2, v3 + 1); + if (battleInput->unk_4CC[0 + i].unk_00 != NULL) { + sub_020129A4(battleInput->unk_4CC[0 + i].unk_00, &v2, &v3); + sub_020128C4(battleInput->unk_4CC[0 + i].unk_00, v2, v3 + 1); } - if (v0->unk_60C[i] != NULL) { - sub_0200D5DC(v0->unk_60C[i], 0, 1); + if (battleInput->unk_60C[i] != NULL) { + sub_0200D5DC(battleInput->unk_60C[i], 0, 1); } } } - v0->unk_67C.unk_00++; + battleInput->unk_67C.unk_00++; break; case 3: - v0->unk_67C.unk_02++; + battleInput->unk_67C.unk_02++; - if (v0->unk_67C.unk_02 > 0) { - v0->unk_67C.unk_02 = 0; - v0->unk_67C.unk_00++; + if (battleInput->unk_67C.unk_02 > 0) { + battleInput->unk_67C.unk_02 = 0; + battleInput->unk_67C.unk_00++; } break; default: - ov16_0226B1C4(v0, 1, 1); - ov16_0226B2F0(v0); + ov16_0226B1C4(battleInput, 1, 1); + ov16_0226B2F0(battleInput); return; } } @@ -3507,9 +3461,7 @@ static TextColor ov16_0226B924(int param0, int param1) static void ov16_0226B988(SysTask *param0, void *param1) { UnkStruct_ov16_0226B988 *v0 = param1; - BgConfig *v1; - - v1 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *bgConfig = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); switch (v0->unk_13) { case 0: @@ -3527,23 +3479,23 @@ static void ov16_0226B988(SysTask *param0, void *param1) } break; case 1: - v0->unk_00->unk_66E = 0; + v0->battleInput->unk_66E = 0; SysTask_Done(v0->unk_04); DisableHBlank(); GXS_SetVisibleWnd(GX_WNDMASK_NONE); - ov16_0226BCCC(v0->unk_00, 1); + ov16_0226BCCC(v0->battleInput, 1); v0->unk_13++; break; default: - if (ov16_0226BCD0(v0->unk_00) == 0) { + if (ov16_0226BCD0(v0->battleInput) == 0) { break; } - Bg_SetOffset(v1, 4, 0, 0); - Bg_SetOffset(v1, 4, 3, 0); - Bg_SetOffset(v1, 5, 0, 0); - Bg_SetOffset(v1, 5, 3, 0); - BattleSystem_SetCommandSelectionFlags(v0->unk_00->unk_00, 1); + Bg_SetOffset(bgConfig, 4, 0, 0); + Bg_SetOffset(bgConfig, 4, 3, 0); + Bg_SetOffset(bgConfig, 5, 0, 0); + Bg_SetOffset(bgConfig, 5, 3, 0); + BattleSystem_SetCommandSelectionFlags(v0->battleInput->battleSystem, 1); Heap_FreeToHeap(param1); SysTask_Done(param0); @@ -3554,10 +3506,9 @@ static void ov16_0226B988(SysTask *param0, void *param1) static void ov16_0226BA88(SysTask *param0, void *param1) { UnkStruct_ov16_0226B988 *v0 = param1; - BgConfig *v1; s32 v2, v3, v4; - v1 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *bgConfig = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); if (v0->unk_12 == 4) { v4 = 255 - v0->unk_0C; @@ -3566,8 +3517,8 @@ static void ov16_0226BA88(SysTask *param0, void *param1) v4 = 0; } - Bg_SetOffset(v1, 4, 0, v4); - Bg_SetOffset(v1, 5, 0, 255 - v0->unk_0C); + Bg_SetOffset(bgConfig, 4, 0, v4); + Bg_SetOffset(bgConfig, 5, 0, 255 - v0->unk_0C); v2 = -v0->unk_08 / 100; } else { v4 = v0->unk_0C; @@ -3576,14 +3527,14 @@ static void ov16_0226BA88(SysTask *param0, void *param1) v4 = 0; } - Bg_SetOffset(v1, 4, 0, v4); - Bg_SetOffset(v1, 5, 0, v0->unk_0C); + Bg_SetOffset(bgConfig, 4, 0, v4); + Bg_SetOffset(bgConfig, 5, 0, v0->unk_0C); v2 = 255 + v0->unk_08 / 100; } - Bg_SetOffset(v1, 4, 3, 0); - Bg_SetOffset(v1, 5, 3, 0); + Bg_SetOffset(bgConfig, 4, 3, 0); + Bg_SetOffset(bgConfig, 5, 3, 0); v3 = (18 * 8) + (v0->unk_0A) / 100; @@ -3621,14 +3572,14 @@ static void ov16_0226BB94(void *param0) v1 = GX_GetVCount(); if (v1 == (18 * 8)) { - BgConfig *v3 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *v3 = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); Bg_SetOffset(v3, 4, 0, 0); Bg_SetOffset(v3, 4, 3, v0->unk_10); Bg_SetOffset(v3, 5, 0, 0); Bg_SetOffset(v3, 5, 3, v0->unk_10); } else if (v1 > 192) { - BgConfig *v4 = BattleSystem_BGL(v0->unk_00->unk_00); + BgConfig *v4 = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); if (v0->unk_12 == 4) { v2 = 255 - v0->unk_0C; @@ -3657,11 +3608,11 @@ static void ov16_0226BB94(void *param0) static void ov16_0226BC50(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; const UnkStruct_ov16_02270670 *v1; int i; - v1 = &Unk_ov16_02270670[v0->unk_66B]; + v1 = &Unk_ov16_02270670[battleInput->unk_66B]; for (i = 0; i < 4; i++) { if (v1->unk_04_val2[i] == 0xffff) { @@ -3680,20 +3631,20 @@ static void ov16_0226BC50(SysTask *param0, void *param1) static void ov16_0226BCBC(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; ov16_0226B198(); SysTask_Done(param0); } -void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1) +void ov16_0226BCCC(BattleInput *battleInput, int param1) { return; } -BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0) +BOOL ov16_0226BCD0(BattleInput *battleInput) { - if (param0->unk_664 == NULL) { + if (battleInput->unk_664 == NULL) { return 1; } @@ -3702,40 +3653,40 @@ BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0) static void ov16_0226BCE4(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; int v1; u16 v2; PaletteData *v3; s16 v4; - v3 = BattleSystem_PaletteSys(v0->unk_00); + v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); if (PaletteData_GetSelectedBuffersMask(v3) != 0) { return; } { - PaletteData_Blend(v3, 1, 16 * 0 + 1, 1, v0->unk_676 >> 8, 0x7e37); + PaletteData_Blend(v3, 1, 16 * 0 + 1, 1, battleInput->unk_676 >> 8, 0x7e37); - if (v0->unk_674 == 0) { - v0->unk_676 += 0x200; + if (battleInput->unk_674 == 0) { + battleInput->unk_676 += 0x200; } else { - v0->unk_676 -= 0x200; + battleInput->unk_676 -= 0x200; } - if (v0->unk_676 >= (16 + 1) << 8) { - v0->unk_676 = (16 - 1) << 8; - v0->unk_674 = 1; - } else if (v0->unk_676 <= 0) { - v0->unk_676 = 1 << 8; - v0->unk_674 = 0; + if (battleInput->unk_676 >= (16 + 1) << 8) { + battleInput->unk_676 = (16 - 1) << 8; + battleInput->unk_674 = 1; + } else if (battleInput->unk_676 <= 0) { + battleInput->unk_676 = 1 << 8; + battleInput->unk_674 = 0; } } } static void ov16_0226BD74(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 *v0 = param1; + BattleInput *battleInput = param1; PaletteData *v1; u16 *v2; int v3; @@ -3747,7 +3698,7 @@ static void ov16_0226BD74(SysTask *param0, void *param1) RenderControlFlags_ZeroSpeedUpBattle(); RenderControlFlags_ZeroWaitBattle(); - v1 = BattleSystem_PaletteSys(v0->unk_00); + v1 = BattleSystem_GetPaletteData(battleInput->battleSystem); if (PaletteData_GetSelectedBuffersMask(v1) != 0) { return; @@ -3757,56 +3708,56 @@ static void ov16_0226BD74(SysTask *param0, void *param1) v3 = (16 - 8) * 2; if (gCoreSys.touchHeld && ((v4 == 1) || (v5 == 1))) { - if (memcmp(&v2[8], &v0->unk_5C[8], v3) == 0) { - if (BattleSystem_BattleType(v0->unk_00) & 0x80) { - MI_CpuCopy16(&v0->unk_60[0], &v2[0], 0x20); - MI_CpuCopy16(&v0->unk_60[16], &v2[7 * 16], 0x20); + if (memcmp(&v2[8], &battleInput->unk_5C[8], v3) == 0) { + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_FRONTIER) { + MI_CpuCopy16(&battleInput->unk_60[0], &v2[0], 0x20); + MI_CpuCopy16(&battleInput->unk_60[16], &v2[7 * 16], 0x20); } else { - MI_CpuCopy16(&v0->unk_60[8], &v2[8], v3); + MI_CpuCopy16(&battleInput->unk_60[8], &v2[8], v3); } } } else { - if (memcmp(&v2[8], &v0->unk_60[8], v3) == 0) { - if (BattleSystem_BattleType(v0->unk_00) & 0x80) { - MI_CpuCopy16(&v0->unk_5C[0], &v2[0], 0x20); - MI_CpuCopy16(&v0->unk_5C[16], &v2[7 * 16], 0x20); + if (memcmp(&v2[8], &battleInput->unk_60[8], v3) == 0) { + if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_FRONTIER) { + MI_CpuCopy16(&battleInput->unk_5C[0], &v2[0], 0x20); + MI_CpuCopy16(&battleInput->unk_5C[16], &v2[7 * 16], 0x20); } else { - MI_CpuCopy16(&v0->unk_5C[8], &v2[8], v3); + MI_CpuCopy16(&battleInput->unk_5C[8], &v2[8], v3); } } } } -static int ov16_0226BE48(UnkStruct_ov16_02268A14 *param0) +static int ov16_0226BE48(BattleInput *battleInput) { UnkStruct_ov16_0226CB10 *v0; const UnkStruct_ov16_02270670 *v1; - v0 = ¶m0->unk_6BC; - v1 = &Unk_ov16_02270670[param0->unk_66B]; + v0 = &battleInput->unk_6BC; + v1 = &Unk_ov16_02270670[battleInput->unk_66B]; if (v1->unk_20 == NULL) { return 0xffffffff; } if (v0->unk_00 == 0) { - if ((param0->unk_6C0 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { - if (param0->unk_6C0 == 0) { + if ((battleInput->unk_6C0 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { + if (battleInput->unk_6C0 == 0) { Sound_PlayEffect(1500); } v0->unk_00 = 1; - param0->unk_6C0 = 0; - v1->unk_20(param0, 1); + battleInput->unk_6C0 = 0; + v1->unk_20(battleInput, 1); } return 0xffffffff; } - return v1->unk_20(param0, 0); + return v1->unk_20(battleInput, 0); } -static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1) +static int ov16_0226BEC0(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226CB10 *v0; u32 v1; @@ -3814,20 +3765,20 @@ static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1) int i, v4, v5; UnkStruct_ov16_0226C378 *v6; - v0 = ¶m0->unk_6BC; - v2 = &Unk_ov16_02270670[param0->unk_66B]; - v5 = BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A); - v6 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, v5)); + v0 = &battleInput->unk_6BC; + v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + v5 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + v6 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v5)); if (param1 == 1) { v0->unk_02 = v6->unk_00; v0->unk_01 = v6->unk_01; v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - switch (param0->unk_66B) { + switch (battleInput->unk_66B) { case 6: case 5: v1 = ov16_0226CB10(v0, 1, 1, Unk_ov16_022701EC[0]); @@ -3863,12 +3814,12 @@ static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; case PAD_BUTTON_B: - if (param0->unk_66F == 1) { + if (battleInput->unk_66F == 1) { for (i = 0; i < v2->unk_14[i].rect.top != 0xff; i++) { if (4 == v2->unk_18[i]) { return i; @@ -3881,15 +3832,15 @@ static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1) return 0xffffffff; } -static void ov16_0226C0A0(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226C0A0(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226C378 *v0; int v1, j, i; - v1 = BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A); + v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - if ((param1 != 3) || (param0->unk_6C1 == 0)) { - v0 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, v1)); + if ((param1 != 3) || (battleInput->unk_6C1 == 0)) { + v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); for (i = 0; i < 2; i++) { for (j = 0; j < 3; j++) { @@ -3904,21 +3855,21 @@ static void ov16_0226C0A0(UnkStruct_ov16_02268A14 *param0, int param1) } } -static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1) +static int ov16_0226C100(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226CB10 *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, v4; - v0 = ¶m0->unk_6BC; - v2 = &Unk_ov16_02270670[param0->unk_66B]; + v0 = &battleInput->unk_6BC; + v2 = &Unk_ov16_02270670[battleInput->unk_66B]; if (param1 == 1) { v0->unk_02 = 0; v0->unk_01 = 0; v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3930,7 +3881,7 @@ static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; @@ -3941,7 +3892,7 @@ static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1) return 0xffffffff; } -static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) +static int ov16_0226C1F8(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226CB10 *v0; u32 v1; @@ -3951,10 +3902,10 @@ static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) UnkStruct_ov16_02260C00 *v6; UnkStruct_ov16_0226C378 *v7; - v7 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A))); - v0 = ¶m0->unk_6BC; - v2 = &Unk_ov16_02270670[param0->unk_66B]; - v6 = ¶m0->unk_1A.val2; + v7 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); + v0 = &battleInput->unk_6BC; + v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + v6 = &battleInput->unk_1A.val2; if (param1 == 1) { v0->unk_02 = v7->unk_02; @@ -3969,7 +3920,7 @@ static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; } - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3982,7 +3933,7 @@ static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; @@ -3999,7 +3950,7 @@ static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) return 0xffffffff; } -static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226C378(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226C378 *v0; int v1, j, i; @@ -4008,8 +3959,8 @@ static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1) return; } - v1 = BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A); - v0 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, v1)); + v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { @@ -4022,7 +3973,7 @@ static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1) } } -static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) +static int ov16_0226C3C8(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226CB10 *v0; u32 v1; @@ -4039,14 +3990,14 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) int v29; UnkStruct_ov16_0226C378 *v30; - v30 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A))); - v0 = ¶m0->unk_6BC; - v2 = &Unk_ov16_02270670[param0->unk_66B]; + v30 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); + v0 = &battleInput->unk_6BC; + v2 = &Unk_ov16_02270670[battleInput->unk_66B]; MI_CpuCopy8(Unk_ov16_022701DC, v8, 3 * 2); - ov16_0226B20C(param0, v6, 1); - ov16_0226B20C(param0, v7, 0); + ov16_0226B20C(battleInput, v6, 1); + ov16_0226B20C(battleInput, v7, 0); for (i = 0; i < 2; i++) { for (j = 0; j < 2; j++) { @@ -4056,7 +4007,7 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) } } - switch (param0->unk_66C) { + switch (battleInput->unk_66C) { default: case 0: case 4: @@ -4179,7 +4130,7 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) if (param1 == 1) { if (v5 == 0) { - if (v30->unk_06 == param0->unk_66C) { + if (v30->unk_06 == battleInput->unk_66C) { v0->unk_02 = v30->unk_04; v0->unk_01 = v30->unk_05; } else if (v6[5 - 2] == 1) { @@ -4197,21 +4148,21 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) } v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { v0->unk_02 = 0; v0->unk_01 = 0; if (((v28 == -1) && (v27 == -1)) || (v17 == -1)) { - ov16_0226DD9C(param0->unk_6B8, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); } else if ((v28 != -1) && (v27 == -1)) { - ov16_0226DCCC(param0->unk_6B8, v13, v15, v14, v15, v13, v28, v14, v16, ((192 + 80) << FX32_SHIFT)); + ov16_0226DCCC(battleInput->cursor, v13, v15, v14, v15, v13, v28, v14, v16, ((192 + 80) << FX32_SHIFT)); } else { - ov16_0226DCCC(param0->unk_6B8, v13, v15, v14, v15, v13, v16, v14, v27, ((192 + 80) << FX32_SHIFT)); + ov16_0226DCCC(battleInput->cursor, v13, v15, v14, v15, v13, v16, v14, v27, ((192 + 80) << FX32_SHIFT)); } if (v17 != -1) { - ov16_0226DDC0(param0->unk_6B8, v17, v18, v29, ((192 + 80) << FX32_SHIFT)); + ov16_0226DDC0(battleInput->cursor, v17, v18, v29, ((192 + 80) << FX32_SHIFT)); } } @@ -4231,25 +4182,25 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) case PAD_KEY_RIGHT: if (v5 == 0) { v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { if (v0->unk_01 == 0) { if (((v27 == -1) && (v28 == -1)) || (v17 == -1)) { - ov16_0226DD9C(param0->unk_6B8, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); } else if ((v28 != -1) && (v27 == -1)) { - ov16_0226DCCC(param0->unk_6B8, v13, v15, v14, v15, v13, v28, v14, v16, ((192 + 80) << FX32_SHIFT)); + ov16_0226DCCC(battleInput->cursor, v13, v15, v14, v15, v13, v28, v14, v16, ((192 + 80) << FX32_SHIFT)); } else { - ov16_0226DCCC(param0->unk_6B8, v13, v15, v14, v15, v13, v16, v14, v27, ((192 + 80) << FX32_SHIFT)); + ov16_0226DCCC(battleInput->cursor, v13, v15, v14, v15, v13, v16, v14, v27, ((192 + 80) << FX32_SHIFT)); } if (v17 != -1) { - ov16_0226DDC0(param0->unk_6B8, v17, v18, v29, ((192 + 80) << FX32_SHIFT)); + ov16_0226DDC0(battleInput->cursor, v17, v18, v29, ((192 + 80) << FX32_SHIFT)); } else { - ov16_0226DE04(param0->unk_6B8); + ov16_0226DE04(battleInput->cursor); } } else { - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[4].rect.left + 8, v2->unk_14[4].rect.right - 8, v2->unk_14[4].rect.top + 8, v2->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); - ov16_0226DE04(param0->unk_6B8); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[4].rect.left + 8, v2->unk_14[4].rect.right - 8, v2->unk_14[4].rect.top + 8, v2->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DE04(battleInput->cursor); } } break; @@ -4279,7 +4230,7 @@ static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) return 0xffffffff; } -static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1) +static void ov16_0226C9B8(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226C378 *v0; int v1, j, i; @@ -4288,10 +4239,10 @@ static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1) return; } - v1 = BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A); - v0 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, v1)); + v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); - v0->unk_06 = param0->unk_66C; + v0->unk_06 = battleInput->unk_66C; for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { @@ -4305,19 +4256,19 @@ static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1) } } -static int ov16_0226CA14(UnkStruct_ov16_02268A14 *param0, int param1) +static int ov16_0226CA14(BattleInput *battleInput, int param1) { UnkStruct_ov16_0226CB10 *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, v4; - v0 = ¶m0->unk_6BC; - v2 = &Unk_ov16_02270670[param0->unk_66B]; + v0 = &battleInput->unk_6BC; + v2 = &Unk_ov16_02270670[battleInput->unk_66B]; if (param1 == 1) { v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -4329,7 +4280,7 @@ static int ov16_0226CA14(UnkStruct_ov16_02268A14 *param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; @@ -4464,60 +4415,60 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2 return v2; } -int ov16_0226CD08(UnkStruct_ov16_02268A14 *param0) +int ov16_0226CD08(BattleInput *battleInput) { - return param0->unk_6C0; + return battleInput->unk_6C0; } -void ov16_0226CD10(UnkStruct_ov16_02268A14 *param0, int param1) +void ov16_0226CD10(BattleInput *battleInput, int param1) { - param0->unk_6C0 = param1; + battleInput->unk_6C0 = param1; } -static int (*const Unk_ov16_0227020C[])(UnkStruct_ov16_02268A14 *) = { +static int (*const Unk_ov16_0227020C[])(BattleInput *) = { ov16_0226CD84, ov16_0226CDDC }; -static int ov16_0226CD18(UnkStruct_ov16_02268A14 *param0) +static int ov16_0226CD18(BattleInput *battleInput) { SpriteRenderer *v0; SpriteGfxHandler *v1; PaletteData *v2; int v3; - v0 = ov16_0223E010(param0->unk_00); - v1 = ov16_0223E018(param0->unk_00); - v2 = BattleSystem_PaletteSys(param0->unk_00); + v0 = ov16_0223E010(battleInput->battleSystem); + v1 = ov16_0223E018(battleInput->battleSystem); + v2 = BattleSystem_GetPaletteData(battleInput->battleSystem); v3 = 0xffffffff; - if (ov16_0223F228(param0->unk_00) == 0) { - GF_ASSERT(param0->unk_6C4.unk_04 < NELEMS(Unk_ov16_0227020C)); - v3 = Unk_ov16_0227020C[param0->unk_6C4.unk_04](param0); + if (ov16_0223F228(battleInput->battleSystem) == 0) { + GF_ASSERT(battleInput->catchingTutorial.unk_04 < NELEMS(Unk_ov16_0227020C)); + v3 = Unk_ov16_0227020C[battleInput->catchingTutorial.unk_04](battleInput); } else { - v3 = ov16_0226CE34(param0); + v3 = ov16_0226CE34(battleInput); } if (v3 != 0xffffffff) { - param0->unk_6C4.unk_05 = 0; - param0->unk_6C4.unk_06 = 0; - param0->unk_6C4.unk_04++; + battleInput->catchingTutorial.unk_05 = 0; + battleInput->catchingTutorial.unk_06 = 0; + battleInput->catchingTutorial.unk_04++; } return v3; } -static int ov16_0226CD84(UnkStruct_ov16_02268A14 *param0) +static int ov16_0226CD84(BattleInput *battleInput) { - switch (param0->unk_6C4.unk_05) { + switch (battleInput->catchingTutorial.unk_05) { case 0: - ov16_0226DF80(param0->unk_6C4.unk_00, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(param0->unk_6C4.unk_00, 60); - param0->unk_6C4.unk_05++; + ov16_0226DF80(battleInput->catchingTutorial.finger, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); + ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + battleInput->catchingTutorial.unk_05++; break; default: - if (ov16_0226DFD4(param0->unk_6C4.unk_00) == 1) { - param0->unk_6C4.unk_05++; + if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + battleInput->catchingTutorial.unk_05++; return 0; } @@ -4527,17 +4478,17 @@ static int ov16_0226CD84(UnkStruct_ov16_02268A14 *param0) return 0xffffffff; } -static int ov16_0226CDDC(UnkStruct_ov16_02268A14 *param0) +static int ov16_0226CDDC(BattleInput *battleInput) { - switch (param0->unk_6C4.unk_05) { + switch (battleInput->catchingTutorial.unk_05) { case 0: - ov16_0226DF80(param0->unk_6C4.unk_00, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(param0->unk_6C4.unk_00, 60); - param0->unk_6C4.unk_05++; + ov16_0226DF80(battleInput->catchingTutorial.finger, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); + ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + battleInput->catchingTutorial.unk_05++; break; default: - if (ov16_0226DFD4(param0->unk_6C4.unk_00) == 1) { - param0->unk_6C4.unk_05++; + if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + battleInput->catchingTutorial.unk_05++; return 1; } break; @@ -4546,25 +4497,25 @@ static int ov16_0226CDDC(UnkStruct_ov16_02268A14 *param0) return 0xffffffff; } -static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0) +static int ov16_0226CE34(BattleInput *battleInput) { - switch (param0->unk_6C4.unk_05) { + switch (battleInput->catchingTutorial.unk_05) { case 0: - param0->unk_6C4.unk_06++; + battleInput->catchingTutorial.unk_06++; - if (param0->unk_6C4.unk_06 > 60) { - param0->unk_6C4.unk_06 = 0; - param0->unk_6C4.unk_05++; + if (battleInput->catchingTutorial.unk_06 > 60) { + battleInput->catchingTutorial.unk_06 = 0; + battleInput->catchingTutorial.unk_05++; } break; case 1: - ov16_0226DF80(param0->unk_6C4.unk_00, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(param0->unk_6C4.unk_00, 60); - param0->unk_6C4.unk_05++; + ov16_0226DF80(battleInput->catchingTutorial.finger, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); + ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + battleInput->catchingTutorial.unk_05++; break; default: - if (ov16_0226DFD4(param0->unk_6C4.unk_00) == 1) { - param0->unk_6C4.unk_05++; + if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + battleInput->catchingTutorial.unk_05++; return 1; } break; @@ -4573,12 +4524,12 @@ static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0) return 0xffffffff; } -void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) +void ov16_0226CEB0(BattleInput *battleInput, int param1) { - BgConfig *v0 = BattleSystem_BGL(param0->unk_00); - PaletteData *v1 = BattleSystem_PaletteSys(param0->unk_00); + BgConfig *v0 = BattleSystem_GetBgConfig(battleInput->battleSystem); + PaletteData *v1 = BattleSystem_GetPaletteData(battleInput->battleSystem); - GF_ASSERT(param0->unk_66B == 18); + GF_ASSERT(battleInput->unk_66B == 18); LoadStandardWindowGraphics(v0, 5, 0x20, 1, 0, 5); PaletteData_LoadBufferFromHardware(v1, 1, 1 * 16, 0x20); @@ -4606,7 +4557,7 @@ void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) { Strbuf *v8; - MessageLoader *v9 = BattleSystem_MessageLoader(param0->unk_00); + MessageLoader *v9 = BattleSystem_MessageLoader(battleInput->battleSystem); int i; const u16 v11[][2] = { { 1261, 1262 }, @@ -4615,20 +4566,20 @@ void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) }; for (i = 0; i < 2; i++) { - if (param0->unk_4CC[1 + i].unk_00 != NULL) { + if (battleInput->unk_4CC[1 + i].unk_00 != NULL) { GF_ASSERT(0); return; } v8 = MessageLoader_GetNewStrbuf(v9, v11[param1][i]); - ov16_0226A98C(param0, ¶m0->unk_4CC[1 + i], v8, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); + ov16_0226A98C(battleInput, &battleInput->unk_4CC[1 + i], v8, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); Strbuf_Free(v8); } } } -u8 ov16_0226D088(UnkStruct_ov16_02268A14 *param0) +u8 ov16_0226D088(BattleInput *battleInput) { - return param0->unk_6C1; + return battleInput->unk_6C1; } diff --git a/src/battle/battle_io.c b/src/battle/battle_io.c index 99d94b8c62..5744fa95b7 100644 --- a/src/battle/battle_io.c +++ b/src/battle/battle_io.c @@ -521,7 +521,7 @@ void BattleIO_SetCommandSelection(BattleSystem *battleSys, BattleContext *battle v0.unk_01 = partySlot; v0.unk_29 = battleCtx->battlersSwitchingMask | v10; - v9 = BattleSystem_BattleType(battleSys); + v9 = BattleSystem_GetBattleType(battleSys); if ((v9 & 0x2) && ((v9 & 0x8) == 0)) { v2 = battler & 1; @@ -697,7 +697,7 @@ void BattleIO_ShowTargetSelection(BattleSystem *battleSys, BattleContext *battle BattleIO_ClearBuffer(battleCtx, battler); - v2 = BattleSystem_BattleType(battleSys); + v2 = BattleSystem_GetBattleType(battleSys); v0.unk_00 = 16; v0.unk_02 = range; @@ -760,7 +760,7 @@ void BattleIO_ShowBagScreen(BattleSystem *battleSys, BattleContext *battleCtx, i v0.unk_20[v1] = battleCtx->battleMons[v1].moveEffectsData.embargoTurns; } - if (BattleSystem_BattleType(battleSys) == (0x2 | 0x8 | 0x40)) { + if (BattleSystem_GetBattleType(battleSys) == (0x2 | 0x8 | 0x40)) { if (((battleCtx->battlersSwitchingMask & FlagIndex(1)) == 0) && ((battleCtx->battlersSwitchingMask & FlagIndex(3)) == 0)) { v0.unk_01 = 1; v0.unk_02 = 0; @@ -792,7 +792,7 @@ void BattleIO_ShowBagScreen(BattleSystem *battleSys, BattleContext *battleCtx, i v0.unk_03 = 0; } } - } else if (BattleSystem_BattleType(battleSys) == (0x0 | 0x0)) { + } else if (BattleSystem_GetBattleType(battleSys) == (0x0 | 0x0)) { v0.unk_01 = 0; if (battleCtx->battleMons[1].moveEffectsMask & (0x40 | 0x80 | 0x40000 | 0x20000000)) { @@ -1351,7 +1351,7 @@ void BattleIO_IncrementRecord(BattleSystem *param0, int param1, int param2, int void BattleIO_LinkWaitMessage(BattleSystem *battleSys, int battler) { UnkStruct_ov16_0225C988 v0; - u32 v1 = BattleSystem_BattleType(battleSys); + u32 v1 = BattleSystem_GetBattleType(battleSys); v0.unk_00 = 55; v0.unk_02 = 0; @@ -1409,7 +1409,7 @@ void BattleIO_EscapeMessage(BattleSystem *param0, BattleContext *param1) { UnkStruct_ov16_0225C9F0 v0; int v1; - u32 v2 = BattleSystem_BattleType(param0); + u32 v2 = BattleSystem_GetBattleType(param0); v0.unk_00 = 60; v0.unk_01 = 0; @@ -1432,7 +1432,7 @@ void BattleIO_EscapeMessage(BattleSystem *param0, BattleContext *param1) void BattleIO_ForfeitMessage(BattleSystem *param0) { UnkStruct_ov16_0225CA14 v0; - u32 v1 = BattleSystem_BattleType(param0); + u32 v1 = BattleSystem_GetBattleType(param0); v0.unk_00 = 61; v0.unk_02 = 0; @@ -1499,7 +1499,7 @@ void BattleIO_PlayMusic(BattleSystem *param0, int param1, int param2) void BattleIO_SubmitResult(BattleSystem *param0) { UnkStruct_ov16_02266A38 v0; - u32 v1 = BattleSystem_BattleType(param0); + u32 v1 = BattleSystem_GetBattleType(param0); v0.unk_00 = 65; v0.unk_04 = BattleSystem_ResultMask(param0); @@ -1652,7 +1652,7 @@ static inline void PartyGaugeData_Fill(BattleContext *battleCtx, PartyGaugeData static void PartyGaugeData_New(BattleSystem *battleSys, BattleContext *battleCtx, PartyGaugeData *partyGauge, int command, int battler) { MI_CpuClearFast(partyGauge, sizeof(PartyGaugeData)); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); partyGauge->command = command; // must make declarations here to match diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 2ebe930aa6..2045b003cd 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -13,12 +13,12 @@ #include "struct_defs/battle_io.h" #include "battle/battle_display.h" +#include "battle/battle_input.h" #include "battle/battle_io.h" #include "battle/battle_message.h" #include "battle/healthbar.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_02264798.h" -#include "battle/ov16_0226871C.h" #include "battle/party_gauge.h" #include "battle/struct_ov16_0223C2C0.h" #include "battle/struct_ov16_0225BFFC_decl.h" @@ -177,11 +177,11 @@ void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int pa BallThrow v0; s16 v1, v2; - if (BattleSystem_BattleType(param0) & (0x20 | 0x200)) { + if (BattleSystem_GetBattleType(param0) & (0x20 | 0x200)) { return; } - if ((param1->battlerType & 0x1) && ((BattleSystem_BattleType(param0) & 0x1) == 0)) { + if ((param1->battlerType & 0x1) && ((BattleSystem_GetBattleType(param0) & 0x1) == 0)) { return; } @@ -191,7 +191,7 @@ void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int pa v0.target = param1->battler; v0.ballID = param2; v0.cellActorSys = ov16_0223E010(param0); - v0.paletteSys = BattleSystem_PaletteSys(param0); + v0.paletteSys = BattleSystem_GetPaletteData(param0); v0.surface = 0; v0.bgPrio = 1; @@ -659,10 +659,10 @@ static void ov16_0225C47C(BattleSystem *param0, BattlerData *param1) static void ov16_0225C558(BattleSystem *param0, BattlerData *param1) { u32 v0; - UnkStruct_ov16_02268A14 *v1; + BattleInput *v1; - v0 = BattleSystem_BattleType(param0); - v1 = ov16_0223E02C(param0); + v0 = BattleSystem_GetBattleType(param0); + v1 = BattleSystem_GetBattleInput(param0); if (param1->bootState == 0x0) { if ((v0 & 0x8) || (((v0 & 0x8) == 0) && (param1->battlerType != 4))) { @@ -772,7 +772,7 @@ static void ov16_0225C79C(BattleSystem *param0, BattlerData *param1) { if (param1->bootState == 0x0) { { - UnkStruct_ov16_02268A14 *v0; + BattleInput *v0; int v1; Healthbar *v2; NARC *v3; @@ -780,7 +780,7 @@ static void ov16_0225C79C(BattleSystem *param0, BattlerData *param1) v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v0 = ov16_0223E02C(param0); + v0 = BattleSystem_GetBattleInput(param0); ov16_02268C04(v3, v4, v0, 0, 0, NULL); ov16_0226BCCC(v0, 0); @@ -855,7 +855,7 @@ static void ov16_0225C8E0(BattleSystem *param0, BattlerData *param1) v0 = ov16_0223E010(param0); v1 = ov16_0223E018(param0); - v2 = BattleSystem_PaletteSys(param0); + v2 = BattleSystem_GetPaletteData(param0); PartyGauge_LoadGraphics(v0, v1, v2); ClearCommand(param0, param1->battler, 52); @@ -981,7 +981,7 @@ static void ov16_0225CA74(BattleSystem *param0, BattlerData *param1) ov16_0223F638(param0, v0->unk_02, v0->unk_08); - if (BattleSystem_BattleType(param0) & 0x80) { + if (BattleSystem_GetBattleType(param0) & 0x80) { BattleSystem_SetResultFlag(param0, v0->unk_04); } else { for (v4 = 0; v4 < BattleSystem_MaxBattlers(param0); v4++) { diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index 07613998d9..92524089c3 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -112,7 +112,7 @@ void BattleSystem_InitBattleMon(BattleSystem *battleSys, BattleContext *battleCt battleCtx->battleMons[battler].gender = Pokemon_GetGender(mon); battleCtx->battleMons[battler].isShiny = Pokemon_IsShiny(mon); - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_ABILITIES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_NO_ABILITIES) { battleCtx->battleMons[battler].ability = ABILITY_NONE; battleCtx->battleMons[battler].status = MON_CONDITION_NONE; battleCtx->battleMons[battler].heldItem = ITEM_NONE; @@ -122,7 +122,7 @@ void BattleSystem_InitBattleMon(BattleSystem *battleSys, BattleContext *battleCt battleCtx->battleMons[battler].heldItem = Pokemon_GetValue(mon, MON_DATA_HELD_ITEM, NULL); } - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_ABILITIES) && Battler_Side(battleSys, battler) == BATTLER_US) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_NO_ABILITIES) && Battler_Side(battleSys, battler) == BATTLER_US) { battleCtx->battleMons[battler].formNum = 0; } else { battleCtx->battleMons[battler].formNum = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); @@ -1457,7 +1457,7 @@ void BattleSystem_ClearSideExpGain(BattleContext *battleCtx, int battler) void BattleSystem_FlagBattlerExpGain(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { int side = 0; - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); while (side <= 2) { if ((battleCtx->battlersSwitchingMask & FlagIndex(side)) == FALSE @@ -1645,7 +1645,7 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int battleCtx->battlerCounter++; } } else if (range == RANGE_USER_OR_ALLY && randomize == TRUE) { // e.g., Acupressure - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) && BattleSystem_RandNext(battleSys) % 2 == 0) { defender = BattleSystem_Partner(battleSys, attacker); if (battleCtx->battleMons[defender].curHP == 0) { @@ -1664,13 +1664,13 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int || range == RANGE_FIELD) { // e.g., Sunny Day defender = attacker; } else if (range == RANGE_ALLY) { // e.g., Helping Hand - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { defender = BattleSystem_Partner(battleSys, attacker); } else { defender = attacker; } } else if (range == RANGE_USER_OR_ALLY) { // e.g., Acupressure - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { defender = battleCtx->battlerActions[attacker][BATTLE_ACTION_CHOOSE_TARGET]; if (battleCtx->battleMons[defender].curHP == 0) { defender = attacker; @@ -1680,7 +1680,7 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int } } else if (range == RANGE_RANDOM_OPPONENT || randomize == TRUE) { // e.g., Outrage, Thrash, any other reason the move should be randomly targeted int opponents[2]; - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); int enemySide = Battler_Side(battleSys, attacker) ^ 1; opponents[0] = BattleSystem_EnemyInSlot(battleSys, attacker, ENEMY_IN_SLOT_RIGHT); @@ -1868,7 +1868,7 @@ enum { BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) { - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); if (battleType & BATTLE_TYPE_NO_TRAINER_MESSAGES) { return FALSE; @@ -2023,7 +2023,7 @@ void BattleContext_InitCounters(BattleSystem *battleSys, BattleContext *battleCt battleCtx->prizeMoneyMul = 1; battleCtx->meFirstTurnOrder = 1; - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); if ((battleType & BATTLE_TYPE_DOUBLES) == FALSE) { battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_PLAYER_2); battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_ENEMY_2); @@ -2043,7 +2043,7 @@ void BattleSystem_UpdateAfterSwitch(BattleSystem *battleSys, BattleContext *batt moveEffects = battleCtx->battleMons[battler].moveEffectsData; maxBattlers = BattleSystem_MaxBattlers(battleSys); - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); // Forcefully end the battler's turn after the replacement battleCtx->battlerActions[battler][BATTLE_ACTION_PICK_COMMAND] = BATTLE_CONTROL_MOVE_END; @@ -3131,7 +3131,7 @@ BOOL BattleSystem_AnyReplacementMons(BattleSystem *battleSys, BattleContext *bat u32 battleType; result = FALSE; - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); party = BattleSystem_Party(battleSys, battler); partySize = BattleSystem_PartyCount(battleSys, battler); @@ -3184,7 +3184,7 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int int itemEffect; u32 battleType; - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); itemEffect = Battler_HeldItemEffect(battleCtx, battler); if (itemEffect == HOLD_EFFECT_FLEE @@ -3266,7 +3266,7 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int BOOL Battler_CanEscape(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int itemEffect = Battler_HeldItemEffect(battleCtx, battler); BOOL result = FALSE; @@ -4003,7 +4003,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battler) == ABILITY_FRISK) { battleCtx->battleMons[battler].friskAnnounced = TRUE; - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { int enemies[] = { BattleSystem_EnemyInSlot(battleSys, battler, ENEMY_IN_SLOT_RIGHT), BattleSystem_EnemyInSlot(battleSys, battler, ENEMY_IN_SLOT_LEFT), @@ -4176,7 +4176,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b int BattleSystem_RandomOpponent(BattleSystem *battleSys, BattleContext *battleCtx, int attacker) { int opponents[2]; - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int chosen; if (battleType & BATTLE_TYPE_DOUBLES) { @@ -6241,7 +6241,7 @@ void BattleSystem_SetPokemonCatchData(BattleSystem *battleSys, BattleContext *ba int terrain = BattleSystem_Terrain(battleSys); int ball; - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_PAL_PARK) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_PAL_PARK) { ball = Pokemon_GetValue(mon, MON_DATA_POKEBALL, NULL); } else { ball = battleCtx->msgItemTemp; @@ -6418,7 +6418,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt Pokemon *mon = Pokemon_New(HEAP_ID_BATTLE); int target; - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { target = battleCtx->battlerActions[battleCtx->msgBattlerTemp][BATTLE_ACTION_CHOOSE_TARGET]; } else { target = battleCtx->msgBattlerTemp ^ 1; @@ -6478,7 +6478,7 @@ void BattleSystem_SwitchSlots(BattleSystem *battleSys, BattleContext *battleCtx, int i; int tmp; int targetSlot; - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); if (((battleType & BATTLE_TYPE_DOUBLES) && (battleType & BATTLE_TYPE_2vs2_TAG) == FALSE) || ((battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_TYPE_SOLO_ENEMY) == FALSE)) { @@ -6666,7 +6666,7 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, defenderParams.heldItemEffect = BattleSystem_GetItemData(battleCtx, itemTmp, ITEM_PARAM_HOLD_EFFECT); defenderParams.heldItemPower = BattleSystem_GetItemData(battleCtx, itemTmp, ITEM_PARAM_HOLD_EFFECT_PARAM); - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); // Assign power; prefer the input power (used by variable-power moves, e.g. Gyro Ball) if (inPower == 0) { @@ -7940,8 +7940,8 @@ int BattleAI_PostKOSwitchIn(BattleSystem *battleSys, int battler) battleCtx = BattleSystem_Context(battleSys); slot1 = battler; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) - || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) + || (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2)) { slot2 = slot1; } else { slot2 = BattleSystem_Partner(battleSys, battler); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index e1280e70d6..ac5358036a 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -585,7 +585,7 @@ BOOL BattleScript_Exec(BattleSystem *battleSys, BattleContext *battleCtx) do { result = sBattleCommands[battleCtx->battleScript[battleCtx->scriptCursor]](battleSys, battleCtx); } while (battleCtx->battleProgressFlag == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE); + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE); battleCtx->battleProgressFlag = FALSE; return result; @@ -965,7 +965,7 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b switch (battlerIn) { default: case BTLSCR_ALL_BATTLERS: - if (BattleSystem_BattleType(battleSys) & 0x10) { + if (BattleSystem_GetBattleType(battleSys) & 0x10) { for (i = 0; i < maxBattlers; i++) { battlerData = BattleSystem_BattlerData(battleSys, i); if (battlerData->battlerType != BATTLER_TYPE_PLAYER_SIDE_SLOT_2) { @@ -974,8 +974,8 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b } } else { for (i = 0; i < maxBattlers; i++) { - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) && i > 1) { break; } @@ -992,8 +992,8 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { BattleIO_SetTrainerEncounter(battleSys, i); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1007,9 +1007,9 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b if (battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) { BattleIO_SetTrainerEncounter(battleSys, i); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1049,8 +1049,8 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC default: case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) && i > 1) { break; } @@ -1066,8 +1066,8 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { BattleIO_ThrowTrainerBall(battleSys, i, ballTypeIn); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1081,9 +1081,9 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC if (battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) { BattleIO_ThrowTrainerBall(battleSys, i, ballTypeIn); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1119,8 +1119,8 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl default: case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) && i > 1) { break; } @@ -1136,8 +1136,8 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { BattleIO_SlideTrainerOut(battleSys, i); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1151,9 +1151,9 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl if (battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) { BattleIO_SlideTrainerOut(battleSys, i); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1237,7 +1237,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle default: case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) && i > 1) { break; } @@ -1253,7 +1253,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { BattleIO_SlideTrainerIn(battleSys, i, posIn); - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { break; } } @@ -1267,7 +1267,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle if (battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) { BattleIO_SlideTrainerIn(battleSys, i, posIn); - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { break; } } @@ -2056,7 +2056,7 @@ static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *batt BattleScript_Iter(battleCtx, 1); int frames = BattleScript_Read(battleCtx); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) { battleCtx->waitCounter = frames; } @@ -2382,7 +2382,7 @@ static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) || (BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_FIRST_BATTLE)) { battleCtx->criticalMul = 1; } else { @@ -2418,7 +2418,7 @@ static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx) static BOOL BtlCmd_CalcExpGain(BattleSystem *battleSys, BattleContext *battleCtx) { int jump; - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); BattlerData *battlerData = BattleSystem_BattlerData(battleSys, battleCtx->faintedMon); BattleScript_Iter(battleCtx, 1); @@ -2623,7 +2623,7 @@ static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx) } for (battler = 0; battler < maxBattlers; battler++) { - if (BattleSystem_BattleType(battleSys) == BATTLE_TYPE_LINK_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) == BATTLE_TYPE_LINK_DOUBLES) { // CompareVarToValue both battlers are done selecting replacements, wait for all other battlers int partner = BattleSystem_Partner(battleSys, battler); if ((switchingMask & FlagIndex(battler)) == FALSE @@ -3711,7 +3711,7 @@ static BOOL BtlCmd_CallFromVar(BattleSystem *battleSys, BattleContext *battleCtx static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleCtx) { int move = MOVE_NONE; - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); BattleScript_Iter(battleCtx, 1); @@ -5258,7 +5258,7 @@ static BOOL BtlCmd_TrySpite(BattleSystem *battleSys, BattleContext *battleCtx) */ static BOOL BtlCmd_TryPartyStatusRefresh(BattleSystem *battleSys, BattleContext *battleCtx) { - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); BattleScript_Iter(battleCtx, 1); battleCtx->calcTemp = 0; @@ -5325,7 +5325,7 @@ static BOOL BtlCmd_TryStealItem(BattleSystem *battleSys, BattleContext *battleCt int jumpOnFail = BattleScript_Read(battleCtx); int jumpStickyHold = BattleScript_Read(battleCtx); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int attackingSide = Battler_Side(battleSys, battleCtx->attacker); if (Battler_Side(battleSys, battleCtx->attacker) && (battleType & BATTLE_TYPE_RESTORE_ITEMS_AFTER) == FALSE) { @@ -5471,7 +5471,7 @@ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCt { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); if (battleType & BATTLE_TYPE_TRAINER) { Party *defenderParty; @@ -6521,7 +6521,7 @@ static BOOL BtlCmd_TryHelpingHand(BattleSystem *battleSys, BattleContext *battle { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); - int battleType = BattleSystem_BattleType(battleSys); + int battleType = BattleSystem_GetBattleType(battleSys); if (battleType & BATTLE_TYPE_DOUBLES) { int partner = BattleScript_Battler(battleSys, battleCtx, BTLSCR_ATTACKER_PARTNER); @@ -6568,7 +6568,7 @@ static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCt int jumpOnFail = BattleScript_Read(battleCtx); int jumpStickyHold = BattleScript_Read(battleCtx); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); int attacking = Battler_Side(battleSys, battleCtx->attacker); int defending = Battler_Side(battleSys, battleCtx->defender); @@ -8507,7 +8507,7 @@ static BOOL BtlCmd_SetLinkBattleResult(BattleSystem *battleSys, BattleContext *b { BattleScript_Iter(battleCtx, 1); - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_LINK) { BattleIO_SubmitResult(battleSys); } @@ -9088,7 +9088,7 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC inBattler = BattleScript_Read(battleCtx); jumpIfWhiteOut = BattleScript_Read(battleCtx); - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); battler = BattleScript_Battler(battleSys, battleCtx, inBattler); if ((battleType & BATTLE_TYPE_2vs2) @@ -9928,7 +9928,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) int itemEffect; msgLoader = BattleSystem_MessageLoader(data->battleSys); - battleType = BattleSystem_BattleType(data->battleSys); + battleType = BattleSystem_GetBattleType(data->battleSys); battler = data->battleCtx->faintedMon >> 1 & 1; // init to the side with the fainted mon expBattler = 0; @@ -10128,9 +10128,9 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) break; case SEQ_GET_EXP_LEVEL_UP_SUMMARY_INIT: { - BgConfig *bgl = BattleSystem_BGL(data->battleSys); + BgConfig *bgl = BattleSystem_GetBgConfig(data->battleSys); Window *window = BattleSystem_Window(data->battleSys, 1); - PaletteData *paletteSys = BattleSystem_PaletteSys(data->battleSys); + PaletteData *paletteSys = BattleSystem_GetPaletteData(data->battleSys); G2_SetBG0Priority(1 + 1); // this is the background + 1; could do with a constant Bg_SetPriority(1, 1); @@ -10238,7 +10238,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) case SEQ_GET_EXP_CHECK_LEARN_MOVE: { u16 move; - BgConfig *bgl = BattleSystem_BGL(data->battleSys); // unused, but must be kept to match + BgConfig *bgl = BattleSystem_GetBgConfig(data->battleSys); // unused, but must be kept to match switch (Pokemon_LevelUpMove(mon, &data->tmpData[GET_EXP_LEARNSET_INDEX], &move)) { case LEARNSET_MOVE_ALREADY_KNOWN: @@ -10558,7 +10558,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) MessageLoader *v6; v6 = BattleSystem_MessageLoader(v2->battleSys); - v4 = BattleSystem_PaletteSys(v2->battleSys); + v4 = BattleSystem_GetPaletteData(v2->battleSys); v5 = ov16_0223E000(v2->battleSys); v1 = 1; @@ -10577,12 +10577,12 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) v7.target = v1 + 20000; v7.ballID = v2->ball; v7.cellActorSys = ov16_0223E010(v2->battleSys); - v7.paletteSys = BattleSystem_PaletteSys(v2->battleSys); + v7.paletteSys = BattleSystem_GetPaletteData(v2->battleSys); v7.bgPrio = 1; v7.surface = 0; v7.battleSys = v2->battleSys; - if (BattleSystem_BattleType(v2->battleSys) & 0x2) { + if (BattleSystem_GetBattleType(v2->battleSys) & 0x2) { if (v1 == 1) { v7.type = 16; } else { @@ -10622,7 +10622,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) { u32 v9; - v9 = BattleSystem_BattleType(v2->battleSys); + v9 = BattleSystem_GetBattleType(v2->battleSys); if (v9 & 0x1) { sub_02005728(1510, 117); @@ -10721,7 +10721,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) ov16_0223F4B0(v2->battleSys, v1); v3 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]); - if (BattleSystem_BattleType(v2->battleSys) & (0x200 | 0x400)) { + if (BattleSystem_GetBattleType(v2->battleSys) & (0x200 | 0x400)) { v3 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]); BattleSystem_SetPokemonCatchData(v2->battleSys, v2->battleCtx, v3); sub_02015738(ov16_0223E220(v2->battleSys), 1); @@ -10772,8 +10772,8 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) ov16_022686BC(ov16_0223E020(v2->battleSys, 1), 0); ov16_02263B20(BattleSystem_BattlerData(v2->battleSys, 0), 0); - v12.unk_00 = BattleSystem_BGL(v2->battleSys); - v12.unk_04 = BattleSystem_PaletteSys(v2->battleSys); + v12.unk_00 = BattleSystem_GetBgConfig(v2->battleSys); + v12.unk_04 = BattleSystem_GetPaletteData(v2->battleSys); v12.unk_08 = v5; v12.unk_0C = 5; v12.unk_10 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]); @@ -11098,7 +11098,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) break; case 32: if (PaletteData_GetSelectedBuffersMask(v4) == 0) { - if (BattleSystem_BattleType(v2->battleSys) & (0x200 | 0x400)) { + if (BattleSystem_GetBattleType(v2->battleSys) & (0x200 | 0x400)) { ov12_0223783C(v2->ballRotation); sub_02007DD4(v5); } @@ -11151,7 +11151,7 @@ static const struct Fraction sSafariCatchRate[] = { */ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext *battleCtx) { - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_ALWAYS_CATCH) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_ALWAYS_CATCH) { return 4; } @@ -11329,7 +11329,7 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt break; case BTLSCR_ENEMY_SLOT_2: - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { expectedBattlerType = BATTLER_TYPE_ENEMY_SIDE_SLOT_2; } else { expectedBattlerType = BATTLER_TYPE_SOLO_ENEMY; @@ -11366,7 +11366,7 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt break; case BTLSCR_PLAYER_SLOT_2: - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { expectedBattlerType = BATTLER_TYPE_PLAYER_SIDE_SLOT_2; } else { expectedBattlerType = BATTLER_TYPE_SOLO_PLAYER; @@ -12216,10 +12216,10 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript v4 = BattleSystem_MessageLoader(param0); v7 = ov16_0223E0D4(param0); v5 = BattleSystem_StringTemplate(param0); - v8 = BattleSystem_BGL(param0); + v8 = BattleSystem_GetBgConfig(param0); v1 = ov16_0223E010(param0); v2 = ov16_0223E018(param0); - v3 = BattleSystem_PaletteSys(param0); + v3 = BattleSystem_GetPaletteData(param0); sub_0200CBDC(v1, v2, 27, 256, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20021); sub_0200CD7C(v3, 2, v1, v2, 27, 82, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 20016); @@ -12324,7 +12324,7 @@ static void BattleScript_UpdateFriendship(BattleSystem *battleSys, BattleContext } u8 battler; - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { battler = BattleSystem_BattlerOfType(battleSys, BATTLER_TYPE_ENEMY_SIDE_SLOT_1); u8 battler2 = BattleSystem_BattlerOfType(battleSys, BATTLER_TYPE_ENEMY_SIDE_SLOT_2); if (battleCtx->battleMons[battler2].level > battleCtx->battleMons[battler].level) { diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 8bb73ba828..0dedd533fd 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -598,7 +598,7 @@ void Healthbar_DrawInfo(Healthbar *healthbar, u32 hp, u32 flags) break; } - if (BattleSystem_BattleType(healthbar->battleSys) & BATTLE_TYPE_TRAINER) { + if (BattleSystem_GetBattleType(healthbar->battleSys) & BATTLE_TYPE_TRAINER) { // Never show the pokeball icon on an enemy trainer's healthbar flags &= ~HEALTHBAR_INFO_CAUGHT_SPECIES; } @@ -741,7 +741,7 @@ void ov16_022672C4(Healthbar *param0) v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); v1 = ov16_0223E010(param0->battleSys); v2 = ov16_0223E018(param0->battleSys); - v3 = BattleSystem_PaletteSys(param0->battleSys); + v3 = BattleSystem_GetPaletteData(param0->battleSys); v0 = Healthbar_SpriteTemplate(param0->type); Healthbar_LoadResources(v1, v2, v4, v3, param0->type); @@ -890,7 +890,7 @@ void ov16_0226757C(Healthbar *param0) Healthbar_EnableArrow(param0, 1); } - if ((BattleSystem_BattleType(param0->battleSys) & (0x20 | 0x200)) == 0) { + if ((BattleSystem_GetBattleType(param0->battleSys) & (0x20 | 0x200)) == 0) { ov16_02268470(param0); } } @@ -932,7 +932,7 @@ static void Healthbar_EnableArrow(Healthbar *battleSys, BOOL enable) } // Safari battles don't get an arrow. - if ((BattleSystem_BattleType(battleSys->battleSys) & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK)) + if ((BattleSystem_GetBattleType(battleSys->battleSys) & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK)) && enable == TRUE) { return; } @@ -1084,7 +1084,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) BoxPokemon *boxMon; StringTemplate *strFormatter; - bgl = BattleSystem_BGL(healthbar->battleSys); + bgl = BattleSystem_GetBgConfig(healthbar->battleSys); msgLoader = BattleSystem_MessageLoader(healthbar->battleSys); strFormatter = BattleSystem_StringTemplate(healthbar->battleSys); @@ -1301,7 +1301,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) MessageLoader *v4; Strbuf *v5; - v0 = BattleSystem_BGL(param0->battleSys); + v0 = BattleSystem_GetBgConfig(param0->battleSys); v4 = BattleSystem_MessageLoader(param0->battleSys); if (param1 & (1 << 10)) { @@ -1345,7 +1345,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) Strbuf *v5, *v6; StringTemplate *v7; - v0 = BattleSystem_BGL(param0->battleSys); + v0 = BattleSystem_GetBgConfig(param0->battleSys); v4 = BattleSystem_MessageLoader(param0->battleSys); v7 = BattleSystem_StringTemplate(param0->battleSys); v5 = Strbuf_Init(30, 5); @@ -1772,7 +1772,7 @@ static void ov16_02268380(SysTask *param0, void *param1) PaletteData *v3; v1 = ov16_0223E018(v0->unk_00->battleSys); - v3 = BattleSystem_PaletteSys(v0->unk_00->battleSys); + v3 = BattleSystem_GetPaletteData(v0->unk_00->battleSys); switch (v0->unk_08) { case 0: diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 0073b03b84..a061acbb02 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -19,12 +19,12 @@ #include "battle/battle_context.h" #include "battle/battle_controller.h" #include "battle/battle_display.h" +#include "battle/battle_input.h" #include "battle/battle_io.h" #include "battle/battle_io_command.h" #include "battle/battle_lib.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_02268520.h" -#include "battle/ov16_0226871C.h" #include "battle/ov16_0226E148.h" #include "battle/struct_ov16_0223C2C0.h" #include "battle/struct_ov16_0225BFFC_decl.h" @@ -292,7 +292,7 @@ BOOL Battle_Main(OverlayManager *param0, int *param1) void ov16_0223B384(BattleSystem *param0) { - ov16_02268A14(param0->unk_198); + BattleInput_Free(param0->battleInput); ov16_022687A0(param0->unk_04); param0->unk_23FB_2 = 1; @@ -312,7 +312,7 @@ void ov16_0223B384(BattleSystem *param0) void ov16_0223B3E4(BattleSystem *param0) { SetMainCallback(NULL, NULL); - ov16_02268A14(param0->unk_198); + BattleInput_Free(param0->battleInput); Window_Remove(¶m0->windows[0]); ov16_0223C288(param0->unk_04); @@ -342,7 +342,7 @@ void ov16_0223B430(BattleSystem *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v1 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - param0->unk_198 = ov16_022687C8(v0, v1, param0, BattleSystem_GetTrainerGender(param0, ov16_0223F6E4(param0)), param0->unk_1BC); + param0->battleInput = BattleInput_NewInit(v0, v1, param0, BattleSystem_GetTrainerGender(param0, ov16_0223F6E4(param0)), param0->unk_1BC); Font_InitManager(FONT_SUBSCREEN, 5); @@ -353,9 +353,9 @@ void ov16_0223B430(BattleSystem *param0) } GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - ov16_02268A88(param0->unk_198); - ov16_02268C04(v0, v1, param0->unk_198, 0, 1, NULL); - ov16_02268D40(v1, param0->unk_198); + ov16_02268A88(param0->battleInput); + ov16_02268C04(v0, v1, param0->battleInput, 0, 1, NULL); + ov16_02268D40(v1, param0->battleInput); NARC_dtor(v0); NARC_dtor(v1); TextPrinter_SetScrollArrowBaseTile(1); @@ -561,7 +561,7 @@ static void ov16_0223B790(OverlayManager *param0) NARC *v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v7 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v0->unk_198 = ov16_022687C8(v6, v7, v0, BattleSystem_GetTrainerGender(v0, ov16_0223F6E4(v0)), v0->unk_1BC); + v0->battleInput = BattleInput_NewInit(v6, v7, v0, BattleSystem_GetTrainerGender(v0, ov16_0223F6E4(v0)), v0->unk_1BC); NARC_dtor(v6); NARC_dtor(v7); @@ -585,7 +585,7 @@ static void ov16_0223B790(OverlayManager *param0) sub_0200CB30(v0->unk_90, v0->unk_94, &Unk_ov16_0226E2B0); sub_0200964C(sub_0200C738(v0->unk_90), 0, ((192 + 80) << FX32_SHIFT)); - ov16_02268A88(v0->unk_198); + ov16_02268A88(v0->battleInput); { NARC *v8; @@ -594,8 +594,8 @@ static void ov16_0223B790(OverlayManager *param0) v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v8, v9, v0->unk_198, 0, 1, NULL); - ov16_02268D40(v9, v0->unk_198); + ov16_02268C04(v8, v9, v0->battleInput, 0, 1, NULL); + ov16_02268D40(v9, v0->battleInput); NARC_dtor(v8); NARC_dtor(v9); @@ -1572,7 +1572,7 @@ static void ov16_0223CF8C(SysTask *param0, void *param1) v5 = 0; v6 = ov16_0223F450(v0); - if (BattleSystem_BattleType(v0) & (0x20 | 0x200)) { + if (BattleSystem_GetBattleType(v0) & (0x20 | 0x200)) { return; } diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index e6962917d0..0172536710 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -28,12 +28,12 @@ #include "battle/battle_context.h" #include "battle/battle_display.h" +#include "battle/battle_input.h" #include "battle/battle_lib.h" #include "battle/battle_message.h" #include "battle/common.h" #include "battle/healthbar.h" #include "battle/ov16_02268520.h" -#include "battle/ov16_0226871C.h" #include "battle/ov16_0226E148.h" #include "battle/struct_ov16_0223E0C8.h" #include "battle/struct_ov16_0225BFFC_decl.h" @@ -73,8 +73,8 @@ #include "unk_0202F1D4.h" #include "unk_0206CCB0.h" -BgConfig *BattleSystem_BGL(BattleSystem *battleSystem); -u32 BattleSystem_BattleType(BattleSystem *battleSystem); +BgConfig *BattleSystem_GetBgConfig(BattleSystem *battleSystem); +u32 BattleSystem_GetBattleType(BattleSystem *battleSystem); BattleContext *BattleSystem_Context(BattleSystem *battleSystem); BattlerData *BattleSystem_BattlerData(BattleSystem *battleSystem, int param1); int BattleSystem_MaxBattlers(BattleSystem *battleSystem); @@ -86,12 +86,11 @@ UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem); SpriteRenderer *ov16_0223E010(BattleSystem *battleSystem); SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSystem); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1); -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSystem); UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSystem); UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSystem); MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSystem); MessageLoader *ov16_0223E060(BattleSystem *battleSystem); -PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSystem); +PaletteData *BattleSystem_GetPaletteData(BattleSystem *battleSystem); Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSystem); u8 *ov16_0223E06C(BattleSystem *battleSystem); u8 *ov16_0223E074(BattleSystem *battleSystem); @@ -225,7 +224,7 @@ static void BattleMessage_TrainerName(BattleSystem *battleSystem, u32 param1, in static void BattleMessage_PCBoxName(BattleSystem *battleSystem, u32 param1, int param2); static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2); -BgConfig *BattleSystem_BGL(BattleSystem *battleSystem) +BgConfig *BattleSystem_GetBgConfig(BattleSystem *battleSystem) { return battleSystem->unk_04; } @@ -235,7 +234,7 @@ Window *BattleSystem_Window(BattleSystem *battleSys, int idx) return &battleSys->windows[idx]; } -u32 BattleSystem_BattleType(BattleSystem *battleSys) +u32 BattleSystem_GetBattleType(BattleSystem *battleSys) { return battleSys->battleType; } @@ -318,9 +317,9 @@ UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1) return &battleSystem->unk_17C[param1]; } -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSystem) +BattleInput *BattleSystem_GetBattleInput(BattleSystem *battleSystem) { - return battleSystem->unk_198; + return battleSystem->battleInput; } PartyGauge *ov16_0223E034(BattleSystem *battleSystem, enum PartyGaugeSide param1) @@ -353,7 +352,7 @@ MessageLoader *ov16_0223E060(BattleSystem *battleSystem) return battleSystem->unk_10; } -PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSystem) +PaletteData *BattleSystem_GetPaletteData(BattleSystem *battleSystem) { return battleSystem->unk_28; } @@ -529,7 +528,7 @@ int BattleSystem_Partner(BattleSystem *battleSys, int battler) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); if ((battleType & BATTLE_TYPE_DOUBLES) == FALSE) { return battler; @@ -547,7 +546,7 @@ int BattleSystem_Partner(BattleSystem *battleSys, int battler) int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot) { int maxBattlers = BattleSystem_MaxBattlers(battleSys); - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); // In double battles, return the singular opponent if ((battleType & BATTLE_TYPE_DOUBLES) == FALSE) { @@ -576,8 +575,8 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot int selectedSlot = BattleContext_Get(battleSys, battleCtx, 2, battler); int targetSlot; - if (BattleSystem_BattleType(battleSys) == BATTLE_TYPE_TRAINER_DOUBLES - || ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) + if (BattleSystem_GetBattleType(battleSys) == BATTLE_TYPE_TRAINER_DOUBLES + || ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM) == FALSE)) { targetSlot = BattleContext_Get(battleSys, battleCtx, BATTLECTX_SELECTED_PARTY_SLOT, BattleSystem_Partner(battleSys, battler)); if (targetSlot == partySlot) { @@ -1365,7 +1364,7 @@ void ov16_0223F36C(BattleSystem *battleSystem) v1 = ov16_02263B08(battleSystem->battlers[v0]); v1->battleSys = battleSystem; - v1->type = Healthbar_Type(Battler_Type(battleSystem->battlers[v0]), BattleSystem_BattleType(battleSystem)); + v1->type = Healthbar_Type(Battler_Type(battleSystem->battlers[v0]), BattleSystem_GetBattleType(battleSystem)); ov16_022672C4(v1); Healthbar_Enable(v1, 0); @@ -1566,7 +1565,7 @@ void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag) return; } - ov16_0226CEB0(battleSys->unk_198, flag); + ov16_0226CEB0(battleSys->battleInput, flag); StartScreenTransition(3, 0, 0, 0, 16, 2, 5); sub_0200569C(); @@ -1841,7 +1840,7 @@ u8 BattleMessage_PrintToWindow(BattleSystem *battleSystem, Window *param1, Messa */ static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg) { - u32 battleType = BattleSystem_BattleType(battleSys); + u32 battleType = BattleSystem_GetBattleType(battleSys); if (battleMsg->tags & TAG_GLOBAL_MESSAGE) { return; diff --git a/src/battle/ov16_02264798.c b/src/battle/ov16_02264798.c index c230a1ea6e..cea2de01b8 100644 --- a/src/battle/ov16_02264798.c +++ b/src/battle/ov16_02264798.c @@ -22,7 +22,7 @@ void ov16_02264798(BattlerData *param0, BattleSystem *param1) return; } - if (BattleSystem_BattleType(param1) & (0x20 | 0x200)) { + if (BattleSystem_GetBattleType(param1) & (0x20 | 0x200)) { return; } diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 40838eac57..45033732a1 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -204,8 +204,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) } SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, Unk_ov16_02270134[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, Unk_ov16_02270134[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + SpriteRenderer_LoadPalette(BattleSystem_GetPaletteData(param0->unk_04), 2, v0, v1, v10, Unk_ov16_02270134[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); + PaletteData_LoadBufferFromFileStart(BattleSystem_GetPaletteData(param0->unk_04), 27, Unk_ov16_02270134[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index 2cc54a0c4f..b243943951 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -18,15 +18,15 @@ typedef struct UnkStruct_ov16_0226DC24_t { CellActorData *unk_00[5]; SysTask *unk_14; -} UnkStruct_ov16_0226DC24; +} BattleCursor; static void ov16_0226DE10(SysTask *param0, void *param1); -void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0); -void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4); -void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0); +void BattleCursor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); +void BattleCursor_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +BattleCursor *BattleCursor_New(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void BattleCursor_Free(BattleCursor *param0); +void ov16_0226DD7C(BattleCursor *param0, int param1, int param2, int param3, int param4); +void ov16_0226DDE8(BattleCursor *param0); static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0, @@ -41,7 +41,7 @@ static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0 }; -void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7) +void BattleCursor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7) { NARC *v0; @@ -54,7 +54,7 @@ void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData NARC_dtor(v0); } -void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) +void BattleCursor_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) { SpriteGfxHandler_UnloadCharObjById(param0, param1); SpriteGfxHandler_UnloadPlttObjById(param0, param2); @@ -62,9 +62,9 @@ void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, SpriteGfxHandler_UnloadAnimObjById(param0, param4); } -UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +BattleCursor *BattleCursor_New(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov16_0226DC24 *v0; + BattleCursor *v0; SpriteTemplate v1; int v2; @@ -76,8 +76,8 @@ UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler v1.priority = param7; v1.bgPriority = param8; - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_0226DC24)); - MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DC24)); + v0 = Heap_AllocFromHeap(param2, sizeof(BattleCursor)); + MI_CpuClear8(v0, sizeof(BattleCursor)); for (v2 = 0; v2 < 5; v2++) { v0->unk_00[v2] = SpriteActor_LoadResources(param0, param1, &v1); @@ -88,7 +88,7 @@ UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler return v0; } -void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0) +void BattleCursor_Free(BattleCursor *param0) { int v0; @@ -100,7 +100,7 @@ void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0) Heap_FreeToHeap(param0); } -void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) +void ov16_0226DCCC(BattleCursor *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) { int v0; @@ -119,29 +119,29 @@ void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int } } -void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void ov16_0226DD54(BattleCursor *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { ov16_0226DCCC(param0, param1, param2, param3, param4, param5, param6, param7, param8, (192 << FX32_SHIFT)); } -void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4) +void ov16_0226DD7C(BattleCursor *param0, int param1, int param2, int param3, int param4) { ov16_0226DD54(param0, param1, param3, param2, param3, param1, param4, param2, param4); } -void ov16_0226DD9C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, fx32 param5) +void ov16_0226DD9C(BattleCursor *param0, int param1, int param2, int param3, int param4, fx32 param5) { ov16_0226DCCC(param0, param1, param3, param2, param3, param1, param4, param2, param4, param5); } -void ov16_0226DDC0(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, fx32 param4) +void ov16_0226DDC0(BattleCursor *param0, int param1, int param2, int param3, fx32 param4) { sub_0200D500(param0->unk_00[4], param1, param2, param4); sub_0200D364(param0->unk_00[4], param3); SpriteActor_EnableObject(param0->unk_00[4], 1); } -void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0) +void ov16_0226DDE8(BattleCursor *param0) { int v0; @@ -150,14 +150,14 @@ void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0) } } -void ov16_0226DE04(UnkStruct_ov16_0226DC24 *param0) +void ov16_0226DE04(BattleCursor *param0) { SpriteActor_EnableObject(param0->unk_00[4], 0); } static void ov16_0226DE10(SysTask *param0, void *param1) { - UnkStruct_ov16_0226DC24 *v0 = param1; + BattleCursor *v0 = param1; int v1; if (sub_0200D408(v0->unk_00[0]) == 0) { diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index 00927ca27f..dae5e80e91 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -16,7 +16,7 @@ #include "sys_task_manager.h" #include "unk_0200C6E4.h" -typedef struct UnkStruct_ov16_0226DEEC_t { +typedef struct CatchingTutorialFinger_t { CellActorData *unk_00; SysTask *unk_04; int unk_08; @@ -29,16 +29,16 @@ typedef struct UnkStruct_ov16_0226DEEC_t { u8 unk_1C; u8 unk_1D; u8 unk_1E; -} UnkStruct_ov16_0226DEEC; - -void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0); -void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2); -void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0); +} CatchingTutorialFinger; + +void CatchingTutorialFinger_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); +void CatchingTutorialFinger_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +CatchingTutorialFinger *CatchingTutorialFinger_Create(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void CatchingTutorialFinger_Free(CatchingTutorialFinger *param0); +void ov16_0226DFB0(CatchingTutorialFinger *param0, int param1, int param2); +void ov16_0226DFBC(CatchingTutorialFinger *param0); static void ov16_0226DFD8(SysTask *param0, void *param1); -static void ov16_0226E13C(UnkStruct_ov16_0226DEEC *param0); +static void ov16_0226E13C(CatchingTutorialFinger *param0); static const SpriteTemplate Unk_ov16_02270AD8 = { 0x0, @@ -53,7 +53,7 @@ static const SpriteTemplate Unk_ov16_02270AD8 = { 0x0 }; -void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7) +void CatchingTutorialFinger_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7) { NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__EV_POKESELECT, param2); @@ -64,7 +64,7 @@ void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, NARC_dtor(v0); } -void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) +void CatchingTutorialFinger_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) { SpriteGfxHandler_UnloadCharObjById(param0, param1); SpriteGfxHandler_UnloadPlttObjById(param0, param2); @@ -72,9 +72,9 @@ void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, SpriteGfxHandler_UnloadAnimObjById(param0, param4); } -UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +CatchingTutorialFinger *CatchingTutorialFinger_Create(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov16_0226DEEC *v0; + CatchingTutorialFinger *v0; SpriteTemplate v1; v1 = Unk_ov16_02270AD8; @@ -86,8 +86,8 @@ UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler v1.priority = param7; v1.bgPriority = param8; - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_0226DEEC)); - MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DEEC)); + v0 = Heap_AllocFromHeap(param2, sizeof(CatchingTutorialFinger)); + MI_CpuClear8(v0, sizeof(CatchingTutorialFinger)); v0->unk_00 = SpriteActor_LoadResources(param0, param1, &v1); SpriteActor_EnableObject(v0->unk_00, 0); @@ -98,14 +98,14 @@ UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler return v0; } -void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0) +void CatchingTutorialFinger_Free(CatchingTutorialFinger *param0) { sub_0200D0F4(param0->unk_00); SysTask_Done(param0->unk_04); Heap_FreeToHeap(param0); } -void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3) +void ov16_0226DF80(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3) { ov16_0226E13C(param0); @@ -117,30 +117,30 @@ void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 SpriteActor_EnableObject(param0->unk_00, 1); } -void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2) +void ov16_0226DFB0(CatchingTutorialFinger *param0, int param1, int param2) { ov16_0226DF80(param0, param1, param2, (192 << FX32_SHIFT)); } -void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0) +void ov16_0226DFBC(CatchingTutorialFinger *param0) { SpriteActor_EnableObject(param0->unk_00, 0); ov16_0226E13C(param0); } -void ov16_0226DFD0(UnkStruct_ov16_0226DEEC *param0, int param1) +void ov16_0226DFD0(CatchingTutorialFinger *param0, int param1) { param0->unk_18 = param1; } -BOOL ov16_0226DFD4(UnkStruct_ov16_0226DEEC *param0) +BOOL ov16_0226DFD4(CatchingTutorialFinger *param0) { return param0->unk_1B; } static void ov16_0226DFD8(SysTask *param0, void *param1) { - UnkStruct_ov16_0226DEEC *v0 = param1; + CatchingTutorialFinger *v0 = param1; if (v0->unk_1B == 1) { v0->unk_1B = 0; @@ -219,7 +219,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1) sub_0200D330(v0->unk_00); } -static void ov16_0226E13C(UnkStruct_ov16_0226DEEC *param0) +static void ov16_0226E13C(CatchingTutorialFinger *param0) { param0->unk_10 = 0; param0->unk_1C = 0; diff --git a/src/battle/ov16_0226E148.c b/src/battle/ov16_0226E148.c index b8cd210294..378b8e0e66 100644 --- a/src/battle/ov16_0226E148.c +++ b/src/battle/ov16_0226E148.c @@ -5,8 +5,8 @@ #include "struct_decls/battle_system.h" +#include "battle/battle_input.h" #include "battle/ov16_0223DF00.h" -#include "battle/ov16_0226871C.h" #include "battle/struct_ov16_02268A14_decl.h" #include "heap.h" @@ -50,13 +50,11 @@ void ov16_0226E174(SysTask *param0) static void ov16_0226E188(SysTask *param0, void *param1) { UnkStruct_ov16_0226E148 *v0 = param1; - UnkStruct_ov16_02268A14 *v1; - - v1 = ov16_0223E02C(v0->unk_00); + BattleInput *battleInput = BattleSystem_GetBattleInput(v0->unk_00); switch (v0->unk_04) { case 0: - GF_ASSERT(v1 != NULL); + GF_ASSERT(battleInput != NULL); { NARC *v2, *v3; @@ -64,20 +62,20 @@ static void ov16_0226E188(SysTask *param0, void *param1) v2 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v2, v3, v1, 18, 0, NULL); + ov16_02268C04(v2, v3, battleInput, 18, 0, NULL); NARC_dtor(v2); NARC_dtor(v3); } v0->unk_04++; break; case 1: - if (ov16_02269348(v1) == 1) { + if (ov16_02269348(battleInput) == 1) { v0->unk_04++; } break; case 2: if (ov16_0223F7A4(v0->unk_00) == 1) { - if (ov16_0226925C(v1) == 1) { + if (BattleInput_CheckTouch(battleInput) == 1) { Sound_PlayEffect(1501); v0->unk_04++; } diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c index ebd48686c8..2f12febcdc 100644 --- a/src/battle/trainer_ai/trainer_ai.c +++ b/src/battle/trainer_ai/trainer_ai.c @@ -3397,7 +3397,7 @@ static BOOL AI_CannotDamageWonderGuard(BattleSystem *battleSys, BattleContext *b u32 effectiveness; Pokemon *mon; - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { return FALSE; } @@ -3477,7 +3477,7 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt Pokemon *mon; // "Player" consts here refer to the AI's perspective. - if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { + if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) { defender1 = BATTLER_PLAYER_1; defender2 = BATTLER_PLAYER_2; } else { @@ -3521,7 +3521,7 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt } aiSlot1 = battler; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2)) { aiSlot2 = aiSlot1; } else { aiSlot2 = BattleSystem_Partner(battleSys, battler); @@ -3700,7 +3700,7 @@ static BOOL AI_HasSuperEffectiveMove(BattleSystem *battleSys, BattleContext *bat } // Check the defender's partner the same way as above. - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) == FALSE) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_DOUBLES) == FALSE) { return FALSE; } defender = BattleSystem_Partner(battleSys, defender); @@ -3785,7 +3785,7 @@ static BOOL AI_HasAbsorbAbilityInParty(BattleSystem *battleSys, BattleContext *b } aiSlot1 = battler; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2)) { aiSlot2 = aiSlot1; } else { aiSlot2 = BattleSystem_Partner(battleSys, battler); @@ -3850,7 +3850,7 @@ static BOOL AI_HasPartyMemberWithSuperEffectiveMove(BattleSystem *battleSys, Bat } aiSlot1 = battler; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2)) { aiSlot2 = aiSlot1; } else { aiSlot2 = BattleSystem_Partner(battleSys, battler); @@ -4020,7 +4020,7 @@ static BOOL TrainerAI_ShouldSwitch(BattleSystem *battleSys, BattleContext *battl alivePartyMons = 0; aiSlot1 = battler; - if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + if ((BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_TAG) || (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_2vs2)) { aiSlot2 = aiSlot1; } else { aiSlot2 = BattleSystem_Partner(battleSys, battler); @@ -4103,7 +4103,7 @@ int TrainerAI_PickCommand(BattleSystem *battleSys, int battler) BattleContext *battleCtx; battleCtx = battleSys->battleCtx; - battleType = BattleSystem_BattleType(battleSys); + battleType = BattleSystem_GetBattleType(battleSys); if ((battleType & BATTLE_TYPE_TRAINER) || Battler_Side(battleSys, battler) == BATTLE_SIDE_PLAYER) { if (TrainerAI_ShouldSwitch(battleSys, battleCtx, battler)) { diff --git a/src/meson.build b/src/meson.build index bf82051252..8c9fac5733 100644 --- a/src/meson.build +++ b/src/meson.build @@ -538,7 +538,7 @@ pokeplatinum_c = files( 'battle/battle_io.c', 'battle/healthbar.c', 'battle/ov16_02268520.c', - 'battle/ov16_0226871C.c', + 'battle/battle_input.c', 'battle/party_gauge.c', 'battle/ov16_0226DB7C.c', 'battle/ov16_0226DE44.c', diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index b6a10d7f74..1485066247 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -4188,7 +4188,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par v2->unk_04 = param2; v2->unk_08.unk_00 = ov16_0223E010(param0); v2->unk_08.unk_04 = ov16_0223E018(param0); - v2->unk_08.unk_08 = BattleSystem_PaletteSys(param0); + v2->unk_08.unk_08 = BattleSystem_GetPaletteData(param0); { for (v0 = 0; v0 < 4; v0++) { diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 5bcd8e52aa..a9fc1ed3a1 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -184,8 +184,8 @@ void ov13_0221FC20(UnkStruct_ov13_0221FC20 *param0) memset(v0, 0, sizeof(UnkStruct_ov13_022213F0)); v0->unk_00 = param0; - v0->unk_1E0 = BattleSystem_BGL(param0->unk_08); - v0->unk_1E4 = BattleSystem_PaletteSys(param0->unk_08); + v0->unk_1E0 = BattleSystem_GetBgConfig(param0->unk_08); + v0->unk_1E4 = BattleSystem_GetPaletteData(param0->unk_08); v0->unk_2074 = 0; v0->unk_2072 = param0->unk_11; v0->unk_2073_4 = ov16_0223F1F8(param0->unk_08); @@ -1663,7 +1663,7 @@ static u8 ov13_0222194C(UnkStruct_ov13_022213F0 *param0) u8 ov13_0222196C(UnkStruct_ov13_022213F0 *param0) { - u32 v0 = BattleSystem_BattleType(param0->unk_00->unk_08); + u32 v0 = BattleSystem_GetBattleType(param0->unk_00->unk_08); if ((v0 != (0x2 | 0x8 | 0x40)) && (v0 != ((0x2 | 0x1) | 0x8 | 0x40)) && (v0 & (0x2 | 0x10))) { return 1; @@ -1674,7 +1674,7 @@ u8 ov13_0222196C(UnkStruct_ov13_022213F0 *param0) u8 ov13_0222198C(UnkStruct_ov13_022213F0 *param0) { - u32 v0 = BattleSystem_BattleType(param0->unk_00->unk_08); + u32 v0 = BattleSystem_GetBattleType(param0->unk_00->unk_08); if ((v0 != (0x2 | 0x8 | 0x40)) && (v0 != ((0x2 | 0x1) | 0x8 | 0x40)) && (v0 & 0x8)) { return 1; diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 6023dd1cf5..927e6a82a9 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -291,7 +291,7 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0207C9B0(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); + MoveTypeIcon_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); sub_0207C9EC(v0, param0->unk_1FB0, 45065, 45065); for (v1 = 45070; v1 <= 45076; v1++) { @@ -795,19 +795,19 @@ static void ov13_02225420(UnkStruct_ov13_022213F0 *param0) static void ov13_0222554C(UnkStruct_ov13_022213F0 *param0) { SpriteRenderer *v0; - UnkStruct_ov16_0226DC24 *v1; + BattleCursor *v1; v0 = ov16_0223E010(param0->unk_00->unk_08); - ov16_0226DB7C(v0, param0->unk_1FB0, param0->unk_1E4, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068); - v1 = ov16_0226DC24(v0, param0->unk_1FB0, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068, 0, 1); + BattleCursor_LoadResources(v0, param0->unk_1FB0, param0->unk_1E4, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068); + v1 = BattleCursor_New(v0, param0->unk_1FB0, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068, 0, 1); ov13_02228A64(param0->unk_2084, v1); } static void ov13_022255B8(UnkStruct_ov13_022213F0 *param0) { - ov16_0226DCA8(ov13_02228A58(param0->unk_2084)); - ov16_0226DBFC(param0->unk_1FB0, 45080, 45068, 45068, 45068); + BattleCursor_Free(ov13_02228A58(param0->unk_2084)); + BattleCursor_FreeResources(param0->unk_1FB0, 45080, 45068, 45068, 45068); } static const ByteFlagSet Unk_ov13_02229464[] = { diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 9e8070982f..63c3b3771c 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -107,8 +107,8 @@ void ov13_022264F4(UnkStruct_ov13_022264F4 *param0) memset(v0, 0, sizeof(UnkStruct_ov13_02227244)); v0->unk_00 = param0; - v0->unk_04 = BattleSystem_BGL(param0->unk_00); - v0->unk_08 = BattleSystem_PaletteSys(param0->unk_00); + v0->unk_04 = BattleSystem_GetBgConfig(param0->unk_00); + v0->unk_08 = BattleSystem_GetPaletteData(param0->unk_00); v0->unk_114A = 0; { @@ -127,7 +127,7 @@ void ov13_022264F4(UnkStruct_ov13_022264F4 *param0) ov13_02227A4C(v0); - if (BattleSystem_BattleType(v0->unk_00->unk_00) & 0x400) { + if (BattleSystem_GetBattleType(v0->unk_00->unk_00) & 0x400) { v0->unk_00->unk_14 = 1; } } @@ -420,7 +420,7 @@ static u8 ov13_02226A5C(UnkStruct_ov13_02227244 *param0) ov13_02227260(v0->unk_00, v0->unk_1C, param0->unk_114D, v0->unk_0C); return 13; } else if (v2 == 3) { - if (!(BattleSystem_BattleType(v0->unk_00) & 0x1)) { + if (!(BattleSystem_GetBattleType(v0->unk_00) & 0x1)) { ov13_02227260(v0->unk_00, v0->unk_1C, param0->unk_114D, v0->unk_0C); return 13; } else { diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index 17c79f7e61..aecdef8bfb 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -236,19 +236,19 @@ static void ov13_02227F38(UnkStruct_ov13_02227244 *param0) static void ov13_02227F7C(UnkStruct_ov13_02227244 *param0) { SpriteRenderer *v0; - UnkStruct_ov16_0226DC24 *v1; + BattleCursor *v1; v0 = ov16_0223E010(param0->unk_00->unk_00); - ov16_0226DB7C(v0, param0->unk_30C, param0->unk_08, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265); - v1 = ov16_0226DC24(v0, param0->unk_30C, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265, 0, 1); + BattleCursor_LoadResources(v0, param0->unk_30C, param0->unk_08, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265); + v1 = BattleCursor_New(v0, param0->unk_30C, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265, 0, 1); ov13_02228A64(param0->unk_34, v1); } static void ov13_02227FDC(UnkStruct_ov13_02227244 *param0) { - ov16_0226DCA8(ov13_02228A58(param0->unk_34)); - ov16_0226DBFC(param0->unk_30C, 46270, 46270, 46265, 46265); + BattleCursor_Free(ov13_02228A58(param0->unk_34)); + BattleCursor_FreeResources(param0->unk_30C, 46270, 46270, 46265, 46265); } static const ByteFlagSet Unk_ov13_02229C14[] = { @@ -309,18 +309,18 @@ void ov13_02228050(UnkStruct_ov13_02227244 *param0) static void ov13_02228070(UnkStruct_ov13_02227244 *param0) { SpriteRenderer *v0; - UnkStruct_ov16_0226DEEC *v1; + CatchingTutorialFinger *v1; v0 = ov16_0223E010(param0->unk_00->unk_00); - ov16_0226DE44(v0, param0->unk_30C, param0->unk_00->unk_0C, param0->unk_08, 46269, 46269, 46264, 46264); - param0->unk_38 = ov16_0226DEEC(v0, param0->unk_30C, param0->unk_00->unk_0C, 46269, 46269, 46264, 46264, 0, 0); + CatchingTutorialFinger_LoadResources(v0, param0->unk_30C, param0->unk_00->unk_0C, param0->unk_08, 46269, 46269, 46264, 46264); + param0->unk_38 = CatchingTutorialFinger_Create(v0, param0->unk_30C, param0->unk_00->unk_0C, 46269, 46269, 46264, 46264, 0, 0); } static void ov13_022280C8(UnkStruct_ov13_02227244 *param0) { - ov16_0226DF68(param0->unk_38); - ov16_0226DEC4(param0->unk_30C, 46269, 46269, 46264, 46264); + CatchingTutorialFinger_Free(param0->unk_38); + CatchingTutorialFinger_FreeResources(param0->unk_30C, 46269, 46269, 46264, 46264); } static const int Unk_ov13_02229BFC[3][2] = { diff --git a/src/overlay013/ov13_02228A38.c b/src/overlay013/ov13_02228A38.c index aa0da7bb73..2c3c729afa 100644 --- a/src/overlay013/ov13_02228A38.c +++ b/src/overlay013/ov13_02228A38.c @@ -15,7 +15,7 @@ #include "unk_0201E010.h" struct UnkStruct_ov13_02228A50_t { - UnkStruct_ov16_0226DC24 *unk_00; + BattleCursor *unk_00; const ByteFlagSet *unk_04; u8 unk_08; u8 unk_09; @@ -35,7 +35,7 @@ void ov13_02228A50(UnkStruct_ov13_02228A50 *param0) Heap_FreeToHeap(param0); } -UnkStruct_ov16_0226DC24 *ov13_02228A58(UnkStruct_ov13_02228A50 *param0) +BattleCursor *ov13_02228A58(UnkStruct_ov13_02228A50 *param0) { return param0->unk_00; } @@ -50,7 +50,7 @@ void ov13_02228A60(UnkStruct_ov13_02228A50 *param0, u8 param1) param0->unk_08 = param1; } -void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, UnkStruct_ov16_0226DC24 *param1) +void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *param1) { param0->unk_00 = param1; } diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index 8588f4344e..258646c192 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -117,7 +117,7 @@ void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM sub_0200CC9C(param0, param1, sub_0207C944(), sub_0207C920(), 0, 3, param2, param3); } -void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) +void MoveTypeIcon_LoadPalette(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { sub_0200CD7C(param0, param1, param2, param3, sub_0207C944(), sub_0207C920(), 0, 3, param4, param5); } From c93a3dba593f585f31e4c421a2841d6f7c286c0d Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:14:24 -0500 Subject: [PATCH 2/6] Add msg consts to battle_input.c --- include/battle/battle_display.h | 2 +- include/battle/battle_input.h | 2 +- include/battle/struct_ov16_0225BFFC_t.h | 2 +- include/battle/struct_ov16_0226C378.h | 10 +- src/battle/battle_display.c | 4 +- src/battle/battle_input.c | 796 ++++++++++++------------ src/battle/ov16_0223DF00.c | 2 +- 7 files changed, 421 insertions(+), 397 deletions(-) diff --git a/include/battle/battle_display.h b/include/battle/battle_display.h index 65db80ff11..03ac8d95f4 100644 --- a/include/battle/battle_display.h +++ b/include/battle/battle_display.h @@ -155,7 +155,7 @@ u8 Battler_Type(BattlerData *param0); u8 Battler_BootState(BattlerData *param0); Sprite *ov16_02263AFC(BattlerData *param0); Healthbar *ov16_02263B08(BattlerData *param0); -UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0); +BattleCursorPosition *Battler_GetCursorPosition(BattlerData *param0); void ov16_02263B10(BattlerData *param0); void ov16_02263B20(BattlerData *param0, int param1); diff --git a/include/battle/battle_input.h b/include/battle/battle_input.h index 7595df8632..0fb3484ade 100644 --- a/include/battle/battle_input.h +++ b/include/battle/battle_input.h @@ -31,7 +31,7 @@ void ov16_0226BCCC(BattleInput *input, int param1); BOOL ov16_0226BCD0(BattleInput *input); int ov16_0226CD08(BattleInput *input); void ov16_0226CD10(BattleInput *input, int param1); -void ov16_0226CEB0(BattleInput *input, int param1); +void BattleInput_PrintRecordingStopMessage(BattleInput *input, int param1); u8 ov16_0226D088(BattleInput *input); #endif // POKEPLATINUM_OV16_0226871C_H diff --git a/include/battle/struct_ov16_0225BFFC_t.h b/include/battle/struct_ov16_0225BFFC_t.h index 33426da4d9..287b68556c 100644 --- a/include/battle/struct_ov16_0225BFFC_t.h +++ b/include/battle/struct_ov16_0225BFFC_t.h @@ -23,7 +23,7 @@ struct BattlerData { Sprite *unk_20; Window *unk_24; Healthbar healthbar; - UnkStruct_ov16_0226C378 unk_7B; + BattleCursorPosition unk_7B; BallRotation *unk_84; UnkStruct_ov12_02223764 *unk_88; void *unk_8C; diff --git a/include/battle/struct_ov16_0226C378.h b/include/battle/struct_ov16_0226C378.h index 45af2f7304..dfc160a2ee 100644 --- a/include/battle/struct_ov16_0226C378.h +++ b/include/battle/struct_ov16_0226C378.h @@ -2,14 +2,14 @@ #define POKEPLATINUM_STRUCT_OV16_0226C378_H typedef struct { - s8 unk_00; - s8 unk_01; - s8 unk_02; - s8 unk_03; + s8 commandX; + s8 commandY; + s8 moveX; + s8 moveY; s8 unk_04; s8 unk_05; s8 unk_06; u8 unk_07[1]; -} UnkStruct_ov16_0226C378; +} BattleCursorPosition; #endif // POKEPLATINUM_STRUCT_OV16_0226C378_H diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 14ec0e2c7d..1800928b3e 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -5680,14 +5680,14 @@ Healthbar *ov16_02263B08(BattlerData *param0) return ¶m0->healthbar; } -UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0) +BattleCursorPosition *Battler_GetCursorPosition(BattlerData *param0) { return ¶m0->unk_7B; } void ov16_02263B10(BattlerData *param0) { - MI_CpuClear8(¶m0->unk_7B, sizeof(UnkStruct_ov16_0226C378)); + MI_CpuClear8(¶m0->unk_7B, sizeof(BattleCursorPosition)); } void ov16_02263B20(BattlerData *param0, int param1) diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index aeb0de6c2c..95db01d0d3 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -26,6 +26,7 @@ #include "battle/struct_ov16_0226C378.h" #include "battle/struct_ov16_0226DC24_decl.h" #include "battle/struct_ov16_0226DEEC_decl.h" +#include "gmm/message_bank_battle_strings.h" #include "overlay011/ov11_0221F800.h" #include "assert.h" @@ -150,10 +151,10 @@ typedef struct { } UnkStruct_ov16_02268A14_sub1; typedef struct { - FontOAM *unk_00; - SpriteManagerAllocation unk_04; + FontOAM *fontOAM; + SpriteManagerAllocation spriteManAlloc; u16 unk_10; -} UnkStruct_ov16_0226A98C; +} BattleInputTextObject; typedef struct { s16 unk_00; @@ -171,7 +172,7 @@ typedef struct { s8 unk_01; s8 unk_02; u8 unk_03; -} UnkStruct_ov16_0226CB10; +} BattleCursorMove; typedef union { UnkStruct_ov16_02269668 val1; @@ -184,15 +185,15 @@ typedef struct { Window unk_00; u16 unk_10; u16 unk_12; -} UnkStruct_ov16_0226AEA0; +} BattleInputTextImage; typedef struct { - MoveDisplayInfo unk_00; - u16 *unk_18[4]; - UnkStruct_ov16_0226AEA0 unk_28[4]; - UnkStruct_ov16_0226AEA0 unk_78[4]; - UnkStruct_ov16_0226AEA0 unk_C8[4]; -} UnkStruct_ov16_0226ABD4; + MoveDisplayInfo moveDisplay; + u16 *typeIcon[LEARNED_MOVES_MAX]; + BattleInputTextImage moveNameText[LEARNED_MOVES_MAX]; + BattleInputTextImage curPPText[LEARNED_MOVES_MAX]; + BattleInputTextImage maxPPText[LEARNED_MOVES_MAX]; +} MoveDisplayObject; struct BattleInput_t { BattleSystem *battleSystem; @@ -207,9 +208,9 @@ struct BattleInput_t { u16 *unk_5C; u16 *unk_60; SysTask *unk_64; - UnkStruct_ov16_0226ABD4 unk_68[4]; + MoveDisplayObject unk_68[4]; UnkStruct_02012744 *unk_4C8; - UnkStruct_ov16_0226A98C unk_4CC[13]; + BattleInputTextObject textObj[13]; UnkStruct_02012B20 *unk_5B8; CellActorData *unk_5BC[6]; CellActorData *unk_5D4[6]; @@ -238,13 +239,13 @@ struct BattleInput_t { s32 unk_6B0; s32 unk_6B4; BattleCursor *cursor; - UnkStruct_ov16_0226CB10 unk_6BC; + BattleCursorMove unk_6BC; u8 unk_6C0; u8 unk_6C1; struct { CatchingTutorialFinger *finger; u8 unk_04; - u8 unk_05; + u8 state; u8 unk_06; } catchingTutorial; }; @@ -274,11 +275,32 @@ typedef struct { const int *unk_18; const u8 *unk_1C; int (*unk_20)(BattleInput *battleInput, int param1); - void (*unk_24)(BattleInput *battleInput, int param1); + void (*funcSaveCursorPos)(BattleInput *battleInput, int param1); void (*unk_28)(BattleInput *battleInput, int param1, int param2); int (*unk_2C)(BattleInput *battleInput, int param1, int param2); } UnkStruct_ov16_02270670; +enum { + BITO_FIGHT = 0, + BITO_BAG, + BITO_POKEMON, + BITO_RUN, + + BITO_MOVE_1 = 0, + BITO_MOVE_2, + BITO_MOVE_3, + BITO_MOVE_4, + BITO_UNK_5, + BIT0_UNK_6, + BIT0_UNK_7, + BIT0_UNK_8, + BIT0_UNK_9, + BITO_PP_1, + BITO_PP_2, + BITO_PP_3, + BITO_PP_4, +}; + static void *BattleInput_New(void); static void ov16_02269654(BattleInput *battleInput, int param1, int param2); static void ov16_02269668(BattleInput *battleInput, int param1, int param2); @@ -298,7 +320,7 @@ static void ov16_0226B2F0(BattleInput *battleInput); static int ov16_0226A4A4(BattleInput *battleInput, int param1, int param2); static int ov16_0226A634(BattleInput *battleInput, int param1, int param2); static int ov16_0226A528(BattleInput *battleInput, int param1, int param2); -static void ov16_02269C7C(BattleInput *battleInput, int param1, int param2); +static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int param1, int param2); static void ov16_02269D14(BattleInput *battleInput, int param1, int param2); static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2); static void ov16_02269F68(BattleInput *battleInput, int param1, int param2); @@ -326,7 +348,7 @@ static void ov16_0226B318(BattleInput *battleInput, int param1); void ov16_0226947C(BattleInput *battleInput, int param1, int param2); static void ov16_022694A8(SysTask *param0, void *param1); static void ov16_0226B314(BattleInput *battleInput, int param1); -static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10); +static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10); static void ov16_0226AAC0(BattleInput *battleInput); static void ov16_0226A698(BattleInput *battleInput); static void ov16_0226A718(BattleInput *battleInput); @@ -336,7 +358,7 @@ static void ov16_0226A928(SysTask *param0, void *param1); static void ov16_0226B988(SysTask *param0, void *param1); static void ov16_0226BA88(SysTask *param0, void *param1); static void ov16_0226BB94(void *param0); -static TextColor ov16_0226B924(int param0, int param1); +static TextColor GetPPTextColor(int param0, int param1); void ov16_0226BCCC(BattleInput *battleInput, int param1); BOOL ov16_0226BCD0(BattleInput *battleInput); static void ov16_0226BCE4(SysTask *param0, void *param1); @@ -346,22 +368,22 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1); static int ov16_0226C1F8(BattleInput *battleInput, int param1); static int ov16_0226C3C8(BattleInput *battleInput, int param1); static int ov16_0226CA14(BattleInput *battleInput, int param1); -static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2, const u8 *param3); -static void ov16_0226C0A0(BattleInput *battleInput, int param1); -static void ov16_0226C378(BattleInput *battleInput, int param1); +static u32 ov16_0226CB10(BattleCursorMove *param0, int param1, int param2, const u8 *param3); +static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int param1); +static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int param1); static void ov16_0226C9B8(BattleInput *battleInput, int param1); static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4); -static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(BattleInput *battleInput, int param1); +static MoveDisplayObject *ov16_0226ABD4(BattleInput *battleInput, int param1); static void ov16_0226ABE8(BattleInput *battleInput); static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3); -static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4); +static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor param4); static void ov16_0226AAF8(BattleInput *battleInput); static int ov16_0226C100(BattleInput *battleInput, int param1); static void ov16_0226BD74(SysTask *param0, void *param1); -static int ov16_0226CD18(BattleInput *battleInput); -static int ov16_0226CD84(BattleInput *battleInput); -static int ov16_0226CDDC(BattleInput *battleInput); -static int ov16_0226CE34(BattleInput *battleInput); +static int BattleInput_CatchingTutorialMain(BattleInput *battleInput); +static int BattleInput_CatchingTutorialFight(BattleInput *battleInput); +static int BattleInput_CatchingTutorialMove(BattleInput *battleInput); +static int BattleInput_CatchingTutorialBag(BattleInput *battleInput); static void inline_ov16_0226B314(SysTaskFunc param0, BattleInput *battleInput); static void inline_ov16_0226B318_1(SysTask *param0, void *param1); static void inline_ov16_0226B318_1_sub(BattleInput *battleInput); @@ -592,7 +614,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269654, ov16_0226A318, }, @@ -605,7 +627,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269654, ov16_0226A318, }, @@ -618,7 +640,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269668, ov16_0226A318, }, @@ -631,7 +653,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269668, ov16_0226A318, }, @@ -644,7 +666,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_022698A8, ov16_0226A318, }, @@ -657,7 +679,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_022698BC, ov16_0226A318, }, @@ -670,7 +692,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269654, ov16_0226A318, }, @@ -683,7 +705,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, - ov16_0226C0A0, + BattleInput_SaveBattlerCursorPosition, ov16_02269668, ov16_0226A318, }, @@ -722,7 +744,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_02270364, Unk_ov16_02270A14, ov16_0226C1F8, - ov16_0226C378, + BattleInput_SaveBattlerMovePosition, ov16_022699AC, ov16_0226A3F4, }, @@ -749,7 +771,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_02270A00, ov16_0226CA14, NULL, - ov16_02269C7C, + BattleInput_CreateYesNoTextObjects, ov16_0226A4A4, }, { @@ -1105,12 +1127,12 @@ void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem MI_CpuCopy16(v7, battleInput->unk_58, 0x200); for (int i = 0; i < 4; i++) { - MI_CpuFill8(&battleInput->unk_68[i].unk_00, 0xff, sizeof(MoveDisplayInfo)); + MI_CpuFill8(&battleInput->unk_68[i].moveDisplay, 0xff, sizeof(MoveDisplayInfo)); } for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - battleInput->unk_68[i].unk_18[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); + battleInput->unk_68[i].typeIcon[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); } } @@ -1286,28 +1308,28 @@ void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int par void ov16_02268D40(NARC *param0, BattleInput *battleInput) { int i; - SpriteRenderer *v1; + SpriteRenderer *spriteRenderer; SpriteGfxHandler *v2; GF_ASSERT(battleInput->unk_5BC[0] == NULL && battleInput->unk_5D4[0] == NULL); - v1 = ov16_0223E010(battleInput->battleSystem); + spriteRenderer = ov16_0223E010(battleInput->battleSystem); v2 = ov16_0223E018(battleInput->battleSystem); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, 207, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, 209, 1, 20015); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, v2, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, v2, param0, 207, 1, 20015); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, v2, param0, 209, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, 204, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, 206, 1, 20016); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, v2, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, v2, param0, 204, 1, 20016); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, v2, param0, 206, 1, 20016); for (i = 0; i < 6; i++) { - battleInput->unk_5BC[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270414); + battleInput->unk_5BC[i] = SpriteActor_LoadResources(spriteRenderer, v2, &Unk_ov16_02270414); sub_0200D4D0(battleInput->unk_5BC[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); sub_0200D6A4(battleInput->unk_5BC[i], 1); - battleInput->unk_5D4[i] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270448); + battleInput->unk_5D4[i] = SpriteActor_LoadResources(spriteRenderer, v2, &Unk_ov16_02270448); sub_0200D4D0(battleInput->unk_5D4[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); } @@ -1319,19 +1341,19 @@ void ov16_02268D40(NARC *param0, BattleInput *battleInput) PaletteData *v3; v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); - BattleCursor_LoadResources(v1, v2, v3, 5, 20411, 20035, 20405, 20394); - battleInput->cursor = BattleCursor_New(v1, v2, 5, 20411, 20035, 20405, 20394, 5, 0); + BattleCursor_LoadResources(spriteRenderer, v2, v3, 5, 20411, 20035, 20405, 20394); + battleInput->cursor = BattleCursor_New(spriteRenderer, v2, 5, 20411, 20035, 20405, 20394, 5, 0); } static void ov16_02268F00(BattleInput *battleInput) { int i; - SpriteRenderer *v1; + SpriteRenderer *spriteRenderer; SpriteGfxHandler *v2; GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); - v1 = ov16_0223E010(battleInput->battleSystem); + spriteRenderer = ov16_0223E010(battleInput->battleSystem); v2 = ov16_0223E018(battleInput->battleSystem); SpriteGfxHandler_UnloadCharObjById(v2, 20023); @@ -1515,7 +1537,7 @@ int BattleInput_CheckTouch(BattleInput *battleInput) GF_ASSERT(v4->unk_18 != NULL); if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { - v1 = ov16_0226CD18(battleInput); + v1 = BattleInput_CatchingTutorialMain(battleInput); } else { v1 = sub_02022664(v4->unk_14); @@ -1537,11 +1559,11 @@ int BattleInput_CheckTouch(BattleInput *battleInput) v0 = v4->unk_2C(battleInput, v0, v3); if (v0 != 0xffffffff) { - if (v4->unk_24 != NULL) { - v4->unk_24(battleInput, v1); + if (v4->funcSaveCursorPos != NULL) { + v4->funcSaveCursorPos(battleInput, v1); } - MI_CpuClear8(&battleInput->unk_6BC, sizeof(UnkStruct_ov16_0226CB10)); + MI_CpuClear8(&battleInput->unk_6BC, sizeof(BattleCursorMove)); ov16_0226DDE8(battleInput->cursor); if (v5 > 0) { @@ -1710,31 +1732,31 @@ static void ov16_02269668(BattleInput *battleInput, int param1, int param2) battleInput->unk_66A = v5; if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_SAFARI) { - v0 = MessageLoader_GetNewStrbuf(v4, 931); - v1 = MessageLoader_GetNewStrbuf(v4, 932); - v2 = MessageLoader_GetNewStrbuf(v4, 933); + v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00931); // BALL + v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00932); // BAIT + v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00933); // MUD } else if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_PAL_PARK) { - v0 = MessageLoader_GetNewStrbuf(v4, 1223); - v1 = MessageLoader_GetNewStrbuf(v4, 932); - v2 = MessageLoader_GetNewStrbuf(v4, 933); + v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_01223); // BALL + v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00932); // BAIT + v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00933); // MUD } else { - v0 = MessageLoader_GetNewStrbuf(v4, 924); - v1 = MessageLoader_GetNewStrbuf(v4, 925); - v2 = MessageLoader_GetNewStrbuf(v4, 926); + v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00924); // FIGHT + v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00925); // BAG + v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00926); // POKĂ©MON } if (battleInput->unk_6C1 == 1) { - v3 = MessageLoader_GetNewStrbuf(v4, 928); + v3 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00928); // CANCEL battleInput->unk_66F = 1; } else { - v3 = MessageLoader_GetNewStrbuf(v4, 927); + v3 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00927); // RUN battleInput->unk_66F = 0; } - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v0); Strbuf_Free(v1); @@ -1750,10 +1772,10 @@ static void ov16_02269668(BattleInput *battleInput, int param1, int param2) ov16_0226A698(battleInput); v8 = ov16_0226A7A4(battleInput, v7, v5, v6->unk_04, v6->unk_06, v6->unk_03); - sub_020129A4(battleInput->unk_4CC[0].unk_00, &v9, &v10); + sub_020129A4(battleInput->textObj[0].fontOAM, &v9, &v10); if (v5 == 4) { - v9 += battleInput->unk_4CC[0].unk_10 + 32 / 2; + v9 += battleInput->textObj[0].unk_10 + 32 / 2; } else { v9 -= 32 / 2; } @@ -1789,9 +1811,9 @@ static void ov16_022698BC(BattleInput *battleInput, int param1, int param2) Bg_ScheduleTilemapTransfer(v1, 5); } - sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[3].unk_00, 0); + sub_020129D0(battleInput->textObj[1].fontOAM, 0); + sub_020129D0(battleInput->textObj[2].fontOAM, 0); + sub_020129D0(battleInput->textObj[3].fontOAM, 0); } static void ov16_02269924(BattleInput *battleInput, int param1, int param2) @@ -1822,8 +1844,8 @@ static void ov16_02269938(BattleInput *battleInput, int param1, int param2) Bg_ScheduleTilemapTransfer(v1, 5); } - sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); + sub_020129D0(battleInput->textObj[1].fontOAM, 0); + sub_020129D0(battleInput->textObj[2].fontOAM, 0); } static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) @@ -1831,8 +1853,8 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) UnkStruct_ov16_02260C00 *v0; int i; MessageLoader *v2; - UnkStruct_ov16_0226ABD4 *v3; - TextColor v4; + MoveDisplayObject *moveDisplay; + TextColor ppColor; v0 = &battleInput->unk_1A.val2; GF_ASSERT(v0 != NULL); @@ -1840,40 +1862,40 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) battleInput->unk_66A = v0->unk_10; v2 = BattleSystem_MessageLoader(battleInput->battleSystem); - v3 = ov16_0226ABD4(battleInput, v0->unk_10); + moveDisplay = ov16_0226ABD4(battleInput, v0->unk_10); ov16_0226AF0C(battleInput); { - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &v3->unk_28[0]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 46, 1, &v3->unk_28[1]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[2], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 110, 1, &v3->unk_28[2]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[3], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 110, 1, &v3->unk_28[3]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &moveDisplay->moveNameText[0]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 46, 1, &moveDisplay->moveNameText[1]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[2], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 110, 1, &moveDisplay->moveNameText[2]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[3], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 110, 1, &moveDisplay->moveNameText[3]); } { for (i = 0; i < LEARNED_MOVES_MAX; i++) { - v4 = ov16_0226B924(v0->unk_08[i], v0->unk_0C[i]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[9 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_022702D4[i][0], Unk_ov16_022702D4[i][1], 0, &v3->unk_78[i]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[5 + i], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_02270284[i][0], Unk_ov16_02270284[i][1], 0, &v3->unk_C8[i]); + ppColor = GetPPTextColor(v0->unk_08[i], v0->unk_0C[i]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[9 + i], NULL, FONT_SYSTEM, ppColor, 4, 20023, Unk_ov16_022702D4[i][0], Unk_ov16_022702D4[i][1], 0, &moveDisplay->curPPText[i]); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[5 + i], NULL, FONT_SYSTEM, ppColor, 4, 20023, Unk_ov16_02270284[i][0], Unk_ov16_02270284[i][1], 0, &moveDisplay->maxPPText[i]); } } { Strbuf *v5; - v5 = MessageLoader_GetNewStrbuf(v2, 929); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + v5 = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00929); // CANCEL + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v5); } { - int v6; + int moveType; for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (v0->unk_00[i] != 0) { - v6 = MoveTable_LoadParam(v0->unk_00[i], MOVEATTRIBUTE_TYPE); - ov16_0226B06C(battleInput, v6, i); + moveType = MoveTable_LoadParam(v0->unk_00[i], MOVEATTRIBUTE_TYPE); + ov16_0226B06C(battleInput, moveType, i); } else { ov16_0226B088(battleInput, i); break; @@ -1887,58 +1909,58 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) v7 = BattleSystem_GetBgConfig(battleInput->battleSystem); if (v0->unk_00[0] == 0) { - sub_020129D0(battleInput->unk_4CC[0].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[5].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[9].unk_00, 0); + sub_020129D0(battleInput->textObj[0].fontOAM, 0); + sub_020129D0(battleInput->textObj[5].fontOAM, 0); + sub_020129D0(battleInput->textObj[9].fontOAM, 0); } if (v0->unk_00[1] == 0) { - sub_020129D0(battleInput->unk_4CC[1].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[6].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[10].unk_00, 0); + sub_020129D0(battleInput->textObj[1].fontOAM, 0); + sub_020129D0(battleInput->textObj[6].fontOAM, 0); + sub_020129D0(battleInput->textObj[10].fontOAM, 0); } if (v0->unk_00[2] == 0) { - sub_020129D0(battleInput->unk_4CC[2].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[7].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[11].unk_00, 0); + sub_020129D0(battleInput->textObj[2].fontOAM, 0); + sub_020129D0(battleInput->textObj[7].fontOAM, 0); + sub_020129D0(battleInput->textObj[11].fontOAM, 0); } if (v0->unk_00[3] == 0) { - sub_020129D0(battleInput->unk_4CC[3].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[8].unk_00, 0); - sub_020129D0(battleInput->unk_4CC[12].unk_00, 0); + sub_020129D0(battleInput->textObj[3].fontOAM, 0); + sub_020129D0(battleInput->textObj[8].fontOAM, 0); + sub_020129D0(battleInput->textObj[12].fontOAM, 0); } } } -static void ov16_02269C7C(BattleInput *battleInput, int param1, int param2) +static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; - Strbuf *v1, *v2; + MessageLoader *msgLoader; + Strbuf *strYes, *strNo; - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 940); - v2 = MessageLoader_GetNewStrbuf(v0, 941); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + strYes = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00940); // Yes + strNo = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00941); // No - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strYes, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], strNo, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); - Strbuf_Free(v1); - Strbuf_Free(v2); + Strbuf_Free(strYes); + Strbuf_Free(strNo); } static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; + MessageLoader *msgLoader; Strbuf *v1, *v2; - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 1181); - v2 = MessageLoader_GetNewStrbuf(v0, 1182); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01181); // Forget a move! + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01182); // Keep old moves! - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1946,16 +1968,16 @@ static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; + MessageLoader *msgLoader; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 1186); - v2 = MessageLoader_GetNewStrbuf(v0, 1187); + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01186); // Give up on {move}? + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01187); // Don't give up on {move}! v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -1963,8 +1985,8 @@ static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1974,13 +1996,13 @@ static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; + MessageLoader *msgLoader; Strbuf *v1; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 1260); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01260); // STOP { BgConfig *v2; @@ -2004,22 +2026,22 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) Bg_ScheduleTilemapTransfer(v5, 5); } - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(v1); } static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; + MessageLoader *msgLoader; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 1217); - v2 = MessageLoader_GetNewStrbuf(v0, 1218); + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01217); // Use next PokĂ©mon + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01218); // Flee v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -2027,8 +2049,8 @@ static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -2038,16 +2060,16 @@ static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) { - MessageLoader *v0; + MessageLoader *msgLoader; Strbuf *v1, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - v0 = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(v0, 1215); - v2 = MessageLoader_GetNewStrbuf(v0, 1216); + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01215); // Switch PokĂ©mon + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01216); // Keep battling v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -2055,8 +2077,8 @@ static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) StringTemplate_Format(v5, v3, v1); StringTemplate_Format(v5, v4, v2); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -2070,7 +2092,7 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) int i; MessageLoader *v2; u8 v3[4]; - Strbuf *v4, *v5; + Strbuf *v4, *genderMarker; Pokemon *v6; BoxPokemon *v7; StringTemplate *v8; @@ -2100,18 +2122,18 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) if ((v0->unk_00[v12].unk_01_2 == 1) && (v3[i] == 1)) { if (v0->unk_00[v12].unk_01_0 == 0) { - v5 = MessageLoader_GetNewStrbuf(v2, 962); + genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00962); // ♂ } else if (v0->unk_00[v12].unk_01_0 == 1) { - v5 = MessageLoader_GetNewStrbuf(v2, 963); + genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00963); // ♀ } else { - v5 = MessageLoader_GetNewStrbuf(v2, 964); + genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00964); //(genderless) } v6 = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, v0->unk_00[v12].unk_00); v7 = Pokemon_GetBoxPokemon(v6); StringTemplate_SetNickname(v8, 0, v7); - StringTemplate_Format(v8, v4, v5); + StringTemplate_Format(v8, v4, genderMarker); if (i & 1) { v9 = TEXT_COLOR(1, 2, 3); @@ -2119,8 +2141,8 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) v9 = TEXT_COLOR(4, 5, 6); } - ov16_0226A98C(battleInput, &battleInput->unk_4CC[0 + i], v4, FONT_SUBSCREEN, v9, 6, 20023, Unk_ov16_02270328[i][0], Unk_ov16_02270328[i][1], 1, NULL); - Strbuf_Free(v5); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0 + i], v4, FONT_SUBSCREEN, v9, 6, 20023, Unk_ov16_02270328[i][0], Unk_ov16_02270328[i][1], 1, NULL); + Strbuf_Free(genderMarker); { switch (i) { @@ -2145,7 +2167,7 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) Strbuf *v13; v13 = MessageLoader_GetNewStrbuf(v2, 930); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); Strbuf_Free(v13); } } @@ -2555,18 +2577,18 @@ static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *pa *param3 = v1; } -static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10) +static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10) { UnkStruct_020127E8 v0; Window v1; - SpriteManagerAllocation v2; + SpriteManagerAllocation spriteManAlloc; int v3; - FontOAM *v4; + FontOAM *fontOAM; BgConfig *v5; SpriteGfxHandler *v6; int v7, v8; - GF_ASSERT(param1->unk_00 == NULL); + GF_ASSERT(textObj->fontOAM == NULL); v6 = ov16_0223E018(battleInput->battleSystem); v5 = BattleSystem_GetBgConfig(battleInput->battleSystem); @@ -2587,7 +2609,7 @@ static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *par } v3 = sub_02012898(&v1, NNS_G2D_VRAM_TYPE_2DSUB, 5); - sub_0201ED94(v3, 1, NNS_G2D_VRAM_TYPE_2DSUB, &v2); + sub_0201ED94(v3, 1, NNS_G2D_VRAM_TYPE_2DSUB, &spriteManAlloc); if (param9 == 1) { param7 -= v7 / 2; @@ -2600,7 +2622,7 @@ static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *par v0.unk_08 = sub_0200D9B0(v6); v0.unk_0C = sub_0200D04C(v6, param6); v0.unk_10 = NULL; - v0.unk_14 = v2.unk_04; + v0.unk_14 = spriteManAlloc.unk_04; v0.unk_18 = param7; v0.unk_1C = param8; v0.unk_20 = 0; @@ -2608,18 +2630,18 @@ static void ov16_0226A98C(BattleInput *battleInput, UnkStruct_ov16_0226A98C *par v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB; v0.unk_2C = 5; - v4 = sub_020127E8(&v0); + fontOAM = sub_020127E8(&v0); - sub_02012AC0(v4, param5); - sub_020128C4(v4, param7, param8); + sub_02012AC0(fontOAM, param5); + sub_020128C4(fontOAM, param7, param8); if (param10 == NULL) { Window_Remove(&v1); } - param1->unk_00 = v4; - param1->unk_04 = v2; - param1->unk_10 = v7; + textObj->fontOAM = fontOAM; + textObj->spriteManAlloc = spriteManAlloc; + textObj->unk_10 = v7; } static void ov16_0226AAC0(BattleInput *battleInput) @@ -2627,10 +2649,10 @@ static void ov16_0226AAC0(BattleInput *battleInput) int i; for (i = 0; i < 13; i++) { - if (battleInput->unk_4CC[i].unk_00 != NULL) { - sub_02012870(battleInput->unk_4CC[i].unk_00); - sub_0201EE28(&battleInput->unk_4CC[i].unk_04); - battleInput->unk_4CC[i].unk_00 = NULL; + if (battleInput->textObj[i].fontOAM != NULL) { + sub_02012870(battleInput->textObj[i].fontOAM); + sub_0201EE28(&battleInput->textObj[i].spriteManAlloc); + battleInput->textObj[i].fontOAM = NULL; } } } @@ -2696,7 +2718,7 @@ static void ov16_0226AAF8(BattleInput *battleInput) } } -static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(BattleInput *battleInput, int param1) +static MoveDisplayObject *ov16_0226ABD4(BattleInput *battleInput, int param1) { if (param1 >= 2) { param1 -= 2; @@ -2711,72 +2733,72 @@ static void ov16_0226ABE8(BattleInput *battleInput) for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { - Heap_FreeToHeap(battleInput->unk_68[i].unk_18[j]); + Heap_FreeToHeap(battleInput->unk_68[i].typeIcon[j]); - if (battleInput->unk_68[i].unk_28[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].unk_28[j].unk_00); + if (battleInput->unk_68[i].moveNameText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].moveNameText[j].unk_00); } - if (battleInput->unk_68[i].unk_78[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].unk_78[j].unk_00); + if (battleInput->unk_68[i].curPPText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].curPPText[j].unk_00); } - if (battleInput->unk_68[i].unk_C8[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].unk_C8[j].unk_00); + if (battleInput->unk_68[i].maxPPText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->unk_68[i].maxPPText[j].unk_00); } } } } -void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo *param2) +void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo *moveDisplay) { - UnkStruct_ov16_0226ABD4 *v0; + MoveDisplayObject *moveDisplayObj; void *v1; NNSG2dCharacterData *v2; - int i, v3, v5; - Strbuf *v6; + int i, v3, moveType; + Strbuf *moveName; Strbuf *v7; Strbuf *v8; Strbuf *v9; StringTemplate *v10; - TextColor v11; + TextColor ppColor; MessageLoader *v12; v12 = BattleSystem_MessageLoader(battleInput->battleSystem); - v0 = ov16_0226ABD4(battleInput, param1); + moveDisplayObj = ov16_0226ABD4(battleInput, param1); v3 = sub_0208C098(6); - v9 = MessageLoader_GetNewStrbuf(v12, 938); + v9 = MessageLoader_GetNewStrbuf(v12, pl_msg_00000368_00938); // PP v10 = BattleSystem_StringTemplate(battleInput->battleSystem); v7 = Strbuf_Init(((2 + 2 + 1 + 2) * 2 + 2), 5); - v8 = MessageLoader_GetNewStrbuf(v12, 937); + v8 = MessageLoader_GetNewStrbuf(v12, pl_msg_00000368_00937); // '/' for (i = 0; i < LEARNED_MOVES_MAX; i++) { - if ((param2->move[i] != v0->unk_00.move[i]) && (param2->move[i] != 0)) { - v5 = MoveTable_LoadParam(param2->move[i], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(sub_0207C944(), sub_0207C908(v5), 1, &v2, 5); - MI_CpuCopy32(v2->pRawData, v0->unk_18[i], v3); + if ((moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) && (moveDisplay->move[i] != 0)) { + moveType = MoveTable_LoadParam(moveDisplay->move[i], MOVEATTRIBUTE_TYPE); + v1 = Graphics_GetCharData(sub_0207C944(), sub_0207C908(moveType), 1, &v2, HEAP_ID_BATTLE); + MI_CpuCopy32(v2->pRawData, moveDisplayObj->typeIcon[i], v3); Heap_FreeToHeap(v1); } - if ((v0->unk_28[i].unk_00.pixels == NULL) || ((param2->move[i] != v0->unk_00.move[i]) && (param2->move[i] != 0))) { - v6 = MessageUtil_MoveName(param2->move[i], 5); - ov16_0226AEA0(battleInput, v6, FONT_SUBSCREEN, &v0->unk_28[i], TEXT_COLOR(7, 8, 9)); - Strbuf_Free(v6); + if ((moveDisplayObj->moveNameText[i].unk_00.pixels == NULL) || ((moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) && (moveDisplay->move[i] != 0))) { + moveName = MessageUtil_MoveName(moveDisplay->move[i], 5); + ov16_0226AEA0(battleInput, moveName, FONT_SUBSCREEN, &moveDisplayObj->moveNameText[i], TEXT_COLOR(7, 8, 9)); + Strbuf_Free(moveName); } - if ((v0->unk_78[i].unk_00.pixels == NULL) || (v0->unk_C8[i].unk_00.pixels == NULL) || (param2->move[i] != 0) || (param2->move[i] != v0->unk_00.move[i]) || (param2->curPP[i] != v0->unk_00.curPP[i]) || (param2->maxPP[i] != v0->unk_00.maxPP[i])) { - StringTemplate_SetNumber(v10, 0, param2->curPP[i], 2, 1, 0); - StringTemplate_SetNumber(v10, 1, param2->maxPP[i], 2, 1, 0); + if ((moveDisplayObj->curPPText[i].unk_00.pixels == NULL) || (moveDisplayObj->maxPPText[i].unk_00.pixels == NULL) || (moveDisplay->move[i] != 0) || (moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) || (moveDisplay->curPP[i] != moveDisplayObj->moveDisplay.curPP[i]) || (moveDisplay->maxPP[i] != moveDisplayObj->moveDisplay.maxPP[i])) { + StringTemplate_SetNumber(v10, 0, moveDisplay->curPP[i], 2, 1, 0); + StringTemplate_SetNumber(v10, 1, moveDisplay->maxPP[i], 2, 1, 0); StringTemplate_Format(v10, v7, v8); - v11 = ov16_0226B924(param2->curPP[i], param2->maxPP[i]); + ppColor = GetPPTextColor(moveDisplay->curPP[i], moveDisplay->maxPP[i]); - if ((v0->unk_78[i].unk_00.pixels == NULL) || (param2->move[i] != v0->unk_00.move[i]) || (param2->curPP[i] != v0->unk_00.curPP[i])) { - ov16_0226AEA0(battleInput, v7, FONT_SYSTEM, &v0->unk_78[i], v11); + if ((moveDisplayObj->curPPText[i].unk_00.pixels == NULL) || (moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) || (moveDisplay->curPP[i] != moveDisplayObj->moveDisplay.curPP[i])) { + ov16_0226AEA0(battleInput, v7, FONT_SYSTEM, &moveDisplayObj->curPPText[i], ppColor); } - if ((v0->unk_C8[i].unk_00.pixels == NULL) || (param2->move[i] != v0->unk_00.move[i]) || (param2->curPP[i] != v0->unk_00.curPP[i])) { - ov16_0226AEA0(battleInput, v9, FONT_SYSTEM, &v0->unk_C8[i], v11); + if ((moveDisplayObj->maxPPText[i].unk_00.pixels == NULL) || (moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) || (moveDisplay->curPP[i] != moveDisplayObj->moveDisplay.curPP[i])) { + ov16_0226AEA0(battleInput, v9, FONT_SYSTEM, &moveDisplayObj->maxPPText[i], ppColor); } } } @@ -2785,10 +2807,10 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * Strbuf_Free(v8); Strbuf_Free(v7); - v0->unk_00 = *param2; + moveDisplayObj->moveDisplay = *moveDisplay; } -static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4) +static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor param4) { int v0, v1; @@ -2815,12 +2837,12 @@ static void ov16_0226AF0C(BattleInput *battleInput) UnkStruct_ov16_02260C00 *v4; int v5; int v6; - UnkStruct_ov16_0226ABD4 *v7; + MoveDisplayObject *moveDisplayObj; v4 = &battleInput->unk_1A.val2; v1 = ov16_0223E010(battleInput->battleSystem); v2 = ov16_0223E018(battleInput->battleSystem); - v7 = ov16_0226ABD4(battleInput, battleInput->unk_66A); + moveDisplayObj = ov16_0226ABD4(battleInput, battleInput->unk_66A); v3 = Unk_ov16_0227047C; for (i = 0; i < LEARNED_MOVES_MAX; i++) { @@ -2843,7 +2865,7 @@ static void ov16_0226AF0C(BattleInput *battleInput) v8 = G2S_GetOBJCharPtr(); v9 = SpriteActor_ImageProxy(battleInput->unk_5EC[i]->unk_00); - MI_CpuCopy16(v7->unk_18[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); + MI_CpuCopy16(moveDisplayObj->typeIcon[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); } } } @@ -3181,8 +3203,8 @@ static void ov16_0226B390(SysTask *param0, void *param1) switch (battleInput->unk_67C.unk_00) { case 0: ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); - sub_020129A4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, v2, v3 + -2); if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, -2); @@ -3201,8 +3223,8 @@ static void ov16_0226B390(SysTask *param0, void *param1) battleInput->unk_67C.unk_00++; case 2: ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); - sub_020129A4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[battleInput->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, v2, v3 + 1); if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, 1); @@ -3283,12 +3305,12 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(battleInput->unk_4CC[v4].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v4].unk_00, v2, v3 + -2); - sub_020129A4(battleInput->unk_4CC[v5].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v5].unk_00, v2, v3 + -2); - sub_020129A4(battleInput->unk_4CC[v6].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v6].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->textObj[v4].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v4].fontOAM, v2, v3 + -2); + sub_020129A4(battleInput->textObj[v5].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v5].fontOAM, v2, v3 + -2); + sub_020129A4(battleInput->textObj[v6].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + -2); if (v9 != 0) { sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, -2); @@ -3298,8 +3320,8 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) } } } else { - sub_020129A4(battleInput->unk_4CC[4].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[4].unk_00, v2, v3 + -2); + sub_020129A4(battleInput->textObj[4].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[4].fontOAM, v2, v3 + -2); } battleInput->unk_67C.unk_00++; @@ -3317,12 +3339,12 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(battleInput->unk_4CC[v4].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v4].unk_00, v2, v3 + 1); - sub_020129A4(battleInput->unk_4CC[v5].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v5].unk_00, v2, v3 + 1); - sub_020129A4(battleInput->unk_4CC[v6].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[v6].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->textObj[v4].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v4].fontOAM, v2, v3 + 1); + sub_020129A4(battleInput->textObj[v5].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v5].fontOAM, v2, v3 + 1); + sub_020129A4(battleInput->textObj[v6].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + 1); if (v9 != 0) { sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, 1); @@ -3332,8 +3354,8 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) } } } else { - sub_020129A4(battleInput->unk_4CC[4].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[4].unk_00, v2, v3 + 1); + sub_020129A4(battleInput->textObj[4].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[4].fontOAM, v2, v3 + 1); } battleInput->unk_67C.unk_00++; @@ -3367,9 +3389,9 @@ static void ov16_0226B780(SysTask *param0, void *param1) if (v4[i] == 1) { ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 2); - if (battleInput->unk_4CC[0 + i].unk_00 != NULL) { - sub_020129A4(battleInput->unk_4CC[0 + i].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[0 + i].unk_00, v2, v3 + -2); + if (battleInput->textObj[0 + i].fontOAM != NULL) { + sub_020129A4(battleInput->textObj[0 + i].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[0 + i].fontOAM, v2, v3 + -2); } if (battleInput->unk_60C[i] != NULL) { @@ -3396,9 +3418,9 @@ static void ov16_0226B780(SysTask *param0, void *param1) if (v4[i] == 1) { ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 1); - if (battleInput->unk_4CC[0 + i].unk_00 != NULL) { - sub_020129A4(battleInput->unk_4CC[0 + i].unk_00, &v2, &v3); - sub_020128C4(battleInput->unk_4CC[0 + i].unk_00, v2, v3 + 1); + if (battleInput->textObj[0 + i].fontOAM != NULL) { + sub_020129A4(battleInput->textObj[0 + i].fontOAM, &v2, &v3); + sub_020128C4(battleInput->textObj[0 + i].fontOAM, v2, v3 + 1); } if (battleInput->unk_60C[i] != NULL) { @@ -3424,33 +3446,33 @@ static void ov16_0226B780(SysTask *param0, void *param1) } } -static TextColor ov16_0226B924(int param0, int param1) +static TextColor GetPPTextColor(int pp, int maxPp) { - if (param0 == 0) { + if (pp == 0) { return TEXT_COLOR(7, 8, 0); } - if (param1 == param0) { + if (maxPp == pp) { return TEXT_COLOR(1, 2, 0); } - if (param1 <= 2) { - if (param0 == 1) { + if (maxPp <= 2) { + if (pp == 1) { return TEXT_COLOR(5, 6, 0); } - } else if (param1 <= 7) { - switch (param0) { + } else if (maxPp <= 7) { + switch (pp) { case 1: return TEXT_COLOR(5, 6, 0); case 2: return TEXT_COLOR(3, 4, 0); } } else { - if (param0 <= param1 / 4) { + if (pp <= maxPp / 4) { return TEXT_COLOR(5, 6, 0); } - if (param0 <= param1 / 2) { + if (pp <= maxPp / 2) { return TEXT_COLOR(3, 4, 0); } } @@ -3458,7 +3480,7 @@ static TextColor ov16_0226B924(int param0, int param1) return TEXT_COLOR(1, 2, 0); } -static void ov16_0226B988(SysTask *param0, void *param1) +static void ov16_0226B988(SysTask *task, void *param1) { UnkStruct_ov16_0226B988 *v0 = param1; BgConfig *bgConfig = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); @@ -3497,7 +3519,7 @@ static void ov16_0226B988(SysTask *param0, void *param1) Bg_SetOffset(bgConfig, 5, 3, 0); BattleSystem_SetCommandSelectionFlags(v0->battleInput->battleSystem, 1); Heap_FreeToHeap(param1); - SysTask_Done(param0); + SysTask_Done(task); return; } @@ -3606,7 +3628,7 @@ static void ov16_0226BB94(void *param0) } } -static void ov16_0226BC50(SysTask *param0, void *param1) +static void ov16_0226BC50(SysTask *task, void *param1) { BattleInput *battleInput = param1; const UnkStruct_ov16_02270670 *v1; @@ -3626,15 +3648,15 @@ static void ov16_0226BC50(SysTask *param0, void *param1) Bg_SetPriority(4 + i, v1->unk_0C_val2[i]); } - SysTask_Done(param0); + SysTask_Done(task); } -static void ov16_0226BCBC(SysTask *param0, void *param1) +static void ov16_0226BCBC(SysTask *task, void *param1) { BattleInput *battleInput = param1; ov16_0226B198(); - SysTask_Done(param0); + SysTask_Done(task); } void ov16_0226BCCC(BattleInput *battleInput, int param1) @@ -3651,7 +3673,7 @@ BOOL ov16_0226BCD0(BattleInput *battleInput) return 0; } -static void ov16_0226BCE4(SysTask *param0, void *param1) +static void ov16_0226BCE4(SysTask *task, void *param1) { BattleInput *battleInput = param1; int v1; @@ -3684,7 +3706,7 @@ static void ov16_0226BCE4(SysTask *param0, void *param1) } } -static void ov16_0226BD74(SysTask *param0, void *param1) +static void ov16_0226BD74(SysTask *task, void *param1) { BattleInput *battleInput = param1; PaletteData *v1; @@ -3730,7 +3752,7 @@ static void ov16_0226BD74(SysTask *param0, void *param1) static int ov16_0226BE48(BattleInput *battleInput) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *v0; const UnkStruct_ov16_02270670 *v1; v0 = &battleInput->unk_6BC; @@ -3759,20 +3781,20 @@ static int ov16_0226BE48(BattleInput *battleInput) static int ov16_0226BEC0(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int i, v4, v5; - UnkStruct_ov16_0226C378 *v6; + BattleCursorPosition *v6; v0 = &battleInput->unk_6BC; v2 = &Unk_ov16_02270670[battleInput->unk_66B]; v5 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - v6 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v5)); + v6 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v5)); if (param1 == 1) { - v0->unk_02 = v6->unk_00; - v0->unk_01 = v6->unk_01; + v0->unk_02 = v6->commandX; + v0->unk_01 = v6->commandY; v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; @@ -3832,21 +3854,21 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1) return 0xffffffff; } -static void ov16_0226C0A0(BattleInput *battleInput, int param1) +static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226C378 *v0; + BattleCursorPosition *cursor; int v1, j, i; v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); if ((param1 != 3) || (battleInput->unk_6C1 == 0)) { - v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + cursor = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); for (i = 0; i < 2; i++) { for (j = 0; j < 3; j++) { if (param1 == Unk_ov16_022701EC[i][j]) { - v0->unk_00 = j; - v0->unk_01 = i; + cursor->commandX = j; + cursor->commandY = i; return; } @@ -3857,7 +3879,7 @@ static void ov16_0226C0A0(BattleInput *battleInput, int param1) static int ov16_0226C100(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, v4; @@ -3894,27 +3916,27 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) static int ov16_0226C1F8(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, i; u8 v5[3][2]; UnkStruct_ov16_02260C00 *v6; - UnkStruct_ov16_0226C378 *v7; + BattleCursorPosition *cursorPos; - v7 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); + cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); v0 = &battleInput->unk_6BC; v2 = &Unk_ov16_02270670[battleInput->unk_66B]; v6 = &battleInput->unk_1A.val2; if (param1 == 1) { - v0->unk_02 = v7->unk_02; - v0->unk_01 = v7->unk_03; + v0->unk_02 = cursorPos->moveX; + v0->unk_01 = cursorPos->moveY; v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; if ((v3 != 0) && (v6->unk_00[v3 - 1] == 0)) { - v7->unk_02 = 0; - v7->unk_03 = 0; + cursorPos->moveX = 0; + cursorPos->moveY = 0; v0->unk_02 = 0; v0->unk_01 = 0; v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; @@ -3950,9 +3972,9 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) return 0xffffffff; } -static void ov16_0226C378(BattleInput *battleInput, int param1) +static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226C378 *v0; + BattleCursorPosition *cursorPos; int v1, j, i; if (param1 == 0) { @@ -3960,13 +3982,13 @@ static void ov16_0226C378(BattleInput *battleInput, int param1) } v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { if (param1 == Unk_ov16_022701E4[i][j]) { - v0->unk_02 = j; - v0->unk_03 = i; + cursorPos->moveX = j; + cursorPos->moveY = i; return; } } @@ -3975,7 +3997,7 @@ static void ov16_0226C378(BattleInput *battleInput, int param1) static int ov16_0226C3C8(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *v0; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, v4; @@ -3988,9 +4010,9 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) int v23, v24, v25, v26; int v27, v28; int v29; - UnkStruct_ov16_0226C378 *v30; + BattleCursorPosition *v30; - v30 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); + v30 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); v0 = &battleInput->unk_6BC; v2 = &Unk_ov16_02270670[battleInput->unk_66B]; @@ -4232,7 +4254,7 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) static void ov16_0226C9B8(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226C378 *v0; + BattleCursorPosition *v0; int v1, j, i; if (param1 == 4) { @@ -4240,7 +4262,7 @@ static void ov16_0226C9B8(BattleInput *battleInput, int param1) } v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - v0 = ov16_02263B0C(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + v0 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); v0->unk_06 = battleInput->unk_66C; @@ -4258,32 +4280,32 @@ static void ov16_0226C9B8(BattleInput *battleInput, int param1) static int ov16_0226CA14(BattleInput *battleInput, int param1) { - UnkStruct_ov16_0226CB10 *v0; + BattleCursorMove *cursorMove; u32 v1; const UnkStruct_ov16_02270670 *v2; int v3, v4; - v0 = &battleInput->unk_6BC; + cursorMove = &battleInput->unk_6BC; v2 = &Unk_ov16_02270670[battleInput->unk_66B]; if (param1 == 1) { - v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; + v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - v1 = ov16_0226CB10(v0, 1, 2, Unk_ov16_022701C8[0]); + v1 = ov16_0226CB10(cursorMove, 1, 2, Unk_ov16_022701C8[0]); switch (v1) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; + v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; + v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; return v3; case PAD_BUTTON_B: return 1; @@ -4292,35 +4314,35 @@ static int ov16_0226CA14(BattleInput *battleInput, int param1) return 0xffffffff; } -static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2, const u8 *param3) +static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, const u8 *param3) { int v0, v1; u32 v2; - if (param0->unk_02 >= param1) { - param0->unk_02 = param1 - 1; + if (cursorMove->unk_02 >= param1) { + cursorMove->unk_02 = param1 - 1; } - if (param0->unk_01 >= param2) { - param0->unk_01 = param2 - 1; + if (cursorMove->unk_01 >= param2) { + cursorMove->unk_01 = param2 - 1; } - v1 = param0->unk_02; - v0 = param0->unk_01; + v1 = cursorMove->unk_02; + v0 = cursorMove->unk_01; if (gCoreSys.pressedKeys & PAD_KEY_UP) { - param0->unk_01--; + cursorMove->unk_01--; - if (param0->unk_01 < 0) { - param0->unk_01 = 0; + if (cursorMove->unk_01 < 0) { + cursorMove->unk_01 = 0; } if (param3 != NULL) { - while (param3[param1 * param0->unk_01 + param0->unk_02] == 0xff) { - param0->unk_01--; + while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { + cursorMove->unk_01--; - if (param0->unk_01 < 0) { - param0->unk_01 = v0; + if (cursorMove->unk_01 < 0) { + cursorMove->unk_01 = v0; break; } } @@ -4328,18 +4350,18 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2 v2 = PAD_KEY_UP; } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { - param0->unk_01++; + cursorMove->unk_01++; - if (param0->unk_01 >= param2) { - param0->unk_01 = param2 - 1; + if (cursorMove->unk_01 >= param2) { + cursorMove->unk_01 = param2 - 1; } if (param3 != NULL) { - while (param3[param1 * param0->unk_01 + param0->unk_02] == 0xff) { - param0->unk_01++; + while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { + cursorMove->unk_01++; - if (param0->unk_01 >= param2) { - param0->unk_01 = v0; + if (cursorMove->unk_01 >= param2) { + cursorMove->unk_01 = v0; break; } } @@ -4347,18 +4369,18 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2 v2 = PAD_KEY_DOWN; } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { - param0->unk_02--; + cursorMove->unk_02--; - if (param0->unk_02 < 0) { - param0->unk_02 = 0; + if (cursorMove->unk_02 < 0) { + cursorMove->unk_02 = 0; } if (param3 != NULL) { - while (param3[param1 * param0->unk_01 + param0->unk_02] == 0xff) { - param0->unk_02--; + while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { + cursorMove->unk_02--; - if (param0->unk_02 < 0) { - param0->unk_02 = v1; + if (cursorMove->unk_02 < 0) { + cursorMove->unk_02 = v1; break; } } @@ -4366,18 +4388,18 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2 v2 = PAD_KEY_LEFT; } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { - param0->unk_02++; + cursorMove->unk_02++; - if (param0->unk_02 >= param1) { - param0->unk_02 = param1 - 1; + if (cursorMove->unk_02 >= param1) { + cursorMove->unk_02 = param1 - 1; } if (param3 != NULL) { - while (param3[param1 * param0->unk_01 + param0->unk_02] == 0xff) { - param0->unk_02++; + while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { + cursorMove->unk_02++; - if (param0->unk_02 >= param1) { - param0->unk_02 = v1; + if (cursorMove->unk_02 >= param1) { + cursorMove->unk_02 = v1; break; } } @@ -4396,15 +4418,15 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2 int v3, v4; v3 = param3[param1 * v0 + v1]; - v4 = param3[param1 * param0->unk_01 + param0->unk_02]; + v4 = param3[param1 * cursorMove->unk_01 + cursorMove->unk_02]; if (v3 == v4) { - param0->unk_02 = v1; - param0->unk_01 = v0; + cursorMove->unk_02 = v1; + cursorMove->unk_01 = v0; } } - if ((param0->unk_02 != v1) || (param0->unk_01 != v0)) { + if ((cursorMove->unk_02 != v1) || (cursorMove->unk_01 != v0)) { Sound_PlayEffect(1500); } else { if (v2 & PAD_KEY) { @@ -4426,11 +4448,11 @@ void ov16_0226CD10(BattleInput *battleInput, int param1) } static int (*const Unk_ov16_0227020C[])(BattleInput *) = { - ov16_0226CD84, - ov16_0226CDDC + BattleInput_CatchingTutorialFight, + BattleInput_CatchingTutorialMove }; -static int ov16_0226CD18(BattleInput *battleInput) +static int BattleInput_CatchingTutorialMain(BattleInput *battleInput) { SpriteRenderer *v0; SpriteGfxHandler *v1; @@ -4446,11 +4468,11 @@ static int ov16_0226CD18(BattleInput *battleInput) GF_ASSERT(battleInput->catchingTutorial.unk_04 < NELEMS(Unk_ov16_0227020C)); v3 = Unk_ov16_0227020C[battleInput->catchingTutorial.unk_04](battleInput); } else { - v3 = ov16_0226CE34(battleInput); + v3 = BattleInput_CatchingTutorialBag(battleInput); } if (v3 != 0xffffffff) { - battleInput->catchingTutorial.unk_05 = 0; + battleInput->catchingTutorial.state = 0; battleInput->catchingTutorial.unk_06 = 0; battleInput->catchingTutorial.unk_04++; } @@ -4458,17 +4480,17 @@ static int ov16_0226CD18(BattleInput *battleInput) return v3; } -static int ov16_0226CD84(BattleInput *battleInput) +static int BattleInput_CatchingTutorialFight(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.unk_05) { + switch (battleInput->catchingTutorial.state) { case 0: ov16_0226DF80(battleInput->catchingTutorial.finger, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; return 0; } @@ -4478,17 +4500,17 @@ static int ov16_0226CD84(BattleInput *battleInput) return 0xffffffff; } -static int ov16_0226CDDC(BattleInput *battleInput) +static int BattleInput_CatchingTutorialMove(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.unk_05) { + switch (battleInput->catchingTutorial.state) { case 0: ov16_0226DF80(battleInput->catchingTutorial.finger, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; return 1; } break; @@ -4497,25 +4519,25 @@ static int ov16_0226CDDC(BattleInput *battleInput) return 0xffffffff; } -static int ov16_0226CE34(BattleInput *battleInput) +static int BattleInput_CatchingTutorialBag(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.unk_05) { + switch (battleInput->catchingTutorial.state) { case 0: battleInput->catchingTutorial.unk_06++; if (battleInput->catchingTutorial.unk_06 > 60) { battleInput->catchingTutorial.unk_06 = 0; - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; } break; case 1: ov16_0226DF80(battleInput->catchingTutorial.finger, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.unk_05++; + battleInput->catchingTutorial.state++; return 1; } break; @@ -4524,58 +4546,60 @@ static int ov16_0226CE34(BattleInput *battleInput) return 0xffffffff; } -void ov16_0226CEB0(BattleInput *battleInput, int param1) +void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) { - BgConfig *v0 = BattleSystem_GetBgConfig(battleInput->battleSystem); - PaletteData *v1 = BattleSystem_GetPaletteData(battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); GF_ASSERT(battleInput->unk_66B == 18); - LoadStandardWindowGraphics(v0, 5, 0x20, 1, 0, 5); - PaletteData_LoadBufferFromHardware(v1, 1, 1 * 16, 0x20); - - { - int v2 = 0x20, v3 = 1; - int v4, v5, v6, v7; - - v4 = 1; - v5 = 6; - v6 = 30; - v7 = 6; - - Bg_FillTilemapRect(v0, 5, v2, v4, v5, 1, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3); - Bg_FillTilemapRect(v0, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3); - Bg_FillTilemapRect(v0, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3); - Bg_FillTilemapRect(v0, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3); - Bg_ScheduleTilemapTransfer(v0, 5); - } - - { - Strbuf *v8; - MessageLoader *v9 = BattleSystem_MessageLoader(battleInput->battleSystem); - int i; - const u16 v11[][2] = { - { 1261, 1262 }, - { 1263, 1264 }, - { 1265, 1266 }, - }; + LoadStandardWindowGraphics(bgConfig, 5, 0x20, 1, 0, HEAP_ID_BATTLE); + PaletteData_LoadBufferFromHardware(palette, 1, 1 * 16, 0x20); + + int v2 = 0x20, v3 = 1; + int v4, v5, v6, v7; + + v4 = 1; + v5 = 6; + v6 = 30; + v7 = 6; + + Bg_FillTilemapRect(bgConfig, 5, v2, v4, v5, 1, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3); + Bg_FillTilemapRect(bgConfig, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3); + Bg_ScheduleTilemapTransfer(bgConfig, 5); + + Strbuf *src; + MessageLoader *msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + int i; + const u16 v11[][2] = { + // Playback paused + // Please wait + { pl_msg_00000368_01261, pl_msg_00000368_01262 }, + // Data is corrupted + // Playback canceled + { pl_msg_00000368_01263, pl_msg_00000368_01264 }, + // Battle is too long + // Playback canceled + { pl_msg_00000368_01265, pl_msg_00000368_01266 }, + }; - for (i = 0; i < 2; i++) { - if (battleInput->unk_4CC[1 + i].unk_00 != NULL) { - GF_ASSERT(0); - return; - } + for (i = 0; i < 2; i++) { + if (battleInput->textObj[1 + i].fontOAM != NULL) { + GF_ASSERT(0); + return; + } - v8 = MessageLoader_GetNewStrbuf(v9, v11[param1][i]); + src = MessageLoader_GetNewStrbuf(msgLoader, v11[param1][i]); - ov16_0226A98C(battleInput, &battleInput->unk_4CC[1 + i], v8, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); - Strbuf_Free(v8); - } + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1 + i], src, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); + Strbuf_Free(src); } } diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 0172536710..2a69371ba1 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1565,7 +1565,7 @@ void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag) return; } - ov16_0226CEB0(battleSys->battleInput, flag); + BattleInput_PrintRecordingStopMessage(battleSys->battleInput, flag); StartScreenTransition(3, 0, 0, 0, 16, 2, 5); sub_0200569C(); From 0ee0e35915581c4e2b6b95003aabfe7a21d21d11 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Mon, 27 Jan 2025 05:49:45 -0500 Subject: [PATCH 3/6] Begin documenting battle menu templates --- include/battle/battle_input.h | 6 +- include/battle/ov16_0223DF00.h | 6 +- src/battle/battle_display.c | 64 +-- src/battle/battle_input.c | 844 ++++++++++++++++----------------- src/battle/battle_io_command.c | 8 +- src/battle/battle_script.c | 14 +- src/battle/healthbar.c | 20 +- src/battle/ov16_0223B140.c | 4 +- src/battle/ov16_0223DF00.c | 12 +- src/battle/ov16_02268520.c | 10 +- src/overlay012/ov12_0221FC20.c | 4 +- src/overlay013/ov13_02224500.c | 22 +- src/overlay013/ov13_02227BDC.c | 14 +- 13 files changed, 504 insertions(+), 524 deletions(-) diff --git a/include/battle/battle_input.h b/include/battle/battle_input.h index 0fb3484ade..7eae5ea921 100644 --- a/include/battle/battle_input.h +++ b/include/battle/battle_input.h @@ -16,7 +16,7 @@ void BattleInput_Free(BattleInput *input); void ov16_02268A88(BattleInput *input); void ov16_02268B8C(BattleInput *input); void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *param2, int param3, int param4, void *param5); -void ov16_02268D40(NARC *param0, BattleInput *param1); +void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *param1); void ov16_0226914C(BattleInput *input, const u8 *param1); void ov16_02269168(BattleInput *input, u8 param1[], u8 param2[]); void ov16_022691BC(BattleInput *input); @@ -29,8 +29,8 @@ void ov16_0226947C(BattleInput *input, int param1, int param2); void ov16_0226AC98(BattleInput *input, int param1, const MoveDisplayInfo *param2); void ov16_0226BCCC(BattleInput *input, int param1); BOOL ov16_0226BCD0(BattleInput *input); -int ov16_0226CD08(BattleInput *input); -void ov16_0226CD10(BattleInput *input, int param1); +int BattleInput_GetCursorPressed(BattleInput *input); +void BattleInput_SetCursorPressed(BattleInput *input, int param1); void BattleInput_PrintRecordingStopMessage(BattleInput *input, int param1); u8 ov16_0226D088(BattleInput *input); diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 4708a522bb..c12ee0afe9 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -86,15 +86,15 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSys); UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSys); -SpriteRenderer *ov16_0223E010(BattleSystem *battleSys); -SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSys); +SpriteRenderer *BattleSystem_GetSpriteRenderer(BattleSystem *battleSys); +SpriteGfxHandler *BattleSystem_GetSpriteGfxHandler(BattleSystem *battleSys); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSys, int param1); BattleInput *BattleSystem_GetBattleInput(BattleSystem *battleSys); PartyGauge *ov16_0223E034(BattleSystem *battleSys, enum PartyGaugeSide param1); void ov16_0223E040(BattleSystem *battleSys, enum PartyGaugeSide param1, PartyGauge *param2); UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSys); UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSys); -MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSys); +MessageLoader *BattleSystem_GetMessageLoader(BattleSystem *battleSys); MessageLoader *ov16_0223E060(BattleSystem *battleSys); PaletteData *BattleSystem_GetPaletteData(BattleSystem *battleSys); Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSys); diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 1800928b3e..c6fd025a08 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -866,7 +866,7 @@ void ov16_0225D8F0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerData, BattleMessage *battleMsg) { - MessageLoader *msgLoader = BattleSystem_MessageLoader(battleSys); + MessageLoader *msgLoader = BattleSystem_GetMessageLoader(battleSys); BattleMessageWaitTask *taskData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask)); taskData->battleSys = battleSys; @@ -1095,7 +1095,7 @@ void ov16_0225DDD8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_02263C1C(param0, param1, param2, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1114,7 +1114,7 @@ void ov16_0225DE30(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_02263CF0(param0, param1, param2, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1133,7 +1133,7 @@ void ov16_0225DE88(BattleSystem *param0, BattlerData *param1) ov16_02263DD0(param0, param1, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1152,7 +1152,7 @@ void ov16_0225DEDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_02263E7C(param0, param1, param2, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1184,7 +1184,7 @@ void ov16_0225DF6C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 MessageLoader *v1; if (param1->bootState == 0x0) { - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (UnkStruct_ov16_0225DF6C *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DF6C)); v0->unk_00 = param0; @@ -1348,7 +1348,7 @@ void ov16_0225E23C(BattleSystem *param0, BattlerData *param1) BattleMessage v1; if (param1->bootState == 0x0) { - v0 = BattleSystem_MessageLoader(param0); + v0 = BattleSystem_GetMessageLoader(param0); v1.id = 923; v1.tags = 0; @@ -1409,7 +1409,7 @@ void ov16_0225E338(BattleSystem *param0, BattlerData *param1) ov16_022641B4(param0, param1, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1428,7 +1428,7 @@ void ov16_0225E38C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 ov16_02264270(param0, param1, param2, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1447,7 +1447,7 @@ void ov16_0225E3E0(BattleSystem *param0, BattlerData *param1) ov16_02264360(param0, param1, &v2); - v1 = BattleSystem_MessageLoader(param0); + v1 = BattleSystem_GetMessageLoader(param0); v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); v0->battleSys = param0; @@ -1947,7 +1947,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) v2.heapID = 5; v2.target = v0->unk_81; v2.ballID = v0->unk_8E; - v2.cellActorSys = ov16_0223E010(v0->unk_00); + v2.cellActorSys = BattleSystem_GetSpriteRenderer(v0->unk_00); v2.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v2.bgPrio = 1; v2.surface = 0; @@ -2200,7 +2200,7 @@ static void ov16_0225F764(SysTask *param0, void *param1) v5.mode = 5; v5.target = v0->unk_69; v5.ballID = v0->unk_6E; - v5.cellActorSys = ov16_0223E010(v0->unk_00); + v5.cellActorSys = BattleSystem_GetSpriteRenderer(v0->unk_00); v5.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v5.bgPrio = 1; v5.surface = 0; @@ -2216,7 +2216,7 @@ static void ov16_0225F764(SysTask *param0, void *param1) v6.mode = 5; v6.target = v0->unk_69; v6.ballID = v0->unk_6E; - v6.cellActorSys = ov16_0223E010(v0->unk_00); + v6.cellActorSys = BattleSystem_GetSpriteRenderer(v0->unk_00); v6.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v6.bgPrio = 1; v6.surface = 0; @@ -2556,7 +2556,7 @@ static void ov16_0225FD5C(SysTask *param0, void *param1) v6.heapID = 5; v6.mode = 4; v6.target = v0->unk_09; - v6.cellActorSys = ov16_0223E010(v0->unk_00); + v6.cellActorSys = BattleSystem_GetSpriteRenderer(v0->unk_00); v6.paletteSys = BattleSystem_GetPaletteData(v0->unk_00); v6.surface = 0; v6.battleSys = v0->unk_00; @@ -2599,7 +2599,7 @@ static void ov16_0225FD5C(SysTask *param0, void *param1) { SpriteGfxHandler *v8; - v8 = ov16_0223E018(v0->unk_00); + v8 = BattleSystem_GetSpriteGfxHandler(v0->unk_00); sub_0200D0F4(v0->unk_04->unk_18); v0->unk_04->unk_18 = NULL; @@ -2652,7 +2652,7 @@ static void ov16_0225FD5C(SysTask *param0, void *param1) { SpriteGfxHandler *v10; - v10 = ov16_0223E018(v0->unk_00); + v10 = BattleSystem_GetSpriteGfxHandler(v0->unk_00); sub_0200D0F4(v0->unk_04->unk_18); v0->unk_04->unk_18 = NULL; @@ -2742,7 +2742,7 @@ static void ov16_02260284(SysTask *param0, void *param1) case 1: { SpriteGfxHandler *v3; - v3 = ov16_0223E018(v0->unk_00); + v3 = BattleSystem_GetSpriteGfxHandler(v0->unk_00); sub_0200D0F4(v0->unk_04->unk_18); v0->unk_04->unk_18 = NULL; @@ -2910,7 +2910,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) MessageLoader *v9; BattleMessage v10; - v9 = BattleSystem_MessageLoader(v0->unk_00); + v9 = BattleSystem_GetMessageLoader(v0->unk_00); if (v4 & 0x400) { switch (ov16_0223F228(v0->unk_00)) { @@ -3247,7 +3247,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) MessageLoader *v6; BattleMessage v7; - v6 = BattleSystem_MessageLoader(v0->unk_00); + v6 = BattleSystem_GetMessageLoader(v0->unk_00); v7.tags = 2; v7.params[0] = v0->unk_1D | (v0->unk_1F << 8); v7.id = 921; @@ -3588,7 +3588,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) switch (v0->unk_0E) { case 0: - v0->unk_10 = ov16_0226CD08(BattleSystem_GetBattleInput(v0->unk_00)); + v0->unk_10 = BattleInput_GetCursorPressed(BattleSystem_GetBattleInput(v0->unk_00)); sub_02015738(ov16_0223E220(v0->unk_00), 1); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 0, 7, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 0, 16, 0x0); @@ -3702,7 +3702,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) break; case 6: ov16_0223B430(v0->unk_00); - ov16_0226CD10(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_10); + BattleInput_SetCursorPressed(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_10); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 7, 0, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 16, 0, 0x0); v0->unk_0E++; @@ -3816,7 +3816,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) v9.tags = 5; v9.params[0] = v0->unk_04->unk_1C; - v8 = BattleSystem_MessageLoader(v0->unk_00); + v8 = BattleSystem_GetMessageLoader(v0->unk_00); v0->unk_11 = BattleMessage_Print(v0->unk_00, v8, &v9, BattleSystem_TextSpeed(v0->unk_00)); v0->unk_17 = 30; @@ -3901,7 +3901,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) break; } - v14 = BattleSystem_MessageLoader(v0->unk_00); + v14 = BattleSystem_GetMessageLoader(v0->unk_00); v0->unk_11 = BattleMessage_Print(v0->unk_00, v14, &v15, BattleSystem_TextSpeed(v0->unk_00)); v0->unk_17 = 30; } @@ -3961,7 +3961,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) BattleMessage v25; int v26; - v24 = BattleSystem_MessageLoader(v0->unk_00); + v24 = BattleSystem_GetMessageLoader(v0->unk_00); v26 = v0->unk_08->unk_04->unk_11 * 2; if (v0->unk_08->unk_04->unk_20) { @@ -4067,7 +4067,7 @@ static void ov16_022611DC(SysTask *param0, void *param1) } } - v29 = BattleSystem_MessageLoader(v0->unk_00); + v29 = BattleSystem_GetMessageLoader(v0->unk_00); v0->unk_11 = BattleMessage_Print(v0->unk_00, v29, &v30, BattleSystem_TextSpeed(v0->unk_00)); v0->unk_17 = 30; } @@ -4182,7 +4182,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) Window_LoadTiles(v2); } - v0->unk_17 = ov16_0226CD08(BattleSystem_GetBattleInput(v0->unk_00)); + v0->unk_17 = BattleInput_GetCursorPressed(BattleSystem_GetBattleInput(v0->unk_00)); sub_02015738(ov16_0223E220(v0->unk_00), 1); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 0, 7, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 0, 16, 0x0); @@ -4293,7 +4293,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1) case 2: if (v0->unk_04->unk_36) { ov16_0223B430(v0->unk_00); - ov16_0226CD10(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_04->unk_32); + BattleInput_SetCursorPressed(BattleSystem_GetBattleInput(v0->unk_00), v0->unk_04->unk_32); PaletteData_StartFade(v1, (0x1 | 0x4), 0xc00, -8, 7, 0, 0x0); PaletteData_StartFade(v1, (0x2 | 0x8), 0xffff, -8, 16, 0, 0x0); v0->unk_0A++; @@ -4446,7 +4446,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) MessageLoader *v7; BattleMessage v8; - v7 = BattleSystem_MessageLoader(v0->unk_00); + v7 = BattleSystem_GetMessageLoader(v0->unk_00); if (v0->unk_0F == 5) { v8.tags = 2 | 0x80; @@ -5359,7 +5359,7 @@ static void ShowPartyGaugeTask(SysTask *param0, void *param1) } } - v3 = PartyGauge_Show(v0->status, v1, v4, v5, ov16_0223E010(v0->battleSys), ov16_0223E018(v0->battleSys)); + v3 = PartyGauge_Show(v0->status, v1, v4, v5, BattleSystem_GetSpriteRenderer(v0->battleSys), BattleSystem_GetSpriteGfxHandler(v0->battleSys)); ov16_0223E040(v0->battleSys, v1, v3); } v0->state++; @@ -6137,8 +6137,8 @@ static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2 CellActorData *v3; int v4; - v0 = ov16_0223E010(param0); - v1 = ov16_0223E018(param0); + v0 = BattleSystem_GetSpriteRenderer(param0); + v1 = BattleSystem_GetSpriteGfxHandler(param0); v2 = BattleSystem_GetPaletteData(param0); if (param1 & 0x1) { @@ -6168,7 +6168,7 @@ static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_o v0.unk_04 = BattleSystem_GetBgConfig(param0); v0.unk_08 = BattleSystem_GetPaletteData(param0); - v0.unk_00 = ov16_0223E010(param0); + v0.unk_00 = BattleSystem_GetSpriteRenderer(param0); for (i = 0; i < 4; i++) { v0.unk_0C[i] = ov16_0223F2AC(param0, i); diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index 95db01d0d3..19aad0a1c1 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -169,8 +169,8 @@ typedef struct { typedef struct { u8 unk_00; - s8 unk_01; - s8 unk_02; + s8 y; + s8 x; u8 unk_03; } BattleCursorMove; @@ -212,9 +212,9 @@ struct BattleInput_t { UnkStruct_02012744 *unk_4C8; BattleInputTextObject textObj[13]; UnkStruct_02012B20 *unk_5B8; - CellActorData *unk_5BC[6]; - CellActorData *unk_5D4[6]; - CellActorData *unk_5EC[4]; + CellActorData *actorBallGague[6]; + CellActorData *actorBallGagueOpponent[6]; + CellActorData *actorTypeIcons[4]; CellActorData *unk_5FC[4]; CellActorData *unk_60C[4]; SysTask *unk_61C[4]; @@ -223,7 +223,7 @@ struct BattleInput_t { u8 unk_668; u8 unk_669; u8 unk_66A; - s8 unk_66B; + s8 curMenuId; u8 unk_66C; u8 unk_66D; u8 unk_66E; @@ -239,14 +239,14 @@ struct BattleInput_t { s32 unk_6B0; s32 unk_6B4; BattleCursor *cursor; - BattleCursorMove unk_6BC; + BattleCursorMove cursorMove; u8 unk_6C0; u8 unk_6C1; struct { CatchingTutorialFinger *finger; - u8 unk_04; u8 state; - u8 unk_06; + u8 subState; + u8 delay; } catchingTutorial; }; @@ -274,11 +274,11 @@ typedef struct { const TouchScreenRect *unk_14; const int *unk_18; const u8 *unk_1C; - int (*unk_20)(BattleInput *battleInput, int param1); + int (*funcCursorMove)(BattleInput *battleInput, int param1); void (*funcSaveCursorPos)(BattleInput *battleInput, int param1); - void (*unk_28)(BattleInput *battleInput, int param1, int param2); + void (*funcCreateMenuObjects)(BattleInput *battleInput, int param1, int param2); int (*unk_2C)(BattleInput *battleInput, int param1, int param2); -} UnkStruct_ov16_02270670; +} BattleMenuTemplate; enum { BITO_FIGHT = 0, @@ -312,8 +312,8 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2); static int ov16_0226A318(BattleInput *battleInput, int param1, int param2); static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2); static void ov16_022699AC(BattleInput *battleInput, int param1, int param2); -static void ov16_0226AF0C(BattleInput *battleInput); -static void ov16_0226AFF4(BattleInput *battleInput); +static void BattleInput_CreateTypeIcons(BattleInput *battleInput); +static void BattleInput_DestroyTypeIcons(BattleInput *battleInput); static void ov16_0226B028(BattleInput *battleInput); static void ov16_0226B2BC(SysTaskFunc param0, BattleInput *battleInput); static void ov16_0226B2F0(BattleInput *battleInput); @@ -322,7 +322,7 @@ static int ov16_0226A634(BattleInput *battleInput, int param1, int param2); static int ov16_0226A528(BattleInput *battleInput, int param1, int param2); static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int param1, int param2); static void ov16_02269D14(BattleInput *battleInput, int param1, int param2); -static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2); +static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput, int param1, int param2); static void ov16_02269F68(BattleInput *battleInput, int param1, int param2); static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2); static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2); @@ -330,7 +330,7 @@ static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2); static void ov16_0226B088(BattleInput *battleInput, int param1); static void ov16_0226B0DC(BattleInput *battleInput, int param1); static int ov16_0226A934(u8 param0); -static void ov16_02268F00(BattleInput *battleInput); +static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput); void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]); void ov16_022691BC(BattleInput *battleInput); void ov16_02269218(BattleInput *battleInput); @@ -338,7 +338,7 @@ static void ov16_0226BC50(SysTask *param0, void *param1); static void ov16_0226B198(void); static void ov16_0226BCBC(SysTask *param0, void *param1); static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2); -static void ov16_0226B1E8(BattleInput *battleInput); +static void BattleInput_DestroyMenuObjects(BattleInput *battleInput); static void ov16_0226B390(SysTask *param0, void *param1); static void ov16_0226B4E0(SysTask *param0, void *param1); static void ov16_0226B780(SysTask *param0, void *param1); @@ -349,7 +349,7 @@ void ov16_0226947C(BattleInput *battleInput, int param1, int param2); static void ov16_022694A8(SysTask *param0, void *param1); static void ov16_0226B314(BattleInput *battleInput, int param1); static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10); -static void ov16_0226AAC0(BattleInput *battleInput); +static void BattleInput_DestroyTextObjects(BattleInput *battleInput); static void ov16_0226A698(BattleInput *battleInput); static void ov16_0226A718(BattleInput *battleInput); static void ov16_0226A768(BattleInput *battleInput); @@ -368,7 +368,7 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1); static int ov16_0226C1F8(BattleInput *battleInput, int param1); static int ov16_0226C3C8(BattleInput *battleInput, int param1); static int ov16_0226CA14(BattleInput *battleInput, int param1); -static u32 ov16_0226CB10(BattleCursorMove *param0, int param1, int param2, const u8 *param3); +static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, int param2, const u8 *param3); static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int param1); static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int param1); static void ov16_0226C9B8(BattleInput *battleInput, int param1); @@ -399,7 +399,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270264[] = { 0x2D }; -__attribute__((aligned(4))) static const u16 Unk_ov16_022702B4[][2] = { +__attribute__((aligned(4))) static const u16 sTypeIconPositions[][2] = { { 0x20, 0x3E }, { 0xA0, 0x3E }, { 0x20, 0x7E }, @@ -591,7 +591,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701C4[NELEMS(Unk_ov16_02 0x4 }; -static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { +static const BattleMenuTemplate sBattleMenuTemplates[] = { { 0x1C, 0xF2, @@ -797,7 +797,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { Unk_ov16_02270A00, ov16_0226CA14, NULL, - ov16_02269DB0, + BattleInput_CreateCancelLearningMoveObjects, ov16_0226A4A4, }, { @@ -841,7 +841,7 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { }, }; -static const SpriteTemplate Unk_ov16_02270414 = { +static const SpriteTemplate sBallGagueTemplate = { 0xC, 0xD, 0x0, @@ -854,7 +854,7 @@ static const SpriteTemplate Unk_ov16_02270414 = { 0x0, }; -static const SpriteTemplate Unk_ov16_02270448 = { +static const SpriteTemplate sBallGagueOpponentTemplate = { 0xF6, 0x9, 0x0, @@ -867,7 +867,7 @@ static const SpriteTemplate Unk_ov16_02270448 = { 0x0, }; -static const SpriteTemplate Unk_ov16_0227047C = { +static const SpriteTemplate sTypeIconSpriteTemplate = { 0x0, 0x0, 0x0, @@ -1042,7 +1042,7 @@ static void *BattleInput_New(void) { BattleInput *battleInput = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleInput)); MI_CpuClear8(battleInput, sizeof(BattleInput)); - battleInput->unk_66B = -1; + battleInput->curMenuId = -1; return battleInput; } @@ -1179,8 +1179,8 @@ void BattleInput_Free(BattleInput *battleInput) *battleInput->unk_04 = battleInput->unk_6C0; } - ov16_0226B1E8(battleInput); - ov16_02268F00(battleInput); + BattleInput_DestroyMenuObjects(battleInput); + BattleInput_FreeBallGagueObjects(battleInput); ov16_02268B8C(battleInput); sub_020127BC(battleInput->unk_4C8); @@ -1206,8 +1206,8 @@ void ov16_02268A88(BattleInput *battleInput) PaletteData *v3; int i; - spriteRenderer = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); @@ -1237,32 +1237,29 @@ void ov16_02268A88(BattleInput *battleInput) void ov16_02268B8C(BattleInput *battleInput) { int i; - SpriteRenderer *v1; - SpriteGfxHandler *v2; - - v1 = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + SpriteRenderer *spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + SpriteGfxHandler *spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); for (i = 0; i < 4; i++) { - sub_0207CA34(v2, 20025 + i); + sub_0207CA34(spriteGfxHandler, 20025 + i); } - sub_0207CA3C(v2, 20020); - sub_0207CA44(v2, 20017, 20017); + sub_0207CA3C(spriteGfxHandler, 20020); + sub_0207CA44(spriteGfxHandler, 20017, 20017); if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { CatchingTutorialFinger_Free(battleInput->catchingTutorial.finger); - CatchingTutorialFinger_FreeResources(v2, 20412, 20036, 20406, 20395); + CatchingTutorialFinger_FreeResources(spriteGfxHandler, 20412, 20036, 20406, 20395); } } -void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int param3, int param4, void *param5) +void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int menuId, int param4, void *param5) { - const UnkStruct_ov16_02270670 *v0, *v1; + const BattleMenuTemplate *menuTemplate, *prevMenuTemplate; int i; - BgConfig *v3; - SpriteRenderer *v4; - SpriteGfxHandler *v5; + BgConfig *bgConfig; + SpriteRenderer *spriteRenderer; + SpriteGfxHandler *gfxHandler; if (param5 != NULL) { MI_CpuCopy8(param5, &battleInput->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2)); @@ -1270,67 +1267,67 @@ void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int par battleInput->unk_66E = 0; - v3 = BattleSystem_GetBgConfig(battleInput->battleSystem); - v4 = ov16_0223E010(battleInput->battleSystem); - v5 = ov16_0223E018(battleInput->battleSystem); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - if (battleInput->unk_66B == -1) { + if (battleInput->curMenuId == -1) { param4 = 1; - v1 = NULL; + prevMenuTemplate = NULL; } else { - v1 = &Unk_ov16_02270670[battleInput->unk_66B]; + prevMenuTemplate = &sBattleMenuTemplates[battleInput->curMenuId]; } - v0 = &Unk_ov16_02270670[param3]; + menuTemplate = &sBattleMenuTemplates[menuId]; PaletteData_LoadBuffer(BattleSystem_GetPaletteData(battleInput->battleSystem), battleInput->unk_58, 1, 0, 0x200); for (i = 0; i < 4; i++) { - if ((v0->unk_04_val2[i] != 0xffff) && ((param4 == 1) || (v0->unk_04_val2[i] != v1->unk_04_val2[i]))) { - Bg_LoadTilemapBuffer(v3, 4 + i, battleInput->unk_3C[v0->unk_04_val2[i]], 0x800); - Bg_ScheduleTilemapTransfer(v3, 4 + i); + if ((menuTemplate->unk_04_val2[i] != 0xffff) && ((param4 == 1) || (menuTemplate->unk_04_val2[i] != prevMenuTemplate->unk_04_val2[i]))) { + Bg_LoadTilemapBuffer(bgConfig, 4 + i, battleInput->unk_3C[menuTemplate->unk_04_val2[i]], 0x800); + Bg_ScheduleTilemapTransfer(bgConfig, 4 + i); } } - SpriteRenderer_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, v4, v5, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - battleInput->unk_66B = param3; + SpriteRenderer_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, gfxHandler, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + battleInput->curMenuId = menuId; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 8, 12); - ov16_0226B1E8(battleInput); + BattleInput_DestroyMenuObjects(battleInput); - if (v0->unk_28 != NULL) { - v0->unk_28(battleInput, param3, param4); + if (menuTemplate->funcCreateMenuObjects != NULL) { + menuTemplate->funcCreateMenuObjects(battleInput, menuId, param4); } SysTask_ExecuteAfterVBlank(ov16_0226BC50, battleInput, 10); } -void ov16_02268D40(NARC *param0, BattleInput *battleInput) +void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *battleInput) { int i; SpriteRenderer *spriteRenderer; - SpriteGfxHandler *v2; + SpriteGfxHandler *spriteGfxHandler; - GF_ASSERT(battleInput->unk_5BC[0] == NULL && battleInput->unk_5D4[0] == NULL); + GF_ASSERT(battleInput->actorBallGague[0] == NULL && battleInput->actorBallGagueOpponent[0] == NULL); - spriteRenderer = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, v2, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, v2, param0, 207, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, v2, param0, 209, 1, 20015); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 207, 1, 20015); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 209, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, v2, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, v2, param0, 204, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, v2, param0, 206, 1, 20016); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 204, 1, 20016); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 206, 1, 20016); for (i = 0; i < 6; i++) { - battleInput->unk_5BC[i] = SpriteActor_LoadResources(spriteRenderer, v2, &Unk_ov16_02270414); - sub_0200D4D0(battleInput->unk_5BC[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); - sub_0200D6A4(battleInput->unk_5BC[i], 1); + battleInput->actorBallGague[i] = SpriteActor_LoadResources(spriteRenderer, spriteGfxHandler, &sBallGagueTemplate); + sub_0200D4D0(battleInput->actorBallGague[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D6A4(battleInput->actorBallGague[i], 1); - battleInput->unk_5D4[i] = SpriteActor_LoadResources(spriteRenderer, v2, &Unk_ov16_02270448); - sub_0200D4D0(battleInput->unk_5D4[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); + battleInput->actorBallGagueOpponent[i] = SpriteActor_LoadResources(spriteRenderer, spriteGfxHandler, &sBallGagueOpponentTemplate); + sub_0200D4D0(battleInput->actorBallGagueOpponent[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); } ov16_02269218(battleInput); @@ -1338,44 +1335,42 @@ void ov16_02268D40(NARC *param0, BattleInput *battleInput) GF_ASSERT(battleInput->unk_08 == NULL); battleInput->unk_08 = SysTask_Start(ov16_02268FCC, battleInput, 1300); - PaletteData *v3; - - v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); - BattleCursor_LoadResources(spriteRenderer, v2, v3, 5, 20411, 20035, 20405, 20394); - battleInput->cursor = BattleCursor_New(spriteRenderer, v2, 5, 20411, 20035, 20405, 20394, 5, 0); + PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); + BattleCursor_LoadResources(spriteRenderer, spriteGfxHandler, palette, 5, 20411, 20035, 20405, 20394); + battleInput->cursor = BattleCursor_New(spriteRenderer, spriteGfxHandler, 5, 20411, 20035, 20405, 20394, 5, 0); } -static void ov16_02268F00(BattleInput *battleInput) +static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput) { int i; SpriteRenderer *spriteRenderer; - SpriteGfxHandler *v2; + SpriteGfxHandler *spriteGfxHandler; - GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); - spriteRenderer = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - SpriteGfxHandler_UnloadCharObjById(v2, 20023); - SpriteGfxHandler_UnloadCellObjById(v2, 20015); - SpriteGfxHandler_UnloadAnimObjById(v2, 20015); - SpriteGfxHandler_UnloadCharObjById(v2, 20024); - SpriteGfxHandler_UnloadCellObjById(v2, 20016); - SpriteGfxHandler_UnloadAnimObjById(v2, 20016); - SpriteGfxHandler_UnloadPlttObjById(v2, 20023); + SpriteGfxHandler_UnloadCharObjById(spriteGfxHandler, 20023); + SpriteGfxHandler_UnloadCellObjById(spriteGfxHandler, 20015); + SpriteGfxHandler_UnloadAnimObjById(spriteGfxHandler, 20015); + SpriteGfxHandler_UnloadCharObjById(spriteGfxHandler, 20024); + SpriteGfxHandler_UnloadCellObjById(spriteGfxHandler, 20016); + SpriteGfxHandler_UnloadAnimObjById(spriteGfxHandler, 20016); + SpriteGfxHandler_UnloadPlttObjById(spriteGfxHandler, 20023); for (i = 0; i < 6; i++) { - sub_0200D0F4(battleInput->unk_5BC[i]); - battleInput->unk_5BC[i] = NULL; + sub_0200D0F4(battleInput->actorBallGague[i]); + battleInput->actorBallGague[i] = NULL; - sub_0200D0F4(battleInput->unk_5D4[i]); - battleInput->unk_5D4[i] = NULL; + sub_0200D0F4(battleInput->actorBallGagueOpponent[i]); + battleInput->actorBallGagueOpponent[i] = NULL; } SysTask_Done(battleInput->unk_08); battleInput->unk_08 = NULL; - BattleCursor_FreeResources(v2, 20411, 20035, 20405, 20394); + BattleCursor_FreeResources(spriteGfxHandler, 20411, 20035, 20405, 20394); BattleCursor_Free(battleInput->cursor); } @@ -1391,7 +1386,7 @@ static void ov16_02268FCC(SysTask *task, void *data) switch (v2->unk_03) { case 0: default: - if (sub_0200D400(battleInput->unk_5BC[i]->unk_00) == 0) { + if (sub_0200D400(battleInput->actorBallGague[i]->unk_00) == 0) { break; } @@ -1416,10 +1411,10 @@ static void ov16_02268FCC(SysTask *task, void *data) break; case 2: case 4: - sub_0200D7C0(battleInput->unk_5BC[i], 0x800); + sub_0200D7C0(battleInput->actorBallGague[i], 0x800); v2->unk_00 += 0x180; - sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_06++; if (v2->unk_06 >= v2->unk_07) { @@ -1428,8 +1423,8 @@ static void ov16_02268FCC(SysTask *task, void *data) if (v2->unk_03 == 2) { v2->unk_03++; } else { - sub_0200D79C(battleInput->unk_5BC[i], 0); - sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D79C(battleInput->actorBallGague[i], 0); + sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_00 = 0; @@ -1450,10 +1445,10 @@ static void ov16_02268FCC(SysTask *task, void *data) break; case 3: - sub_0200D7C0(battleInput->unk_5BC[i], -0x800); + sub_0200D7C0(battleInput->actorBallGague[i], -0x800); v2->unk_00 -= 0x180; - sub_0200D500(battleInput->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); v2->unk_06++; if (v2->unk_06 >= v2->unk_07 * 2) { @@ -1481,13 +1476,13 @@ void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]) for (i = 0; i < 6; i++) { v1 = ov16_0226A934(param1[i]); - CellActor_SetAnim(battleInput->unk_5BC[i]->unk_00, v1); - SpriteActor_UpdateObject(battleInput->unk_5BC[i]->unk_00); + CellActor_SetAnim(battleInput->actorBallGague[i]->unk_00, v1); + SpriteActor_UpdateObject(battleInput->actorBallGague[i]->unk_00); v1 = ov16_0226A934(param2[i]); - CellActor_SetAnim(battleInput->unk_5D4[i]->unk_00, v1); - SpriteActor_UpdateObject(battleInput->unk_5D4[i]->unk_00); + CellActor_SetAnim(battleInput->actorBallGagueOpponent[i]->unk_00, v1); + SpriteActor_UpdateObject(battleInput->actorBallGagueOpponent[i]->unk_00); } } @@ -1495,15 +1490,15 @@ void ov16_022691BC(BattleInput *battleInput) { int i; - GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->unk_5BC[i]->unk_00, 1); + SpriteActor_DrawSprite(battleInput->actorBallGague[i]->unk_00, 1); } if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_TRAINER) { for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->unk_5D4[i]->unk_00, 1); + SpriteActor_DrawSprite(battleInput->actorBallGagueOpponent[i]->unk_00, 1); } } } @@ -1512,34 +1507,34 @@ void ov16_02269218(BattleInput *battleInput) { int i; - GF_ASSERT(battleInput->unk_5BC[0] != NULL && battleInput->unk_5D4[0] != NULL); + GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->unk_5BC[i]->unk_00, 0); - SpriteActor_DrawSprite(battleInput->unk_5D4[i]->unk_00, 0); + SpriteActor_DrawSprite(battleInput->actorBallGague[i]->unk_00, 0); + SpriteActor_DrawSprite(battleInput->actorBallGagueOpponent[i]->unk_00, 0); } } int BattleInput_CheckTouch(BattleInput *battleInput) { int v0, v1, v2, v3; - const UnkStruct_ov16_02270670 *v4; + const BattleMenuTemplate *menuTemplate; int v5 = 0; - GF_ASSERT(battleInput->unk_66B != -1); + GF_ASSERT(battleInput->curMenuId != -1); - v4 = &Unk_ov16_02270670[battleInput->unk_66B]; + menuTemplate = &sBattleMenuTemplates[battleInput->curMenuId]; - if ((v4->unk_14 == NULL) || (battleInput->unk_66E == 1)) { + if ((menuTemplate->unk_14 == NULL) || (battleInput->unk_66E == 1)) { return 0xffffffff; } - GF_ASSERT(v4->unk_18 != NULL); + GF_ASSERT(menuTemplate->unk_18 != NULL); if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { v1 = BattleInput_CatchingTutorialMain(battleInput); } else { - v1 = sub_02022664(v4->unk_14); + v1 = sub_02022664(menuTemplate->unk_14); if (v1 == 0xffffffff) { v1 = ov16_0226BE48(battleInput); @@ -1551,19 +1546,19 @@ int BattleInput_CheckTouch(BattleInput *battleInput) v0 = 0xffffffff; v3 = 0xff; } else { - v0 = v4->unk_18[v1]; - v3 = v4->unk_1C[v1]; + v0 = menuTemplate->unk_18[v1]; + v3 = menuTemplate->unk_1C[v1]; } - if (v4->unk_2C != NULL) { - v0 = v4->unk_2C(battleInput, v0, v3); + if (menuTemplate->unk_2C != NULL) { + v0 = menuTemplate->unk_2C(battleInput, v0, v3); if (v0 != 0xffffffff) { - if (v4->funcSaveCursorPos != NULL) { - v4->funcSaveCursorPos(battleInput, v1); + if (menuTemplate->funcSaveCursorPos != NULL) { + menuTemplate->funcSaveCursorPos(battleInput, v1); } - MI_CpuClear8(&battleInput->unk_6BC, sizeof(BattleCursorMove)); + MI_CpuClear8(&battleInput->cursorMove, sizeof(BattleCursorMove)); ov16_0226DDE8(battleInput->cursor); if (v5 > 0) { @@ -1718,7 +1713,7 @@ static void ov16_02269654(BattleInput *battleInput, int param1, int param2) static void ov16_02269668(BattleInput *battleInput, int param1, int param2) { Strbuf *v0, *v1, *v2, *v3; - MessageLoader *v4; + MessageLoader *msgLoader; int v5; UnkStruct_ov16_02269668 *v6; @@ -1727,29 +1722,29 @@ static void ov16_02269668(BattleInput *battleInput, int param1, int param2) battleInput->unk_6C1 = v6->unk_08; - v4 = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); battleInput->unk_66A = v5; if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_SAFARI) { - v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00931); // BALL - v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00932); // BAIT - v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00933); // MUD + v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00931); // BALL + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_PAL_PARK) { - v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_01223); // BALL - v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00932); // BAIT - v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00933); // MUD + v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01223); // BALL + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else { - v0 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00924); // FIGHT - v1 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00925); // BAG - v2 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00926); // POKĂ©MON + v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00924); // FIGHT + v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00925); // BAG + v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00926); // POKĂ©MON } if (battleInput->unk_6C1 == 1) { - v3 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00928); // CANCEL + v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00928); // CANCEL battleInput->unk_66F = 1; } else { - v3 = MessageLoader_GetNewStrbuf(v4, pl_msg_00000368_00927); // RUN + v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00927); // RUN battleInput->unk_66F = 0; } @@ -1861,10 +1856,10 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) battleInput->unk_66A = v0->unk_10; - v2 = BattleSystem_MessageLoader(battleInput->battleSystem); + v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); moveDisplay = ov16_0226ABD4(battleInput, v0->unk_10); - ov16_0226AF0C(battleInput); + BattleInput_CreateTypeIcons(battleInput); { BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &moveDisplay->moveNameText[0]); @@ -1939,7 +1934,7 @@ static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int par MessageLoader *msgLoader; Strbuf *strYes, *strNo; - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); strYes = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00940); // Yes strNo = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00941); // No @@ -1955,7 +1950,7 @@ static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) MessageLoader *msgLoader; Strbuf *v1, *v2; - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01181); // Forget a move! v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01182); // Keep old moves! @@ -1966,7 +1961,7 @@ static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) Strbuf_Free(v2); } -static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) +static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; Strbuf *v1, *v2, *v3, *v4; @@ -1974,7 +1969,7 @@ static void ov16_02269DB0(BattleInput *battleInput, int param1, int param2) UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01186); // Give up on {move}? v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01187); // Don't give up on {move}! @@ -2001,7 +1996,7 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01260); // STOP { @@ -2038,7 +2033,7 @@ static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01217); // Use next PokĂ©mon v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01218); // Flee @@ -2066,7 +2061,7 @@ static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->unk_1A.val4; - msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01215); // Switch PokĂ©mon v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01216); // Keep battling @@ -2106,7 +2101,7 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) battleInput->unk_66C = v0->unk_21; battleInput->unk_66A = v0->unk_20; - v2 = BattleSystem_MessageLoader(battleInput->battleSystem); + v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); v8 = BattleSystem_StringTemplate(battleInput->battleSystem); ov16_0226B20C(battleInput, v3, 0); @@ -2163,13 +2158,9 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) Strbuf_Free(v4); - { - Strbuf *v13; - - v13 = MessageLoader_GetNewStrbuf(v2, 930); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); - Strbuf_Free(v13); - } + Strbuf *strCancel = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00930); // CANCEL + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], strCancel, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); + Strbuf_Free(strCancel); } static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) @@ -2409,8 +2400,8 @@ static void ov16_0226A698(BattleInput *battleInput) int v2, v3, v4; PaletteData *v5; - v0 = ov16_0223E010(battleInput->battleSystem); - v1 = ov16_0223E018(battleInput->battleSystem); + v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); v5 = BattleSystem_GetPaletteData(battleInput->battleSystem); sub_0200CD7C(v5, 3, v0, v1, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); @@ -2420,16 +2411,14 @@ static void ov16_0226A698(BattleInput *battleInput) static void ov16_0226A718(BattleInput *battleInput) { - SpriteGfxHandler *v0; - - v0 = ov16_0223E018(battleInput->battleSystem); - - SpriteGfxHandler_UnloadCharObjById(v0, 20036); - SpriteGfxHandler_UnloadCharObjById(v0, 20037); - SpriteGfxHandler_UnloadCharObjById(v0, 20038); - SpriteGfxHandler_UnloadCellObjById(v0, 20021); - SpriteGfxHandler_UnloadAnimObjById(v0, 20021); - SpriteGfxHandler_UnloadPlttObjById(v0, 20022); + SpriteGfxHandler *gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + + SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20036); + SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20037); + SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20038); + SpriteGfxHandler_UnloadCellObjById(gfxHandler, 20021); + SpriteGfxHandler_UnloadAnimObjById(gfxHandler, 20021); + SpriteGfxHandler_UnloadPlttObjById(gfxHandler, 20022); } static void ov16_0226A768(BattleInput *battleInput) @@ -2484,8 +2473,8 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, i return NULL; } - v0 = ov16_0223E010(battleInput->battleSystem); - v1 = ov16_0223E018(battleInput->battleSystem); + v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); sub_0200CBDC(v0, v1, 19, Pokemon_IconSpriteIndex(param1), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); @@ -2577,54 +2566,54 @@ static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *pa *param3 = v1; } -static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10) +static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *str, enum Font param3, TextColor param4, int param5, int param6, int x, int y, int param9, BattleInputTextImage *param10) { UnkStruct_020127E8 v0; - Window v1; + Window window; SpriteManagerAllocation spriteManAlloc; int v3; FontOAM *fontOAM; - BgConfig *v5; + BgConfig *bgConfig; SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(textObj->fontOAM == NULL); - v6 = ov16_0223E018(battleInput->battleSystem); - v5 = BattleSystem_GetBgConfig(battleInput->battleSystem); + v6 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); if (param10 == NULL) { - ov16_0226A95C(param2, param3, &v7, &v8); + ov16_0226A95C(str, param3, &v7, &v8); } else { v7 = param10->unk_12; v8 = param10->unk_10; } if (param10 == NULL) { - Window_Init(&v1); - Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0); - Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); + Window_Init(&window); + Window_AddToTopLeftCorner(bgConfig, &window, v8, 16 / 8, 0, 0); + Text_AddPrinterWithParamsColorAndSpacing(&window, param3, str, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } else { - v1 = param10->unk_00; + window = param10->unk_00; } - v3 = sub_02012898(&v1, NNS_G2D_VRAM_TYPE_2DSUB, 5); + v3 = sub_02012898(&window, NNS_G2D_VRAM_TYPE_2DSUB, 5); sub_0201ED94(v3, 1, NNS_G2D_VRAM_TYPE_2DSUB, &spriteManAlloc); if (param9 == 1) { - param7 -= v7 / 2; + x -= v7 / 2; } - param8 += (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT) - 8; + y += (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT) - 8; v0.unk_00 = battleInput->unk_4C8; - v0.unk_04 = &v1; + v0.unk_04 = &window; v0.unk_08 = sub_0200D9B0(v6); v0.unk_0C = sub_0200D04C(v6, param6); v0.unk_10 = NULL; v0.unk_14 = spriteManAlloc.unk_04; - v0.unk_18 = param7; - v0.unk_1C = param8; + v0.unk_18 = x; + v0.unk_1C = y; v0.unk_20 = 0; v0.unk_24 = 100; v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB; @@ -2633,10 +2622,10 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe fontOAM = sub_020127E8(&v0); sub_02012AC0(fontOAM, param5); - sub_020128C4(fontOAM, param7, param8); + sub_020128C4(fontOAM, x, y); if (param10 == NULL) { - Window_Remove(&v1); + Window_Remove(&window); } textObj->fontOAM = fontOAM; @@ -2644,7 +2633,7 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe textObj->unk_10 = v7; } -static void ov16_0226AAC0(BattleInput *battleInput) +static void BattleInput_DestroyTextObjects(BattleInput *battleInput) { int i; @@ -2662,10 +2651,10 @@ static void ov16_0226AAF8(BattleInput *battleInput) u8 v0[4], v1[4]; int j, i; u16 *v4, *v5; - BgConfig *v6; + BgConfig *bgConfig; - v6 = BattleSystem_GetBgConfig(battleInput->battleSystem); - v4 = Bg_GetTilemapBuffer(v6, 5); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + v4 = Bg_GetTilemapBuffer(bgConfig, 5); ov16_0226B20C(battleInput, v0, 0); @@ -2764,7 +2753,7 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * TextColor ppColor; MessageLoader *v12; - v12 = BattleSystem_MessageLoader(battleInput->battleSystem); + v12 = BattleSystem_GetMessageLoader(battleInput->battleSystem); moveDisplayObj = ov16_0226ABD4(battleInput, param1); v3 = sub_0208C098(6); v9 = MessageLoader_GetNewStrbuf(v12, pl_msg_00000368_00938); // PP @@ -2828,62 +2817,60 @@ static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum F Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } -static void ov16_0226AF0C(BattleInput *battleInput) +static void BattleInput_CreateTypeIcons(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - SpriteTemplate v3; + SpriteTemplate typeIconTemplate; UnkStruct_ov16_02260C00 *v4; - int v5; + int type; int v6; MoveDisplayObject *moveDisplayObj; v4 = &battleInput->unk_1A.val2; - v1 = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); moveDisplayObj = ov16_0226ABD4(battleInput, battleInput->unk_66A); - v3 = Unk_ov16_0227047C; + typeIconTemplate = sTypeIconSpriteTemplate; for (i = 0; i < LEARNED_MOVES_MAX; i++) { - GF_ASSERT(battleInput->unk_5EC[i] == NULL); + GF_ASSERT(battleInput->actorTypeIcons[i] == NULL); if (v4->unk_00[i] != 0) { - v5 = MoveTable_LoadParam(v4->unk_00[i], MOVEATTRIBUTE_TYPE); - v3.resources[0] = 20025 + i; - v3.x = Unk_ov16_022702B4[i][0]; - v3.y = Unk_ov16_022702B4[i][1]; + type = MoveTable_LoadParam(v4->unk_00[i], MOVEATTRIBUTE_TYPE); + typeIconTemplate.resources[0] = 20025 + i; + typeIconTemplate.x = sTypeIconPositions[i][0]; + typeIconTemplate.y = sTypeIconPositions[i][1]; - battleInput->unk_5EC[i] = sub_0207CA58(v1, v2, v5, &v3); + battleInput->actorTypeIcons[i] = sub_0207CA58(v1, v2, type, &typeIconTemplate); - sub_0200D500(battleInput->unk_5EC[i], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); + sub_0200D500(battleInput->actorTypeIcons[i], typeIconTemplate.x, typeIconTemplate.y, ((192 + 80) << FX32_SHIFT)); - { - void *v8; - NNSG2dImageProxy *v9; + void *v8; + NNSG2dImageProxy *v9; - v8 = G2S_GetOBJCharPtr(); - v9 = SpriteActor_ImageProxy(battleInput->unk_5EC[i]->unk_00); + v8 = G2S_GetOBJCharPtr(); + v9 = SpriteActor_ImageProxy(battleInput->actorTypeIcons[i]->unk_00); - MI_CpuCopy16(moveDisplayObj->typeIcon[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); - } + MI_CpuCopy16(moveDisplayObj->typeIcon[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); } } } -static void ov16_0226AFF4(BattleInput *battleInput) +static void BattleInput_DestroyTypeIcons(BattleInput *battleInput) { int i; SpriteRenderer *v1; SpriteGfxHandler *v2; - v1 = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); for (i = 0; i < 4; i++) { - if (battleInput->unk_5EC[i] != NULL) { - sub_0207CA88(battleInput->unk_5EC[i]); - battleInput->unk_5EC[i] = NULL; + if (battleInput->actorTypeIcons[i] != NULL) { + sub_0207CA88(battleInput->actorTypeIcons[i]); + battleInput->actorTypeIcons[i] = NULL; } } } @@ -2894,8 +2881,8 @@ static void ov16_0226B028(BattleInput *battleInput) SpriteRenderer *v1; SpriteGfxHandler *v2; - v1 = ov16_0223E010(battleInput->battleSystem); - v2 = ov16_0223E018(battleInput->battleSystem); + v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); for (i = 0; i < 4; i++) { if (battleInput->unk_5FC[i] != NULL) { @@ -2958,7 +2945,7 @@ static void ov16_0226B198(void) static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2) { if (param1 == 1) { - ov16_0226B1E8(battleInput); + BattleInput_DestroyMenuObjects(battleInput); } if (param2 == 1) { @@ -2966,11 +2953,11 @@ static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2) } } -static void ov16_0226B1E8(BattleInput *battleInput) +static void BattleInput_DestroyMenuObjects(BattleInput *battleInput) { - ov16_0226AFF4(battleInput); + BattleInput_DestroyTypeIcons(battleInput); ov16_0226B028(battleInput); - ov16_0226AAC0(battleInput); + BattleInput_DestroyTextObjects(battleInput); ov16_0226A718(battleInput); ov16_0226A768(battleInput); } @@ -3077,9 +3064,9 @@ static void ov16_0226B318(BattleInput *battleInput, int param1) battleInput->unk_6A0.unk_09 = param1; } -static void inline_ov16_0226B318_1(SysTask *param0, void *param1) +static void inline_ov16_0226B318_1(SysTask *param0, void *data) { - BattleInput *battleInput = param1; + BattleInput *battleInput = data; UnkStruct_ov16_02268A14_sub4 *v1; BgConfig *v2; PaletteData *v3; @@ -3119,9 +3106,9 @@ static void inline_ov16_0226B318_1(SysTask *param0, void *param1) } } -static void inline_ov16_0226B314_1(SysTask *param0, void *param1) +static void inline_ov16_0226B314_1(SysTask *param0, void *data) { - BattleInput *battleInput = param1; + BattleInput *battleInput = data; UnkStruct_ov16_02268A14_sub4 *v1; BgConfig *v2; PaletteData *v3; @@ -3313,7 +3300,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + -2); if (v9 != 0) { - sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, -2); + sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, -2); if (battleInput->unk_5FC[v7] != NULL) { sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, -2); @@ -3347,7 +3334,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + 1); if (v9 != 0) { - sub_0200D5AC(battleInput->unk_5EC[v7]->unk_00, 0, 1); + sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, 1); if (battleInput->unk_5FC[v7] != NULL) { sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, 1); @@ -3631,10 +3618,10 @@ static void ov16_0226BB94(void *param0) static void ov16_0226BC50(SysTask *task, void *param1) { BattleInput *battleInput = param1; - const UnkStruct_ov16_02270670 *v1; + const BattleMenuTemplate *v1; int i; - v1 = &Unk_ov16_02270670[battleInput->unk_66B]; + v1 = &sBattleMenuTemplates[battleInput->curMenuId]; for (i = 0; i < 4; i++) { if (v1->unk_04_val2[i] == 0xffff) { @@ -3752,94 +3739,94 @@ static void ov16_0226BD74(SysTask *task, void *param1) static int ov16_0226BE48(BattleInput *battleInput) { - BattleCursorMove *v0; - const UnkStruct_ov16_02270670 *v1; + BattleCursorMove *cursorMove; + const BattleMenuTemplate *v1; - v0 = &battleInput->unk_6BC; - v1 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + v1 = &sBattleMenuTemplates[battleInput->curMenuId]; - if (v1->unk_20 == NULL) { + if (v1->funcCursorMove == NULL) { return 0xffffffff; } - if (v0->unk_00 == 0) { + if (cursorMove->unk_00 == 0) { if ((battleInput->unk_6C0 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { if (battleInput->unk_6C0 == 0) { Sound_PlayEffect(1500); } - v0->unk_00 = 1; + cursorMove->unk_00 = 1; battleInput->unk_6C0 = 0; - v1->unk_20(battleInput, 1); + v1->funcCursorMove(battleInput, 1); } return 0xffffffff; } - return v1->unk_20(battleInput, 0); + return v1->funcCursorMove(battleInput, 0); } static int ov16_0226BEC0(BattleInput *battleInput, int param1) { - BattleCursorMove *v0; - u32 v1; - const UnkStruct_ov16_02270670 *v2; + BattleCursorMove *cursorMove; + u32 key; + const BattleMenuTemplate *v2; int i, v4, v5; BattleCursorPosition *v6; - v0 = &battleInput->unk_6BC; - v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + v2 = &sBattleMenuTemplates[battleInput->curMenuId]; v5 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); v6 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v5)); if (param1 == 1) { - v0->unk_02 = v6->commandX; - v0->unk_01 = v6->commandY; - v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; + cursorMove->x = v6->commandX; + cursorMove->y = v6->commandY; + v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - switch (battleInput->unk_66B) { + switch (battleInput->curMenuId) { case 6: case 5: - v1 = ov16_0226CB10(v0, 1, 1, Unk_ov16_022701EC[0]); + key = CursorMove_CheckKeyPress(cursorMove, 1, 1, Unk_ov16_022701EC[0]); break; default: - v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; + v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; if ((v4 == 3) && (gCoreSys.pressedKeys & PAD_KEY_UP)) { (void)0; } else { - v1 = ov16_0226CB10(v0, 3, 2, Unk_ov16_022701EC[0]); + key = CursorMove_CheckKeyPress(cursorMove, 3, 2, Unk_ov16_022701EC[0]); - if ((v1 == 0) && (v4 == 0)) { + if ((key == 0) && (v4 == 0)) { if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { - v0->unk_02 = 0; - v0->unk_01 = 1; + cursorMove->x = 0; + cursorMove->y = 1; Sound_PlayEffect(1500); - v1 = PAD_KEY_LEFT; + key = PAD_KEY_LEFT; } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { - v0->unk_02 = 2; - v0->unk_01 = 1; + cursorMove->x = 2; + cursorMove->y = 1; Sound_PlayEffect(1500); - v1 = PAD_KEY_RIGHT; + key = PAD_KEY_RIGHT; } } } break; } - switch (v1) { + switch (key) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; + v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - return Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; + return Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: if (battleInput->unk_66F == 1) { for (i = 0; i < v2->unk_14[i].rect.top != 0xff; i++) { @@ -3879,34 +3866,34 @@ static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int static int ov16_0226C100(BattleInput *battleInput, int param1) { - BattleCursorMove *v0; - u32 v1; - const UnkStruct_ov16_02270670 *v2; + BattleCursorMove *cursorMove; + u32 key; + const BattleMenuTemplate *v2; int v3, v4; - v0 = &battleInput->unk_6BC; - v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + v2 = &sBattleMenuTemplates[battleInput->curMenuId]; if (param1 == 1) { - v0->unk_02 = 0; - v0->unk_01 = 0; - v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; + cursorMove->x = 0; + cursorMove->y = 0; + v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - v1 = ov16_0226CB10(v0, 1, 2, Unk_ov16_022701CC[0]); + key = CursorMove_CheckKeyPress(cursorMove, 1, 2, Unk_ov16_022701CC[0]); - switch (v1) { + switch (key) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; + v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - return Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; + return Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: break; } @@ -3916,30 +3903,30 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) static int ov16_0226C1F8(BattleInput *battleInput, int param1) { - BattleCursorMove *v0; + BattleCursorMove *cursorMove; u32 v1; - const UnkStruct_ov16_02270670 *v2; + const BattleMenuTemplate *v2; int v3, i; u8 v5[3][2]; UnkStruct_ov16_02260C00 *v6; BattleCursorPosition *cursorPos; cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); - v0 = &battleInput->unk_6BC; - v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + v2 = &sBattleMenuTemplates[battleInput->curMenuId]; v6 = &battleInput->unk_1A.val2; if (param1 == 1) { - v0->unk_02 = cursorPos->moveX; - v0->unk_01 = cursorPos->moveY; - v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; + cursorMove->x = cursorPos->moveX; + cursorMove->y = cursorPos->moveY; + v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; if ((v3 != 0) && (v6->unk_00[v3 - 1] == 0)) { cursorPos->moveX = 0; cursorPos->moveY = 0; - v0->unk_02 = 0; - v0->unk_01 = 0; - v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; + cursorMove->x = 0; + cursorMove->y = 0; + v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; } ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); @@ -3947,18 +3934,18 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) } MI_CpuCopy8(Unk_ov16_022701E4, v5, 3 * 2); - v1 = ov16_0226CB10(v0, 2, 3, v5[0]); + v1 = CursorMove_CheckKeyPress(cursorMove, 2, 3, v5[0]); switch (v1) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; + v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - return Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; + return Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: for (i = 0; i < v2->unk_14[i].rect.top != 0xff; i++) { if (0xff == v2->unk_18[i]) { @@ -3997,9 +3984,9 @@ static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int pa static int ov16_0226C3C8(BattleInput *battleInput, int param1) { - BattleCursorMove *v0; + BattleCursorMove *cursorMove; u32 v1; - const UnkStruct_ov16_02270670 *v2; + const BattleMenuTemplate *menu; int v3, v4; int v5 = 0; u8 v6[4], v7[4]; @@ -4013,8 +4000,8 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) BattleCursorPosition *v30; v30 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); - v0 = &battleInput->unk_6BC; - v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; MI_CpuCopy8(Unk_ov16_022701DC, v8, 3 * 2); @@ -4051,20 +4038,20 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) v12 = 2; if ((v7[5 - 2] == 1) && (v7[3 - 2] == 1)) { - v21 = v2->unk_14[3].rect.left + 8; - v22 = v2->unk_14[1].rect.right - 8; - v19 = v2->unk_14[3].rect.top + 8; - v20 = v2->unk_14[3].rect.bottom - 8; + v21 = menu->unk_14[3].rect.left + 8; + v22 = menu->unk_14[1].rect.right - 8; + v19 = menu->unk_14[3].rect.top + 8; + v20 = menu->unk_14[3].rect.bottom - 8; } else if ((v7[5 - 2] == 1) && (v7[3 - 2] == 0)) { - v21 = v2->unk_14[3].rect.left + 8; - v22 = v2->unk_14[3].rect.right - 8; - v19 = v2->unk_14[3].rect.top + 8; - v20 = v2->unk_14[3].rect.bottom - 8; + v21 = menu->unk_14[3].rect.left + 8; + v22 = menu->unk_14[3].rect.right - 8; + v19 = menu->unk_14[3].rect.top + 8; + v20 = menu->unk_14[3].rect.bottom - 8; } else if ((v7[5 - 2] == 0) && (v7[3 - 2] == 1)) { - v21 = v2->unk_14[1].rect.left + 8; - v22 = v2->unk_14[1].rect.right - 8; - v19 = v2->unk_14[1].rect.top + 8; - v20 = v2->unk_14[1].rect.bottom - 8; + v21 = menu->unk_14[1].rect.left + 8; + v22 = menu->unk_14[1].rect.right - 8; + v19 = menu->unk_14[1].rect.top + 8; + v20 = menu->unk_14[1].rect.bottom - 8; } else { v21 = -1; v22 = -1; @@ -4073,20 +4060,20 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } if ((v7[2 - 2] == 1) && (v7[4 - 2] == 1)) { - v25 = v2->unk_14[0].rect.left + 8; - v26 = v2->unk_14[2].rect.right - 8; - v23 = v2->unk_14[0].rect.top + 8; - v24 = v2->unk_14[0].rect.bottom - 8; + v25 = menu->unk_14[0].rect.left + 8; + v26 = menu->unk_14[2].rect.right - 8; + v23 = menu->unk_14[0].rect.top + 8; + v24 = menu->unk_14[0].rect.bottom - 8; } else if ((v7[2 - 2] == 1) && (v7[4 - 2] == 0)) { - v25 = v2->unk_14[0].rect.left + 8; - v26 = v2->unk_14[0].rect.right - 8; - v23 = v2->unk_14[0].rect.top + 8; - v24 = v2->unk_14[0].rect.bottom - 8; + v25 = menu->unk_14[0].rect.left + 8; + v26 = menu->unk_14[0].rect.right - 8; + v23 = menu->unk_14[0].rect.top + 8; + v24 = menu->unk_14[0].rect.bottom - 8; } else if ((v7[2 - 2] == 0) && (v7[4 - 2] == 1)) { - v25 = v2->unk_14[2].rect.left + 8; - v26 = v2->unk_14[2].rect.right - 8; - v23 = v2->unk_14[2].rect.top + 8; - v24 = v2->unk_14[2].rect.bottom - 8; + v25 = menu->unk_14[2].rect.left + 8; + v26 = menu->unk_14[2].rect.right - 8; + v23 = menu->unk_14[2].rect.top + 8; + v24 = menu->unk_14[2].rect.bottom - 8; } else { v25 = -1; v26 = -1; @@ -4153,27 +4140,27 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) if (param1 == 1) { if (v5 == 0) { if (v30->unk_06 == battleInput->unk_66C) { - v0->unk_02 = v30->unk_04; - v0->unk_01 = v30->unk_05; + cursorMove->x = v30->unk_04; + cursorMove->y = v30->unk_05; } else if (v6[5 - 2] == 1) { - v0->unk_02 = 0; - v0->unk_01 = 0; + cursorMove->x = 0; + cursorMove->y = 0; } else if (v6[3 - 2] == 1) { - v0->unk_02 = 1; - v0->unk_01 = 0; + cursorMove->x = 1; + cursorMove->y = 0; } else if (v6[2 - 2] == 1) { - v0->unk_02 = 0; - v0->unk_01 = 1; + cursorMove->x = 0; + cursorMove->y = 1; } else { - v0->unk_02 = 1; - v0->unk_01 = 1; + cursorMove->x = 1; + cursorMove->y = 1; } - v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + v4 = Unk_ov16_022701DC[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->unk_14[v4].rect.left + 8, menu->unk_14[v4].rect.right - 8, menu->unk_14[v4].rect.top + 8, menu->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { - v0->unk_02 = 0; - v0->unk_01 = 0; + cursorMove->x = 0; + cursorMove->y = 0; if (((v28 == -1) && (v27 == -1)) || (v17 == -1)) { ov16_0226DD9C(battleInput->cursor, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); @@ -4192,9 +4179,9 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } if (v5 == 0) { - v1 = ov16_0226CB10(v0, v11, v12, v8[0]); + v1 = CursorMove_CheckKeyPress(cursorMove, v11, v12, v8[0]); } else { - v1 = ov16_0226CB10(v0, v11, v12, NULL); + v1 = CursorMove_CheckKeyPress(cursorMove, v11, v12, NULL); } switch (v1) { @@ -4203,10 +4190,10 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: if (v5 == 0) { - v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + v4 = Unk_ov16_022701DC[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->unk_14[v4].rect.left + 8, menu->unk_14[v4].rect.right - 8, menu->unk_14[v4].rect.top + 8, menu->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { - if (v0->unk_01 == 0) { + if (cursorMove->y == 0) { if (((v27 == -1) && (v28 == -1)) || (v17 == -1)) { ov16_0226DD9C(battleInput->cursor, v13, v14, v15, v16, ((192 + 80) << FX32_SHIFT)); } else if ((v28 != -1) && (v27 == -1)) { @@ -4221,14 +4208,14 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) ov16_0226DE04(battleInput->cursor); } } else { - ov16_0226DD9C(battleInput->cursor, v2->unk_14[4].rect.left + 8, v2->unk_14[4].rect.right - 8, v2->unk_14[4].rect.top + 8, v2->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->unk_14[4].rect.left + 8, menu->unk_14[4].rect.right - 8, menu->unk_14[4].rect.top + 8, menu->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); ov16_0226DE04(battleInput->cursor); } } break; case PAD_BUTTON_A: if (v5 == 1) { - if (v0->unk_01 > 0) { + if (cursorMove->y > 0) { return 4; } else { for (v3 = 0; v3 < 4; v3++) { @@ -4238,7 +4225,7 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } } } else { - v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; + v4 = Unk_ov16_022701DC[cursorMove->y][cursorMove->x]; if ((v4 == 4) || (v6[v4 - 0] == 1)) { return v4; @@ -4254,7 +4241,7 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) static void ov16_0226C9B8(BattleInput *battleInput, int param1) { - BattleCursorPosition *v0; + BattleCursorPosition *cursorPos; int v1, j, i; if (param1 == 4) { @@ -4262,15 +4249,15 @@ static void ov16_0226C9B8(BattleInput *battleInput, int param1) } v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - v0 = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); - v0->unk_06 = battleInput->unk_66C; + cursorPos->unk_06 = battleInput->unk_66C; for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { if (param1 == Unk_ov16_022701DC[i][j]) { - v0->unk_04 = j; - v0->unk_05 = i; + cursorPos->unk_04 = j; + cursorPos->unk_05 = i; return; } @@ -4282,30 +4269,30 @@ static int ov16_0226CA14(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; u32 v1; - const UnkStruct_ov16_02270670 *v2; + const BattleMenuTemplate *menu; int v3, v4; - cursorMove = &battleInput->unk_6BC; - v2 = &Unk_ov16_02270670[battleInput->unk_66B]; + cursorMove = &battleInput->cursorMove; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; if (param1 == 1) { - v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->unk_14[v3].rect.left + 8, menu->unk_14[v3].rect.right - 8, menu->unk_14[v3].rect.top + 8, menu->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - v1 = ov16_0226CB10(cursorMove, 1, 2, Unk_ov16_022701C8[0]); + v1 = CursorMove_CheckKeyPress(cursorMove, 1, 2, Unk_ov16_022701C8[0]); switch (v1) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->unk_14[v3].rect.left + 8, menu->unk_14[v3].rect.right - 8, menu->unk_14[v3].rect.top + 8, menu->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - v3 = Unk_ov16_022701C8[cursorMove->unk_01][cursorMove->unk_02]; + v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; return v3; case PAD_BUTTON_B: return 1; @@ -4314,35 +4301,35 @@ static int ov16_0226CA14(BattleInput *battleInput, int param1) return 0xffffffff; } -static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, const u8 *param3) +static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, int param2, const u8 *param3) { int v0, v1; u32 v2; - if (cursorMove->unk_02 >= param1) { - cursorMove->unk_02 = param1 - 1; + if (cursorMove->x >= param1) { + cursorMove->x = param1 - 1; } - if (cursorMove->unk_01 >= param2) { - cursorMove->unk_01 = param2 - 1; + if (cursorMove->y >= param2) { + cursorMove->y = param2 - 1; } - v1 = cursorMove->unk_02; - v0 = cursorMove->unk_01; + v1 = cursorMove->x; + v0 = cursorMove->y; if (gCoreSys.pressedKeys & PAD_KEY_UP) { - cursorMove->unk_01--; + cursorMove->y--; - if (cursorMove->unk_01 < 0) { - cursorMove->unk_01 = 0; + if (cursorMove->y < 0) { + cursorMove->y = 0; } if (param3 != NULL) { - while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { - cursorMove->unk_01--; + while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + cursorMove->y--; - if (cursorMove->unk_01 < 0) { - cursorMove->unk_01 = v0; + if (cursorMove->y < 0) { + cursorMove->y = v0; break; } } @@ -4350,18 +4337,18 @@ static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, c v2 = PAD_KEY_UP; } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { - cursorMove->unk_01++; + cursorMove->y++; - if (cursorMove->unk_01 >= param2) { - cursorMove->unk_01 = param2 - 1; + if (cursorMove->y >= param2) { + cursorMove->y = param2 - 1; } if (param3 != NULL) { - while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { - cursorMove->unk_01++; + while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + cursorMove->y++; - if (cursorMove->unk_01 >= param2) { - cursorMove->unk_01 = v0; + if (cursorMove->y >= param2) { + cursorMove->y = v0; break; } } @@ -4369,18 +4356,18 @@ static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, c v2 = PAD_KEY_DOWN; } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { - cursorMove->unk_02--; + cursorMove->x--; - if (cursorMove->unk_02 < 0) { - cursorMove->unk_02 = 0; + if (cursorMove->x < 0) { + cursorMove->x = 0; } if (param3 != NULL) { - while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { - cursorMove->unk_02--; + while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + cursorMove->x--; - if (cursorMove->unk_02 < 0) { - cursorMove->unk_02 = v1; + if (cursorMove->x < 0) { + cursorMove->x = v1; break; } } @@ -4388,18 +4375,18 @@ static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, c v2 = PAD_KEY_LEFT; } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { - cursorMove->unk_02++; + cursorMove->x++; - if (cursorMove->unk_02 >= param1) { - cursorMove->unk_02 = param1 - 1; + if (cursorMove->x >= param1) { + cursorMove->x = param1 - 1; } if (param3 != NULL) { - while (param3[param1 * cursorMove->unk_01 + cursorMove->unk_02] == 0xff) { - cursorMove->unk_02++; + while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + cursorMove->x++; - if (cursorMove->unk_02 >= param1) { - cursorMove->unk_02 = v1; + if (cursorMove->x >= param1) { + cursorMove->x = v1; break; } } @@ -4418,79 +4405,72 @@ static u32 ov16_0226CB10(BattleCursorMove *cursorMove, int param1, int param2, c int v3, v4; v3 = param3[param1 * v0 + v1]; - v4 = param3[param1 * cursorMove->unk_01 + cursorMove->unk_02]; + v4 = param3[param1 * cursorMove->y + cursorMove->x]; if (v3 == v4) { - cursorMove->unk_02 = v1; - cursorMove->unk_01 = v0; + cursorMove->x = v1; + cursorMove->y = v0; } } - if ((cursorMove->unk_02 != v1) || (cursorMove->unk_01 != v0)) { + if ((cursorMove->x != v1) || (cursorMove->y != v0)) { Sound_PlayEffect(1500); - } else { - if (v2 & PAD_KEY) { - return 0; - } + } else if (v2 & PAD_KEY) { + return 0; } return v2; } -int ov16_0226CD08(BattleInput *battleInput) +int BattleInput_GetCursorPressed(BattleInput *battleInput) { return battleInput->unk_6C0; } -void ov16_0226CD10(BattleInput *battleInput, int param1) +void BattleInput_SetCursorPressed(BattleInput *battleInput, int param1) { battleInput->unk_6C0 = param1; } -static int (*const Unk_ov16_0227020C[])(BattleInput *) = { +static int (*const sCatchingTutorialStateFuncs[])(BattleInput *) = { BattleInput_CatchingTutorialFight, BattleInput_CatchingTutorialMove }; static int BattleInput_CatchingTutorialMain(BattleInput *battleInput) { - SpriteRenderer *v0; - SpriteGfxHandler *v1; - PaletteData *v2; - int v3; - - v0 = ov16_0223E010(battleInput->battleSystem); - v1 = ov16_0223E018(battleInput->battleSystem); - v2 = BattleSystem_GetPaletteData(battleInput->battleSystem); - v3 = 0xffffffff; + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + SpriteGfxHandler *v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + PaletteData *v2 = BattleSystem_GetPaletteData(battleInput->battleSystem); + int ret = 0xffffffff; if (ov16_0223F228(battleInput->battleSystem) == 0) { - GF_ASSERT(battleInput->catchingTutorial.unk_04 < NELEMS(Unk_ov16_0227020C)); - v3 = Unk_ov16_0227020C[battleInput->catchingTutorial.unk_04](battleInput); + GF_ASSERT(battleInput->catchingTutorial.state < NELEMS(sCatchingTutorialStateFuncs)); + ret = sCatchingTutorialStateFuncs[battleInput->catchingTutorial.state](battleInput); } else { - v3 = BattleInput_CatchingTutorialBag(battleInput); + ret = BattleInput_CatchingTutorialBag(battleInput); } - if (v3 != 0xffffffff) { - battleInput->catchingTutorial.state = 0; - battleInput->catchingTutorial.unk_06 = 0; - battleInput->catchingTutorial.unk_04++; + if (ret != 0xffffffff) { + battleInput->catchingTutorial.subState = 0; + battleInput->catchingTutorial.delay = 0; + battleInput->catchingTutorial.state++; } - return v3; + return ret; } static int BattleInput_CatchingTutorialFight(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.state) { + switch (battleInput->catchingTutorial.subState) { case 0: ov16_0226DF80(battleInput->catchingTutorial.finger, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; return 0; } @@ -4502,15 +4482,15 @@ static int BattleInput_CatchingTutorialFight(BattleInput *battleInput) static int BattleInput_CatchingTutorialMove(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.state) { + switch (battleInput->catchingTutorial.subState) { case 0: ov16_0226DF80(battleInput->catchingTutorial.finger, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; return 1; } break; @@ -4521,23 +4501,23 @@ static int BattleInput_CatchingTutorialMove(BattleInput *battleInput) static int BattleInput_CatchingTutorialBag(BattleInput *battleInput) { - switch (battleInput->catchingTutorial.state) { + switch (battleInput->catchingTutorial.subState) { case 0: - battleInput->catchingTutorial.unk_06++; + battleInput->catchingTutorial.delay++; - if (battleInput->catchingTutorial.unk_06 > 60) { - battleInput->catchingTutorial.unk_06 = 0; - battleInput->catchingTutorial.state++; + if (battleInput->catchingTutorial.delay > 60) { + battleInput->catchingTutorial.delay = 0; + battleInput->catchingTutorial.subState++; } break; case 1: ov16_0226DF80(battleInput->catchingTutorial.finger, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; break; default: if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { - battleInput->catchingTutorial.state++; + battleInput->catchingTutorial.subState++; return 1; } break; @@ -4551,7 +4531,7 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - GF_ASSERT(battleInput->unk_66B == 18); + GF_ASSERT(battleInput->curMenuId == 18); LoadStandardWindowGraphics(bgConfig, 5, 0x20, 1, 0, HEAP_ID_BATTLE); PaletteData_LoadBufferFromHardware(palette, 1, 1 * 16, 0x20); @@ -4576,7 +4556,7 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) Bg_ScheduleTilemapTransfer(bgConfig, 5); Strbuf *src; - MessageLoader *msgLoader = BattleSystem_MessageLoader(battleInput->battleSystem); + MessageLoader *msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); int i; const u16 v11[][2] = { // Playback paused diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 2045b003cd..0de6a0f5b9 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -190,7 +190,7 @@ void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int pa v0.mode = 4; v0.target = param1->battler; v0.ballID = param2; - v0.cellActorSys = ov16_0223E010(param0); + v0.cellActorSys = BattleSystem_GetSpriteRenderer(param0); v0.paletteSys = BattleSystem_GetPaletteData(param0); v0.surface = 0; v0.bgPrio = 1; @@ -853,8 +853,8 @@ static void ov16_0225C8E0(BattleSystem *param0, BattlerData *param1) SpriteGfxHandler *v1; PaletteData *v2; - v0 = ov16_0223E010(param0); - v1 = ov16_0223E018(param0); + v0 = BattleSystem_GetSpriteRenderer(param0); + v1 = BattleSystem_GetSpriteGfxHandler(param0); v2 = BattleSystem_GetPaletteData(param0); PartyGauge_LoadGraphics(v0, v1, v2); @@ -866,7 +866,7 @@ static void ov16_0225C91C(BattleSystem *param0, BattlerData *param1) { SpriteGfxHandler *v0; - v0 = ov16_0223E018(param0); + v0 = BattleSystem_GetSpriteGfxHandler(param0); PartyGauge_FreeGraphics(v0); ClearCommand(param0, param1->battler, 53); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index ac5358036a..174f995d72 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -9927,7 +9927,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) int item; int itemEffect; - msgLoader = BattleSystem_MessageLoader(data->battleSys); + msgLoader = BattleSystem_GetMessageLoader(data->battleSys); battleType = BattleSystem_GetBattleType(data->battleSys); battler = data->battleCtx->faintedMon >> 1 & 1; // init to the side with the fainted mon expBattler = 0; @@ -10557,7 +10557,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) UnkStruct_02007768 *v5; MessageLoader *v6; - v6 = BattleSystem_MessageLoader(v2->battleSys); + v6 = BattleSystem_GetMessageLoader(v2->battleSys); v4 = BattleSystem_GetPaletteData(v2->battleSys); v5 = ov16_0223E000(v2->battleSys); v1 = 1; @@ -10576,7 +10576,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) v7.heapID = 5; v7.target = v1 + 20000; v7.ballID = v2->ball; - v7.cellActorSys = ov16_0223E010(v2->battleSys); + v7.cellActorSys = BattleSystem_GetSpriteRenderer(v2->battleSys); v7.paletteSys = BattleSystem_GetPaletteData(v2->battleSys); v7.bgPrio = 1; v7.surface = 0; @@ -12213,12 +12213,12 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript UnkStruct_020127E8 v12; int v13; - v4 = BattleSystem_MessageLoader(param0); + v4 = BattleSystem_GetMessageLoader(param0); v7 = ov16_0223E0D4(param0); v5 = BattleSystem_StringTemplate(param0); v8 = BattleSystem_GetBgConfig(param0); - v1 = ov16_0223E010(param0); - v2 = ov16_0223E018(param0); + v1 = BattleSystem_GetSpriteRenderer(param0); + v2 = BattleSystem_GetSpriteGfxHandler(param0); v3 = BattleSystem_GetPaletteData(param0); sub_0200CBDC(v1, v2, 27, 256, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20021); @@ -12290,7 +12290,7 @@ static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScript { SpriteGfxHandler *v0; - v0 = ov16_0223E018(param0); + v0 = BattleSystem_GetSpriteGfxHandler(param0); sub_0200D0F4(param1->cellActorData[0]); sub_0200D0F4(param1->cellActorData[1]); diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 0dedd533fd..e00c0a89c6 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -702,8 +702,8 @@ void ov16_02267258(Healthbar *param0) const SpriteTemplate *v2; v2 = Healthbar_SpriteTemplate(param0->type); - v0 = ov16_0223E010(param0->battleSys); - v1 = ov16_0223E018(param0->battleSys); + v0 = BattleSystem_GetSpriteRenderer(param0->battleSys); + v1 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); SpriteGfxHandler_UnloadCharObjById(v1, v2->resources[0]); SpriteGfxHandler_UnloadCellObjById(v1, v2->resources[2]); @@ -722,8 +722,8 @@ static void ov16_0226728C(Healthbar *param0) return; } - v0 = ov16_0223E010(param0->battleSys); - v1 = ov16_0223E018(param0->battleSys); + v0 = BattleSystem_GetSpriteRenderer(param0->battleSys); + v1 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); SpriteGfxHandler_UnloadCharObjById(v1, v2->resources[0]); SpriteGfxHandler_UnloadCellObjById(v1, v2->resources[2]); @@ -739,8 +739,8 @@ void ov16_022672C4(Healthbar *param0) NARC *v4; v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v1 = ov16_0223E010(param0->battleSys); - v2 = ov16_0223E018(param0->battleSys); + v1 = BattleSystem_GetSpriteRenderer(param0->battleSys); + v2 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); v3 = BattleSystem_GetPaletteData(param0->battleSys); v0 = Healthbar_SpriteTemplate(param0->type); @@ -1085,7 +1085,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) StringTemplate *strFormatter; bgl = BattleSystem_GetBgConfig(healthbar->battleSys); - msgLoader = BattleSystem_MessageLoader(healthbar->battleSys); + msgLoader = BattleSystem_GetMessageLoader(healthbar->battleSys); strFormatter = BattleSystem_StringTemplate(healthbar->battleSys); nickname = Strbuf_Init(MON_NAME_LEN + 12, HEAP_ID_BATTLE); // TODO: not sure why there is a +12 here @@ -1302,7 +1302,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) Strbuf *v5; v0 = BattleSystem_GetBgConfig(param0->battleSys); - v4 = BattleSystem_MessageLoader(param0->battleSys); + v4 = BattleSystem_GetMessageLoader(param0->battleSys); if (param1 & (1 << 10)) { v5 = MessageLoader_GetNewStrbuf(v4, 950); @@ -1346,7 +1346,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) StringTemplate *v7; v0 = BattleSystem_GetBgConfig(param0->battleSys); - v4 = BattleSystem_MessageLoader(param0->battleSys); + v4 = BattleSystem_GetMessageLoader(param0->battleSys); v7 = BattleSystem_StringTemplate(param0->battleSys); v5 = Strbuf_Init(30, 5); @@ -1771,7 +1771,7 @@ static void ov16_02268380(SysTask *param0, void *param1) int v2; PaletteData *v3; - v1 = ov16_0223E018(v0->unk_00->battleSys); + v1 = BattleSystem_GetSpriteGfxHandler(v0->unk_00->battleSys); v3 = BattleSystem_GetPaletteData(v0->unk_00->battleSys); switch (v0->unk_08) { diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index a061acbb02..542da7662c 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -355,7 +355,7 @@ void ov16_0223B430(BattleSystem *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); ov16_02268A88(param0->battleInput); ov16_02268C04(v0, v1, param0->battleInput, 0, 1, NULL); - ov16_02268D40(v1, param0->battleInput); + BattleInput_CreateBallGagueObjects(v1, param0->battleInput); NARC_dtor(v0); NARC_dtor(v1); TextPrinter_SetScrollArrowBaseTile(1); @@ -595,7 +595,7 @@ static void ov16_0223B790(OverlayManager *param0) v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); ov16_02268C04(v8, v9, v0->battleInput, 0, 1, NULL); - ov16_02268D40(v9, v0->battleInput); + BattleInput_CreateBallGagueObjects(v9, v0->battleInput); NARC_dtor(v8); NARC_dtor(v9); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 2a69371ba1..704cebe32e 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -83,12 +83,12 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSystem); UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem); -SpriteRenderer *ov16_0223E010(BattleSystem *battleSystem); -SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSystem); +SpriteRenderer *BattleSystem_GetSpriteRenderer(BattleSystem *battleSystem); +SpriteGfxHandler *BattleSystem_GetSpriteGfxHandler(BattleSystem *battleSystem); UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1); UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSystem); UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSystem); -MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSystem); +MessageLoader *BattleSystem_GetMessageLoader(BattleSystem *battleSystem); MessageLoader *ov16_0223E060(BattleSystem *battleSystem); PaletteData *BattleSystem_GetPaletteData(BattleSystem *battleSystem); Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSystem); @@ -302,12 +302,12 @@ UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem) return battleSystem->unk_8C; } -SpriteRenderer *ov16_0223E010(BattleSystem *battleSystem) +SpriteRenderer *BattleSystem_GetSpriteRenderer(BattleSystem *battleSystem) { return battleSystem->unk_90; } -SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSystem) +SpriteGfxHandler *BattleSystem_GetSpriteGfxHandler(BattleSystem *battleSystem) { return battleSystem->unk_94; } @@ -342,7 +342,7 @@ UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSystem) return battleSystem->unk_1A8; } -MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSystem) +MessageLoader *BattleSystem_GetMessageLoader(BattleSystem *battleSystem) { return battleSystem->unk_0C; } diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 45033732a1..3ca3a2adfb 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -182,8 +182,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) NARC *v10; v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v0 = ov16_0223E010(param0->unk_04); - v1 = ov16_0223E018(param0->unk_04); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_04); + v1 = BattleSystem_GetSpriteGfxHandler(param0->unk_04); v9 = ov16_0223EC04(param0->unk_04); v2 = &Unk_ov16_022700CC[param0->unk_08]; @@ -217,8 +217,8 @@ void ov16_0226862C(UnkStruct_ov16_02268520 *param0) SpriteGfxHandler *v1; const SpriteTemplate *v2; - v0 = ov16_0223E010(param0->unk_04); - v1 = ov16_0223E018(param0->unk_04); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_04); + v1 = BattleSystem_GetSpriteGfxHandler(param0->unk_04); v2 = &Unk_ov16_022700CC[param0->unk_08]; param0->unk_00 = SpriteActor_LoadResources(v0, v1, v2); @@ -240,7 +240,7 @@ void ov16_02268674(UnkStruct_ov16_02268520 *param0) SpriteGfxHandler *v0; int v1, v2, v3; - v0 = ov16_0223E018(param0->unk_04); + v0 = BattleSystem_GetSpriteGfxHandler(param0->unk_04); if (param0->unk_08 == 0) { v1 = 20013; diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 1485066247..1c06c9b915 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -4186,8 +4186,8 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par v2->unk_00 = param1; v2->unk_04 = param2; - v2->unk_08.unk_00 = ov16_0223E010(param0); - v2->unk_08.unk_04 = ov16_0223E018(param0); + v2->unk_08.unk_00 = BattleSystem_GetSpriteRenderer(param0); + v2->unk_08.unk_04 = BattleSystem_GetSpriteGfxHandler(param0); v2->unk_08.unk_08 = BattleSystem_GetPaletteData(param0); { diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 927e6a82a9..7fd1c062b6 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -238,7 +238,7 @@ void ov13_02224500(UnkStruct_ov13_022213F0 *param0) static void ov13_0222453C(UnkStruct_ov13_022213F0 *param0) { UnkStruct_ov104_02241308 v0 = { 18, 6, 6, 6, 0, 0 }; - SpriteRenderer *v1 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v1 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); param0->unk_1FB0 = sub_0200C704(v1); @@ -253,7 +253,7 @@ static void ov13_02224588(UnkStruct_ov13_022213F0 *param0) NARC *v2; v2 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->unk_0C); - v0 = ov16_0223E010(param0->unk_00->unk_08); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); SpriteRenderer_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, v2, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 45063); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, param0->unk_1FB0, v2, PokeIcon32KCellsFileIndex(), 0, 45063); @@ -272,7 +272,7 @@ static void ov13_02224588(UnkStruct_ov13_022213F0 *param0) static void ov13_02224670(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_0C); @@ -289,7 +289,7 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) SpriteRenderer *v0; u32 v1; - v0 = ov16_0223E010(param0->unk_00->unk_08); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); MoveTypeIcon_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); sub_0207C9EC(v0, param0->unk_1FB0, 45065, 45065); @@ -308,7 +308,7 @@ static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) NARC *v2; v2 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_0C); - v0 = ov16_0223E010(param0->unk_00->unk_08); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); SpriteRenderer_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, v2, sub_02081934(), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45066); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, param0->unk_1FB0, v2, sub_02081938(), 0, 45066); @@ -319,7 +319,7 @@ static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) static void ov13_02224848(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); sub_0200CD7C(param0->unk_1E4, 3, v0, param0->unk_1FB0, 72, 27, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45067); sub_0200CE0C(v0, param0->unk_1FB0, 72, 25, 0, 45067); @@ -332,7 +332,7 @@ static CellActorData *ov13_022248D8(UnkStruct_ov13_022213F0 *param0, u32 param1) SpriteTemplate v0; SpriteRenderer *v1; - v1 = ov16_0223E010(param0->unk_00->unk_08); + v1 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); v0.x = 0; v0.y = 0; @@ -367,7 +367,7 @@ void ov13_02224970(UnkStruct_ov13_022213F0 *param0) SpriteRenderer *v0; u32 v1; - v0 = ov16_0223E010(param0->unk_00->unk_08); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); for (v1 = 0; v1 < 38; v1++) { sub_0200D0F4(param0->unk_1FB4[v1]); @@ -398,7 +398,7 @@ static void ov13_022249CC(UnkStruct_ov13_022213F0 *param0) static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2, u8 param3) { - SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); sub_0200D948(v0, param0->unk_1FB0, sub_0207C944(), sub_0207C908(param3), 1, param2); sub_0200D41C(param1, sub_0207C92C(param3) + 4); @@ -406,7 +406,7 @@ static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { - SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); sub_0200D948(v0, param0->unk_1FB0, sub_0207CAC0(), sub_0207CA90(param2), 1, 45077); sub_0200D41C(param1, sub_0207CAA8(param2) + 4); @@ -797,7 +797,7 @@ static void ov13_0222554C(UnkStruct_ov13_022213F0 *param0) SpriteRenderer *v0; BattleCursor *v1; - v0 = ov16_0223E010(param0->unk_00->unk_08); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_08); BattleCursor_LoadResources(v0, param0->unk_1FB0, param0->unk_1E4, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068); v1 = BattleCursor_New(v0, param0->unk_1FB0, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068, 0, 1); diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index aecdef8bfb..297989e49d 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -79,7 +79,7 @@ void ov13_02227BDC(UnkStruct_ov13_02227244 *param0) static void ov13_02227C08(UnkStruct_ov13_02227244 *param0) { UnkStruct_ov104_02241308 v0 = { 8, 8, 3, 3, 0, 0 }; - SpriteRenderer *v1 = ov16_0223E010(param0->unk_00->unk_00); + SpriteRenderer *v1 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); param0->unk_30C = sub_0200C704(v1); @@ -94,7 +94,7 @@ static void ov13_02227C54(UnkStruct_ov13_02227244 *param0) NARC *v2; v2 = NARC_ctor(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, param0->unk_00->unk_0C); - v0 = ov16_0223E010(param0->unk_00->unk_00); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); for (v1 = 0; v1 < 6; v1++) { SpriteRenderer_LoadCharResObjFromOpenNarc(v0, param0->unk_30C, v2, Item_FileID(1, 1), 0, NNS_G2D_VRAM_TYPE_2DSUB, 46263 + v1); @@ -108,7 +108,7 @@ static void ov13_02227C54(UnkStruct_ov13_02227244 *param0) static void ov13_02227D10(UnkStruct_ov13_02227244 *param0, u16 param1, u32 param2) { - SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_00); + SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); sub_0200D948(v0, param0->unk_30C, 16, Item_FileID(param1, 1), 0, param2); } @@ -122,7 +122,7 @@ static CellActorData *ov13_02227D78(UnkStruct_ov13_02227244 *param0, u32 param1) SpriteTemplate v0; SpriteRenderer *v1; - v1 = ov16_0223E010(param0->unk_00->unk_00); + v1 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); v0.x = 0; v0.y = 0; @@ -155,7 +155,7 @@ void ov13_02227E08(UnkStruct_ov13_02227244 *param0) SpriteRenderer *v0; u32 v1; - v0 = ov16_0223E010(param0->unk_00->unk_00); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); for (v1 = 0; v1 < 6; v1++) { sub_0200D0F4(param0->unk_310[v1]); @@ -238,7 +238,7 @@ static void ov13_02227F7C(UnkStruct_ov13_02227244 *param0) SpriteRenderer *v0; BattleCursor *v1; - v0 = ov16_0223E010(param0->unk_00->unk_00); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); BattleCursor_LoadResources(v0, param0->unk_30C, param0->unk_08, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265); v1 = BattleCursor_New(v0, param0->unk_30C, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265, 0, 1); @@ -311,7 +311,7 @@ static void ov13_02228070(UnkStruct_ov13_02227244 *param0) SpriteRenderer *v0; CatchingTutorialFinger *v1; - v0 = ov16_0223E010(param0->unk_00->unk_00); + v0 = BattleSystem_GetSpriteRenderer(param0->unk_00->unk_00); CatchingTutorialFinger_LoadResources(v0, param0->unk_30C, param0->unk_00->unk_0C, param0->unk_08, 46269, 46269, 46264, 46264); param0->unk_38 = CatchingTutorialFinger_Create(v0, param0->unk_30C, param0->unk_00->unk_0C, 46269, 46269, 46264, 46264, 0, 0); From 459f3a895d8a66746f16fd45750a82c74641549f Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:52:20 -0500 Subject: [PATCH 4/6] Deanonymize some variables --- include/battle/battle_input.h | 12 +- include/battle/ov16_0223DF00.h | 2 +- include/battle/ov16_0226DB7C.h | 2 +- include/battle/struct_ov16_02260C00.h | 2 +- include/battle/struct_ov16_02260F14.h | 2 +- include/constants/battle/battle_input.h | 9 + include/struct_defs/struct_020127E8.h | 2 +- include/unk_02012744.h | 6 +- src/battle/battle_display.c | 82 +- src/battle/battle_input.c | 1583 +++++++++++------------ src/battle/battle_io_command.c | 100 +- src/battle/battle_script.c | 2 +- src/battle/ov16_0223B140.c | 4 +- src/battle/ov16_0223DF00.c | 4 +- src/battle/ov16_0226DB7C.c | 4 +- src/battle/ov16_0226E148.c | 4 +- src/overlay010/ov10_0221F800.c | 6 +- src/overlay013/ov13_02224500.c | 2 +- src/overlay013/ov13_02227BDC.c | 2 +- src/overlay017/ov17_0223F118.c | 2 +- src/overlay017/ov17_0223F7E4.c | 8 +- src/overlay017/ov17_022413D8.c | 4 +- src/overlay017/ov17_022492DC.c | 4 +- src/overlay017/ov17_0224A0FC.c | 12 +- src/overlay021/ov21_021D1FA4.c | 6 +- src/overlay021/ov21_021D4C0C.c | 2 +- src/overlay021/ov21_021D76B0.c | 4 +- src/overlay021/ov21_021DC9BC.c | 8 +- src/overlay021/ov21_021E29DC.c | 6 +- src/overlay021/ov21_021E4CA4.c | 10 +- src/overlay022/ov22_02259C58.c | 2 +- src/overlay062/ov62_022300D8.c | 18 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay062/ov62_02234A10.c | 2 +- src/overlay062/ov62_02235278.c | 2 +- src/overlay062/ov62_02235E64.c | 2 +- src/overlay062/ov62_02236CBC.c | 2 +- src/overlay062/ov62_02237D24.c | 8 +- src/overlay062/ov62_02239D60.c | 4 +- src/overlay062/ov62_0223CAEC.c | 8 +- src/overlay062/ov62_0223DFA8.c | 10 +- src/overlay062/ov62_02241204.c | 18 +- src/overlay065/ov65_0222DCE0.c | 4 +- src/overlay076/ov76_0223B870.c | 6 +- src/overlay104/ov104_0223DC7C.c | 6 +- src/overlay113/ov113_0225C700.c | 4 +- src/overlay115/ov115_02260CEC.c | 8 +- src/overlay117/ov117_02263AF0.c | 2 +- src/unk_02012744.c | 14 +- src/unk_0208A3F4.c | 2 +- 50 files changed, 986 insertions(+), 1034 deletions(-) create mode 100644 include/constants/battle/battle_input.h diff --git a/include/battle/battle_input.h b/include/battle/battle_input.h index 7eae5ea921..c788118d68 100644 --- a/include/battle/battle_input.h +++ b/include/battle/battle_input.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_OV16_0226871C_H #define POKEPLATINUM_OV16_0226871C_H +#include "constants/battle/battle_input.h" + #include "struct_decls/battle_system.h" #include "battle/move_display_info.h" @@ -15,14 +17,14 @@ void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *param2, int void BattleInput_Free(BattleInput *input); void ov16_02268A88(BattleInput *input); void ov16_02268B8C(BattleInput *input); -void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *param2, int param3, int param4, void *param5); +void BattleInput_ChangeMenu(NARC *param0, NARC *param1, BattleInput *param2, int param3, int param4, void *param5); void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *param1); void ov16_0226914C(BattleInput *input, const u8 *param1); void ov16_02269168(BattleInput *input, u8 param1[], u8 param2[]); -void ov16_022691BC(BattleInput *input); -void ov16_02269218(BattleInput *input); +void BattleInput_EnableBallGauge(BattleInput *input); +void BattleInput_DisableBallGauge(BattleInput *input); int BattleInput_CheckTouch(BattleInput *input); -BOOL ov16_02269348(BattleInput *input); +BOOL BattleInput_CheckEffectEnded(BattleInput *input); int ov16_02269368(int param0, int param1); void ov16_0226940C(BattleInput *input); void ov16_0226947C(BattleInput *input, int param1, int param2); @@ -32,6 +34,6 @@ BOOL ov16_0226BCD0(BattleInput *input); int BattleInput_GetCursorPressed(BattleInput *input); void BattleInput_SetCursorPressed(BattleInput *input, int param1); void BattleInput_PrintRecordingStopMessage(BattleInput *input, int param1); -u8 ov16_0226D088(BattleInput *input); +u8 BattleInput_GetRunCommandType(BattleInput *input); #endif // POKEPLATINUM_OV16_0226871C_H diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index c12ee0afe9..0915d6b10a 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -152,7 +152,7 @@ PCBoxes *ov16_0223E228(BattleSystem *battleSys); * @return The battle's terrain. */ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem *battleSys); +int BattleSystem_GetBackgroundId(BattleSystem *battleSys); int BattleSystem_MapHeader(BattleSystem *battleSys); int BattleSystem_Partner(BattleSystem *battleSys, int param1); diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index 8358c6398d..bf0fdfe70a 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -17,7 +17,7 @@ void ov16_0226DD54(BattleCursor *param0, int param1, int param2, int param3, int void ov16_0226DD7C(BattleCursor *param0, int param1, int param2, int param3, int param4); void ov16_0226DD9C(BattleCursor *param0, int param1, int param2, int param3, int param4, fx32 param5); void ov16_0226DDC0(BattleCursor *param0, int param1, int param2, int param3, fx32 param4); -void ov16_0226DDE8(BattleCursor *param0); +void BattleCursor_Disable(BattleCursor *param0); void ov16_0226DE04(BattleCursor *param0); #endif // POKEPLATINUM_OV16_0226DB7C_H diff --git a/include/battle/struct_ov16_02260C00.h b/include/battle/struct_ov16_02260C00.h index 750936402a..49923d0df3 100644 --- a/include/battle/struct_ov16_02260C00.h +++ b/include/battle/struct_ov16_02260C00.h @@ -6,6 +6,6 @@ typedef struct { u8 unk_08[4]; u8 unk_0C[4]; u8 unk_10; -} UnkStruct_ov16_02260C00; +} BattleInputMoveMenu; #endif // POKEPLATINUM_STRUCT_OV16_02260C00_H diff --git a/include/battle/struct_ov16_02260F14.h b/include/battle/struct_ov16_02260F14.h index 05730e4376..07dec5f524 100644 --- a/include/battle/struct_ov16_02260F14.h +++ b/include/battle/struct_ov16_02260F14.h @@ -7,6 +7,6 @@ typedef struct { UnkStruct_ov16_0225C29C_sub1 unk_00[4]; u8 unk_20; u8 unk_21; -} UnkStruct_ov16_02260F14; +} BattleInputPokemonMenu; #endif // POKEPLATINUM_STRUCT_OV16_02260F14_H diff --git a/include/constants/battle/battle_input.h b/include/constants/battle/battle_input.h new file mode 100644 index 0000000000..adcaeb6435 --- /dev/null +++ b/include/constants/battle/battle_input.h @@ -0,0 +1,9 @@ +#ifndef POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H +#define POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H + +enum BattleInputRunCommandType { + BI_RUNCMD_RUN = 0, + BI_RUNCMD_CANCEL +}; + +#endif // POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h index 5f43cfdc13..2cf0e9aa99 100644 --- a/include/struct_defs/struct_020127E8.h +++ b/include/struct_defs/struct_020127E8.h @@ -21,6 +21,6 @@ typedef struct { int unk_24; int unk_28; int unk_2C; -} UnkStruct_020127E8; +} FontOAMInitData; #endif // POKEPLATINUM_STRUCT_020127E8_H diff --git a/include/unk_02012744.h b/include/unk_02012744.h index 4ee5d41e11..face5b7751 100644 --- a/include/unk_02012744.h +++ b/include/unk_02012744.h @@ -13,13 +13,13 @@ UnkStruct_02012744 *sub_02012744(int param0, int param1); void sub_020127BC(UnkStruct_02012744 *param0); -FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0); +FontOAM *sub_020127E8(const FontOAMInitData *param0); void sub_02012870(FontOAM *param0); int sub_02012898(const Window *param0, int param1, int param2); void sub_020128C4(FontOAM *param0, int param1, int param2); void sub_02012938(FontOAM *param0); void sub_020129A4(const FontOAM *param0, int *param1, int *param2); -void sub_020129D0(FontOAM *param0, BOOL param1); +void FontOAM_SetDrawFlag(FontOAM *param0, BOOL param1); void sub_02012A00(FontOAM *param0, u8 param1); void sub_02012A30(FontOAM *param0, u32 param1); void sub_02012A60(FontOAM *param0, u32 param1); @@ -29,7 +29,7 @@ void sub_02012AF0(FontOAM *param0, GXOamMode param1); UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1); void sub_02012B48(UnkStruct_02012B20 *param0); int sub_02012B58(const UnkStruct_02012B20 *param0, int param1); -FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1); +FontOAM *sub_02012B60(const FontOAMInitData *param0, const UnkStruct_02012B20 *param1); void sub_02012BD8(FontOAM *param0); void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Window *param2, int param3); void sub_02012C60(const Window *param0, int param1, int param2, int param3, int param4, char *param5); diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index c6fd025a08..9c427eb829 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -2957,7 +2957,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) ov16_02264798(v3, v0->unk_00); v0->unk_0A = 4; case 4: - if (ov16_02269348(battleInput) == 0) { + if (BattleInput_CheckEffectEnded(battleInput) == 0) { break; } @@ -2981,29 +2981,29 @@ static void ov16_022604C8(SysTask *param0, void *param1) ov16_0226BCCC(battleInput, 1); if (BattleSystem_BattleStatus(v0->unk_00) & 0x1) { - ov16_02268C04(v12, v13, battleInput, 6, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 6, 0, &v11); } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x200) { - ov16_02268C04(v12, v13, battleInput, 10, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 10, 0, &v11); } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x20) { - ov16_02268C04(v12, v13, battleInput, 8, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 8, 0, &v11); } else if ((v11.unk_00 == 4) && ((BattleSystem_GetBattleType(v0->unk_00) & 0x8) == 0)) { - ov16_02268C04(v12, v13, battleInput, 4, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 4, 0, &v11); } else { - ov16_02268C04(v12, v13, battleInput, 3, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 3, 0, &v11); } BattleSystem_SetCommandSelectionFlags(v0->unk_00, 1); } else { if (BattleSystem_BattleStatus(v0->unk_00) & 0x1) { - ov16_02268C04(v12, v13, battleInput, 5, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 5, 0, &v11); } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x200) { - ov16_02268C04(v12, v13, battleInput, 9, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 9, 0, &v11); } else if (BattleSystem_GetBattleType(v0->unk_00) & 0x20) { - ov16_02268C04(v12, v13, battleInput, 7, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 7, 0, &v11); } else if (v11.unk_00 != 4) { - ov16_02268C04(v12, v13, battleInput, 1, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 1, 0, &v11); } else { - ov16_02268C04(v12, v13, battleInput, 2, 0, &v11); + BattleInput_ChangeMenu(v12, v13, battleInput, 2, 0, &v11); } v3->unk_193 = 1; @@ -3011,7 +3011,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) ov16_0226914C(battleInput, v0->unk_1C); ov16_02269168(battleInput, v0->unk_10[0], v0->unk_10[1]); - ov16_022691BC(battleInput); + BattleInput_EnableBallGauge(battleInput); NARC_dtor(v12); NARC_dtor(v13); } @@ -3042,7 +3042,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) } break; case 6: - if ((ov16_02269348(battleInput) == 1) || (v0->unk_0C == 1)) { + if ((BattleInput_CheckEffectEnded(battleInput) == 1) || (v0->unk_0C == 1)) { switch (v0->unk_0C) { case 1: if (BattleSystem_GetBattleType(v0->unk_00) & (0x20 | 0x200)) { @@ -3053,7 +3053,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v16 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v17 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v16, v17, battleInput, 0, 0, NULL); + BattleInput_ChangeMenu(v16, v17, battleInput, 0, 0, NULL); ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); @@ -3065,7 +3065,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v18 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v19 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v18, v19, battleInput, 0, 0, NULL); + BattleInput_ChangeMenu(v18, v19, battleInput, 0, 0, NULL); ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); @@ -3077,12 +3077,12 @@ static void ov16_022604C8(SysTask *param0, void *param1) NARC *v20 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v21 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - if (ov16_0226D088(battleInput) == 1) { + if (BattleInput_GetRunCommandType(battleInput) == BI_RUNCMD_CANCEL) { ov16_0226846C(v6); v0->unk_0C = 0xff; } - ov16_02268C04(v20, v21, battleInput, 0, 0, NULL); + BattleInput_ChangeMenu(v20, v21, battleInput, 0, 0, NULL); NARC_dtor(v20); NARC_dtor(v21); } break; @@ -3091,21 +3091,21 @@ static void ov16_022604C8(SysTask *param0, void *param1) break; } - ov16_02269218(battleInput); + BattleInput_DisableBallGauge(battleInput); v0->unk_0A = 8; } break; case 7: - if (ov16_02269348(battleInput) == 1) { + if (BattleInput_CheckEffectEnded(battleInput) == 1) { NARC *v22 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v23 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v22, v23, battleInput, 0, 0, NULL); + BattleInput_ChangeMenu(v22, v23, battleInput, 0, 0, NULL); ov16_0226BCCC(battleInput, 0); ov16_0226846C(v6); ov16_022675AC(v0->unk_04); ov16_022647D8(v3); - ov16_02269218(battleInput); + BattleInput_DisableBallGauge(battleInput); v0->unk_0A = 8; @@ -3239,7 +3239,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) switch (v0->unk_20) { case 0: - if (ov16_02269348(battleInput) == 0) { + if (BattleInput_CheckEffectEnded(battleInput) == 0) { break; } @@ -3255,10 +3255,10 @@ static void ov16_02260C00(SysTask *param0, void *param1) BattleMessage_Print(v0->unk_00, v6, &v7, 0); } - ov16_02269218(battleInput); + BattleInput_DisableBallGauge(battleInput); { - UnkStruct_ov16_02260C00 v8; + BattleInputMoveMenu v8; int i; NARC *v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v11 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -3271,7 +3271,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) v8.unk_10 = v0->unk_1E; - ov16_02268C04(v10, v11, battleInput, 11, 0, &v8); + BattleInput_ChangeMenu(v10, v11, battleInput, 11, 0, &v8); NARC_dtor(v10); NARC_dtor(v11); } @@ -3422,12 +3422,12 @@ static void ov16_02260F14(SysTask *param0, void *param1) switch (v0->unk_0F) { case 0: - if (ov16_02269348(battleInput) == 0) { + if (BattleInput_CheckEffectEnded(battleInput) == 0) { break; } { - UnkStruct_ov16_02260F14 v6; + BattleInputPokemonMenu v6; int i; NARC *v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -3439,7 +3439,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) v6.unk_20 = v0->unk_0E; v6.unk_21 = ov16_02269368(v0->unk_30, v0->unk_0E); - ov16_02268C04(v8, v9, battleInput, 12, 0, &v6); + BattleInput_ChangeMenu(v8, v9, battleInput, 12, 0, &v6); NARC_dtor(v8); NARC_dtor(v9); } @@ -4436,7 +4436,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) switch (v0->unk_0E) { case 0: - if (ov16_02269348(battleInput) == 0) { + if (BattleInput_CheckEffectEnded(battleInput) == 0) { break; } @@ -4469,26 +4469,26 @@ static void ov16_022623F0(SysTask *param0, void *param1) NARC *v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); UnkStruct_ov16_022623F0 v11; - ov16_02269218(battleInput); + BattleInput_DisableBallGauge(battleInput); v11.unk_00 = v0->unk_18; switch (v0->unk_0F) { case 0: case 5: - ov16_02268C04(v9, v10, battleInput, 13, 0, &v11); + BattleInput_ChangeMenu(v9, v10, battleInput, 13, 0, &v11); break; case 1: - ov16_02268C04(v9, v10, battleInput, 14, 0, &v11); + BattleInput_ChangeMenu(v9, v10, battleInput, 14, 0, &v11); break; case 2: - ov16_02268C04(v9, v10, battleInput, 15, 0, &v11); + BattleInput_ChangeMenu(v9, v10, battleInput, 15, 0, &v11); break; case 3: - ov16_02268C04(v9, v10, battleInput, 16, 0, &v11); + BattleInput_ChangeMenu(v9, v10, battleInput, 16, 0, &v11); break; case 4: - ov16_02268C04(v9, v10, battleInput, 17, 0, &v11); + BattleInput_ChangeMenu(v9, v10, battleInput, 17, 0, &v11); break; default: GF_ASSERT(0); @@ -4511,7 +4511,7 @@ static void ov16_022623F0(SysTask *param0, void *param1) } break; case 3: - if (ov16_02269348(battleInput) == 1) { + if (BattleInput_CheckEffectEnded(battleInput) == 1) { { NARC *v12 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v13 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -4519,8 +4519,8 @@ static void ov16_022623F0(SysTask *param0, void *param1) ov16_022675AC(v0->unk_04); ov16_022647D8(v5); ov16_0226846C(v4); - ov16_02269218(battleInput); - ov16_02268C04(v12, v13, battleInput, 0, 0, NULL); + BattleInput_DisableBallGauge(battleInput); + BattleInput_ChangeMenu(v12, v13, battleInput, 0, 0, NULL); if (v0->unk_08 == 1) { ov16_0226BCCC(battleInput, 0); @@ -5112,7 +5112,7 @@ static void ov16_02263014(SysTask *param0, void *param1) v1 = BattleSystem_GetBgConfig(v0->unk_00); v2 = BattleSystem_GetPaletteData(v0->unk_00); v3 = BattleSystem_Terrain(v0->unk_00); - v4 = Unk_ov16_0226F1D0[ov16_0223E240(v0->unk_00)]; + v4 = Unk_ov16_0226F1D0[BattleSystem_GetBackgroundId(v0->unk_00)]; v0->unk_15++; @@ -6188,8 +6188,8 @@ static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_o v0.unk_70 = ov16_0223F1E8(param0); v0.unk_74 = ov16_0223F1F0(param0); v0.unk_54.unk_00 = 7; - v0.unk_54.unk_04 = 3 + ov16_0223E240(param0); - v0.unk_54.unk_08 = 172 + ov16_0223E240(param0) * 3 + ov16_0223EC04(param0); + v0.unk_54.unk_04 = 3 + BattleSystem_GetBackgroundId(param0); + v0.unk_54.unk_08 = 172 + BattleSystem_GetBackgroundId(param0) * 3 + ov16_0223EC04(param0); v0.unk_54.unk_0C = 2; v0.unk_54.unk_10 = 0; v0.unk_54.unk_14 = 8; diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index 19aad0a1c1..d8226c4f90 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -71,8 +71,8 @@ typedef struct { s16 unk_0E; s16 unk_10; u8 unk_12; - u8 unk_13; -} UnkStruct_ov16_0226B988; + u8 state; +} BattleMenuSlideIn; typedef struct { s16 unk_00; @@ -105,8 +105,8 @@ typedef struct { } UnkStruct_ov16_02268A14_sub3_sub1; typedef struct { - s16 unk_00; - s16 unk_02; + s16 state; + s16 wait; union { struct { u8 unk_00; @@ -121,7 +121,7 @@ typedef struct { u8 unk_0C; u8 unk_0D; u8 unk_0E; - u8 unk_0F; + u8 frameType; u8 unk_10; UnkStruct_ov16_02270294 unk_11; } unk_04_val3; @@ -131,10 +131,10 @@ typedef struct { NNSG2dCharacterData *unk_14; void *unk_18; int unk_1C; - } unk_04_val4; + } pokemonSelect; s16 unk_04_val5[2]; }; -} UnkStruct_ov16_02268A14_sub3; +} BattleInputEffect; typedef struct { int unk_00; @@ -142,7 +142,7 @@ typedef struct { s16 unk_06; u8 unk_08; u8 unk_09; -} UnkStruct_ov16_02268A14_sub4; +} BattleInputEffectColor; typedef struct { const UnkStruct_ov16_022702F4 *unk_00; @@ -176,10 +176,10 @@ typedef struct { typedef union { UnkStruct_ov16_02269668 val1; - UnkStruct_ov16_02260C00 val2; - UnkStruct_ov16_02260F14 val3; + BattleInputMoveMenu moveMenu; + BattleInputPokemonMenu val3; UnkStruct_ov16_022623F0 val4; -} UnkStruct_ov16_02268A14_sub2; +} BattleInputMenu; typedef struct { Window unk_00; @@ -199,16 +199,16 @@ struct BattleInput_t { BattleSystem *battleSystem; u8 *unk_04; SysTask *unk_08; - SysTask *unk_0C; + SysTask *effectTask; SysTask *unk_10; UnkStruct_ov16_02268A14_sub1 unk_14; - UnkStruct_ov16_02268A14_sub2 unk_1A; + BattleInputMenu menu; u16 *unk_3C[7]; u16 *unk_58; u16 *unk_5C; u16 *unk_60; SysTask *unk_64; - MoveDisplayObject unk_68[4]; + MoveDisplayObject moveDisplayObj[4]; UnkStruct_02012744 *unk_4C8; BattleInputTextObject textObj[13]; UnkStruct_02012B20 *unk_5B8; @@ -225,23 +225,23 @@ struct BattleInput_t { u8 unk_66A; s8 curMenuId; u8 unk_66C; - u8 unk_66D; - u8 unk_66E; - u8 unk_66F; + u8 gender; + u8 touchDisabled; + u8 canCancel; u8 unk_670; s16 unk_672; u8 unk_674; s16 unk_676; SysTask *unk_678; - UnkStruct_ov16_02268A14_sub3 unk_67C; - UnkStruct_ov16_02268A14_sub4 unk_6A0; - s32 unk_6AC; + BattleInputEffect effect; + BattleInputEffectColor effectColor; + s32 xEdge; s32 unk_6B0; s32 unk_6B4; BattleCursor *cursor; BattleCursorMove cursorMove; - u8 unk_6C0; - u8 unk_6C1; + u8 keyPressed; + u8 runCommandType; struct { CatchingTutorialFinger *finger; u8 state; @@ -252,26 +252,10 @@ struct BattleInput_t { typedef struct { u16 unk_00; - u16 unk_02; - union { - struct { - u16 unk_04_val1_unk_00; - u16 unk_04_val1_unk_02; - u16 unk_04_val1_unk_04; - u16 unk_04_val1_unk_06; - }; - u16 unk_04_val2[4]; - }; - union { - struct { - u16 unk_0C_val1_unk_00; - u16 unk_0C_val1_unk_02; - u16 unk_0C_val1_unk_04; - u16 unk_0C_val1_unk_06; - }; - u16 unk_0C_val2[4]; - }; - const TouchScreenRect *unk_14; + u16 paletteId; + u16 unk_04_val2[4]; + u16 priority[4]; + const TouchScreenRect *touchscreenRect; const int *unk_18; const u8 *unk_1C; int (*funcCursorMove)(BattleInput *battleInput, int param1); @@ -281,6 +265,7 @@ typedef struct { } BattleMenuTemplate; enum { + // BITO = Battle Input Text Object BITO_FIGHT = 0, BITO_BAG, BITO_POKEMON, @@ -303,7 +288,7 @@ enum { static void *BattleInput_New(void); static void ov16_02269654(BattleInput *battleInput, int param1, int param2); -static void ov16_02269668(BattleInput *battleInput, int param1, int param2); +static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int param1, int param2); static void ov16_022698A8(BattleInput *battleInput, int param1, int param2); static void ov16_022698BC(BattleInput *battleInput, int param1, int param2); static void ov16_02269924(BattleInput *battleInput, int param1, int param2); @@ -311,12 +296,12 @@ static void ov16_02269938(BattleInput *battleInput, int param1, int param2); static void ov16_02269E94(BattleInput *battleInput, int param1, int param2); static int ov16_0226A318(BattleInput *battleInput, int param1, int param2); static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2); -static void ov16_022699AC(BattleInput *battleInput, int param1, int param2); +static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, int param2); static void BattleInput_CreateTypeIcons(BattleInput *battleInput); static void BattleInput_DestroyTypeIcons(BattleInput *battleInput); static void ov16_0226B028(BattleInput *battleInput); -static void ov16_0226B2BC(SysTaskFunc param0, BattleInput *battleInput); -static void ov16_0226B2F0(BattleInput *battleInput); +static void BattleInputEffect_AddTask(SysTaskFunc task, BattleInput *battleInput); +static void BattleInput_EffectTaskDone(BattleInput *battleInput); static int ov16_0226A4A4(BattleInput *battleInput, int param1, int param2); static int ov16_0226A634(BattleInput *battleInput, int param1, int param2); static int ov16_0226A528(BattleInput *battleInput, int param1, int param2); @@ -332,21 +317,21 @@ static void ov16_0226B0DC(BattleInput *battleInput, int param1); static int ov16_0226A934(u8 param0); static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput); void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]); -void ov16_022691BC(BattleInput *battleInput); -void ov16_02269218(BattleInput *battleInput); -static void ov16_0226BC50(SysTask *param0, void *param1); +void BattleInput_EnableBallGauge(BattleInput *battleInput); +void BattleInput_DisableBallGauge(BattleInput *battleInput); +static void ov16_0226BC50(SysTask *task, void *param1); static void ov16_0226B198(void); -static void ov16_0226BCBC(SysTask *param0, void *param1); +static void ov16_0226BCBC(SysTask *task, void *param1); static void ov16_0226B1C4(BattleInput *battleInput, int param1, int param2); static void BattleInput_DestroyMenuObjects(BattleInput *battleInput); -static void ov16_0226B390(SysTask *param0, void *param1); -static void ov16_0226B4E0(SysTask *param0, void *param1); -static void ov16_0226B780(SysTask *param0, void *param1); +static void EffectTask_ButtonDown(SysTask *task, void *param1); +static void EffectTask_MoveButtonDown(SysTask *task, void *param1); +static void EffectTask_PokemonButtonDown(SysTask *task, void *param1); static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int param3); static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2); static void ov16_0226B318(BattleInput *battleInput, int param1); void ov16_0226947C(BattleInput *battleInput, int param1, int param2); -static void ov16_022694A8(SysTask *param0, void *param1); +static void ov16_022694A8(SysTask *task, void *param1); static void ov16_0226B314(BattleInput *battleInput, int param1); static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10); static void BattleInput_DestroyTextObjects(BattleInput *battleInput); @@ -354,15 +339,15 @@ static void ov16_0226A698(BattleInput *battleInput); static void ov16_0226A718(BattleInput *battleInput); static void ov16_0226A768(BattleInput *battleInput); static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5); -static void ov16_0226A928(SysTask *param0, void *param1); -static void ov16_0226B988(SysTask *param0, void *param1); -static void ov16_0226BA88(SysTask *param0, void *param1); -static void ov16_0226BB94(void *param0); +static void ov16_0226A928(SysTask *task, void *param1); +static void ov16_0226B988(SysTask *task, void *param1); +static void ov16_0226BA88(SysTask *task, void *param1); +static void ov16_0226BB94(void *data); static TextColor GetPPTextColor(int param0, int param1); void ov16_0226BCCC(BattleInput *battleInput, int param1); BOOL ov16_0226BCD0(BattleInput *battleInput); -static void ov16_0226BCE4(SysTask *param0, void *param1); -static void ov16_02268FCC(SysTask *param0, void *param1); +static void ov16_0226BCE4(SysTask *task, void *param1); +static void ov16_02268FCC(SysTask *task, void *param1); static int ov16_0226BE48(BattleInput *battleInput); static int ov16_0226BEC0(BattleInput *battleInput, int param1); static int ov16_0226C1F8(BattleInput *battleInput, int param1); @@ -373,21 +358,21 @@ static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int param1); static void ov16_0226C9B8(BattleInput *battleInput, int param1); static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4); -static MoveDisplayObject *ov16_0226ABD4(BattleInput *battleInput, int param1); -static void ov16_0226ABE8(BattleInput *battleInput); -static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3); +static MoveDisplayObject *BattleInput_GetBattlerMoveDisplayObject(BattleInput *battleInput, int param1); +static void BattleInput_FreeMoveDisplayObjects(BattleInput *battleInput); +static void ov16_0226A95C(const Strbuf *str, int param1, int *param2, int *param3); static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor param4); static void ov16_0226AAF8(BattleInput *battleInput); static int ov16_0226C100(BattleInput *battleInput, int param1); -static void ov16_0226BD74(SysTask *param0, void *param1); +static void ov16_0226BD74(SysTask *task, void *param1); static int BattleInput_CatchingTutorialMain(BattleInput *battleInput); static int BattleInput_CatchingTutorialFight(BattleInput *battleInput); static int BattleInput_CatchingTutorialMove(BattleInput *battleInput); static int BattleInput_CatchingTutorialBag(BattleInput *battleInput); -static void inline_ov16_0226B314(SysTaskFunc param0, BattleInput *battleInput); -static void inline_ov16_0226B318_1(SysTask *param0, void *param1); +static void inline_ov16_0226B314(SysTaskFunc task, BattleInput *battleInput); +static void inline_ov16_0226B318_1(SysTask *task, void *param1); static void inline_ov16_0226B318_1_sub(BattleInput *battleInput); -static void inline_ov16_0226B314_1(SysTask *param0, void *param1); +static void inline_ov16_0226B314_1(SysTask *task, void *param1); __attribute__((aligned(4))) static const u16 Unk_ov16_02270264[] = { 0x31, @@ -520,7 +505,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A14[NELEMS(Unk_ov16_02 0xB }; -__attribute__((aligned(4))) static const u8 Unk_ov16_022701E4[3][2] = { +__attribute__((aligned(4))) static const u8 sMoveMenuIndexMatrix[3][2] = { { 0x1, 0x2 }, { 0x3, 0x4 }, { 0x0, 0x0 } @@ -542,7 +527,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A00[NELEMS(Unk_ov16_02 0x4 }; -__attribute__((aligned(4))) static const u8 Unk_ov16_022701C8[2][1] = { +__attribute__((aligned(4))) static const u8 sTwoChoiceMenuIndexMatrix[2][1] = { { 0x0 }, { 0x1 } }; @@ -641,7 +626,7 @@ static const BattleMenuTemplate sBattleMenuTemplates[] = { Unk_ov16_02270A08, ov16_0226BEC0, BattleInput_SaveBattlerCursorPosition, - ov16_02269668, + BattleInput_CreateCommandSelectObjects, ov16_0226A318, }, { @@ -654,7 +639,7 @@ static const BattleMenuTemplate sBattleMenuTemplates[] = { Unk_ov16_02270A08, ov16_0226BEC0, BattleInput_SaveBattlerCursorPosition, - ov16_02269668, + BattleInput_CreateCommandSelectObjects, ov16_0226A318, }, { @@ -706,7 +691,7 @@ static const BattleMenuTemplate sBattleMenuTemplates[] = { Unk_ov16_02270A08, ov16_0226BEC0, BattleInput_SaveBattlerCursorPosition, - ov16_02269668, + BattleInput_CreateCommandSelectObjects, ov16_0226A318, }, { @@ -745,7 +730,7 @@ static const BattleMenuTemplate sBattleMenuTemplates[] = { Unk_ov16_02270A14, ov16_0226C1F8, BattleInput_SaveBattlerMovePosition, - ov16_022699AC, + BattleInput_CreateMoveObjects, ov16_0226A3F4, }, { @@ -1012,7 +997,7 @@ __attribute__((aligned(4))) static const int Unk_ov16_022705B0[][4] = { static const struct { u16 unk_00; u16 unk_02; -} Unk_ov16_022704E4[] = { +} sBackgroundPaletteIds[] = { { 0xF3, 0x10B }, { 0xF4, 0x10C }, { 0xF5, 0x10D }, @@ -1069,26 +1054,26 @@ void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem { BattleInput *battleInput; PaletteData *palette; - int v2; + int bgId; battleInput = BattleInput_New(); battleInput->battleSystem = battleSystem; - battleInput->unk_66D = gender; + battleInput->gender = gender; battleInput->unk_04 = param4; if (battleInput->unk_04 != NULL) { - battleInput->unk_6C0 = *param4; + battleInput->keyPressed = *param4; } palette = BattleSystem_GetPaletteData(battleSystem); - v2 = ov16_0223E240(battleSystem); + bgId = BattleSystem_GetBackgroundId(battleSystem); - if (v2 >= NELEMS(Unk_ov16_022704E4)) { - v2 = 0; + if (bgId >= NELEMS(sBackgroundPaletteIds)) { + bgId = 0; GF_ASSERT(0); } - battleInput->unk_4C8 = sub_02012744(13, 5); + battleInput->unk_4C8 = sub_02012744(13, HEAP_ID_BATTLE); battleInput->unk_678 = SysTask_Start(ov16_0226BCE4, battleInput, 1310); NNSG2dScreenData *screenData; @@ -1119,24 +1104,24 @@ void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem PaletteData_LoadBufferFromFileStart(palette, 7, v8, 5, 1, 0, 0); - if (Unk_ov16_022704E4[v2].unk_00 != 0xffff) { - PaletteData_LoadBufferFromFileStart(palette, 7, Unk_ov16_022704E4[v2].unk_00, 5, 1, 0x20, 0); + if (sBackgroundPaletteIds[bgId].unk_00 != 0xffff) { + PaletteData_LoadBufferFromFileStart(palette, 7, sBackgroundPaletteIds[bgId].unk_00, 5, 1, 0x20, 0); } v7 = PaletteData_GetUnfadedBuffer(palette, 1); MI_CpuCopy16(v7, battleInput->unk_58, 0x200); for (int i = 0; i < 4; i++) { - MI_CpuFill8(&battleInput->unk_68[i].moveDisplay, 0xff, sizeof(MoveDisplayInfo)); + MI_CpuFill8(&battleInput->moveDisplayObj[i].moveDisplay, 0xff, sizeof(MoveDisplayInfo)); } for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - battleInput->unk_68[i].typeIcon[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); + battleInput->moveDisplayObj[i].typeIcon[j] = Heap_AllocFromHeap(5, sub_0208C098(6)); } } - NNSG2dPaletteData *v13; + NNSG2dPaletteData *nnsgPalette; void *v14; int v15; @@ -1148,18 +1133,18 @@ void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem if (BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) { v15 = 341; - } else if (Unk_ov16_022704E4[v2].unk_02 != 0xffff) { - v15 = Unk_ov16_022704E4[v2].unk_02; + } else if (sBackgroundPaletteIds[bgId].unk_02 != 0xffff) { + v15 = sBackgroundPaletteIds[bgId].unk_02; } else { v15 = 267; } - v14 = Graphics_GetPlttData(7, v15, &v13, 5); + v14 = Graphics_GetPlttData(7, v15, &nnsgPalette, 5); if (BattleSystem_GetBattleType(battleSystem) & BATTLE_TYPE_FRONTIER) { - MI_CpuCopy16(v13->pRawData, battleInput->unk_60, 0x40); + MI_CpuCopy16(nnsgPalette->pRawData, battleInput->unk_60, 0x40); } else { - MI_CpuCopy16(v13->pRawData, battleInput->unk_60, 0x20); + MI_CpuCopy16(nnsgPalette->pRawData, battleInput->unk_60, 0x20); } Heap_FreeToHeap(v14); @@ -1176,7 +1161,7 @@ void BattleInput_Free(BattleInput *battleInput) int i; if (battleInput->unk_04 != NULL) { - *battleInput->unk_04 = battleInput->unk_6C0; + *battleInput->unk_04 = battleInput->keyPressed; } BattleInput_DestroyMenuObjects(battleInput); @@ -1191,7 +1176,7 @@ void BattleInput_Free(BattleInput *battleInput) } Heap_FreeToHeap(battleInput->unk_58); - ov16_0226ABE8(battleInput); + BattleInput_FreeMoveDisplayObjects(battleInput); Heap_FreeToHeap(battleInput->unk_5C); Heap_FreeToHeap(battleInput->unk_60); SysTask_Done(battleInput->unk_64); @@ -1253,7 +1238,7 @@ void ov16_02268B8C(BattleInput *battleInput) } } -void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int menuId, int param4, void *param5) +void BattleInput_ChangeMenu(NARC *param0, NARC *param1, BattleInput *battleInput, int menuId, int param4, void *param5) { const BattleMenuTemplate *menuTemplate, *prevMenuTemplate; int i; @@ -1262,10 +1247,10 @@ void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int men SpriteGfxHandler *gfxHandler; if (param5 != NULL) { - MI_CpuCopy8(param5, &battleInput->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2)); + MI_CpuCopy8(param5, &battleInput->menu, sizeof(BattleInputMenu)); } - battleInput->unk_66E = 0; + battleInput->touchDisabled = FALSE; bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); @@ -1302,7 +1287,7 @@ void ov16_02268C04(NARC *param0, NARC *param1, BattleInput *battleInput, int men SysTask_ExecuteAfterVBlank(ov16_0226BC50, battleInput, 10); } -void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *battleInput) +void BattleInput_CreateBallGagueObjects(NARC *narc, BattleInput *battleInput) { int i; SpriteRenderer *spriteRenderer; @@ -1313,13 +1298,13 @@ void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *battleInput) spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 207, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 209, 1, 20015); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 207, 1, 20015); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 209, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 204, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, param0, 206, 1, 20016); + SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 204, 1, 20016); + SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 206, 1, 20016); for (i = 0; i < 6; i++) { battleInput->actorBallGague[i] = SpriteActor_LoadResources(spriteRenderer, spriteGfxHandler, &sBallGagueTemplate); @@ -1330,7 +1315,7 @@ void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *battleInput) sub_0200D4D0(battleInput->actorBallGagueOpponent[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); } - ov16_02269218(battleInput); + BattleInput_DisableBallGauge(battleInput); GF_ASSERT(battleInput->unk_08 == NULL); battleInput->unk_08 = SysTask_Start(ov16_02268FCC, battleInput, 1300); @@ -1462,31 +1447,29 @@ static void ov16_02268FCC(SysTask *task, void *data) void ov16_0226914C(BattleInput *battleInput, const u8 *param1) { - int i; - - for (i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { battleInput->unk_62C[i].unk_02 = param1[i]; } } void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]) { - int i, v1; + int i, anim; for (i = 0; i < 6; i++) { - v1 = ov16_0226A934(param1[i]); + anim = ov16_0226A934(param1[i]); - CellActor_SetAnim(battleInput->actorBallGague[i]->unk_00, v1); + CellActor_SetAnim(battleInput->actorBallGague[i]->unk_00, anim); SpriteActor_UpdateObject(battleInput->actorBallGague[i]->unk_00); - v1 = ov16_0226A934(param2[i]); + anim = ov16_0226A934(param2[i]); - CellActor_SetAnim(battleInput->actorBallGagueOpponent[i]->unk_00, v1); + CellActor_SetAnim(battleInput->actorBallGagueOpponent[i]->unk_00, anim); SpriteActor_UpdateObject(battleInput->actorBallGagueOpponent[i]->unk_00); } } -void ov16_022691BC(BattleInput *battleInput) +void BattleInput_EnableBallGauge(BattleInput *battleInput) { int i; @@ -1503,7 +1486,7 @@ void ov16_022691BC(BattleInput *battleInput) } } -void ov16_02269218(BattleInput *battleInput) +void BattleInput_DisableBallGauge(BattleInput *battleInput) { int i; @@ -1517,7 +1500,7 @@ void ov16_02269218(BattleInput *battleInput) int BattleInput_CheckTouch(BattleInput *battleInput) { - int v0, v1, v2, v3; + int ret, rectHit, paletteId; const BattleMenuTemplate *menuTemplate; int v5 = 0; @@ -1525,60 +1508,60 @@ int BattleInput_CheckTouch(BattleInput *battleInput) menuTemplate = &sBattleMenuTemplates[battleInput->curMenuId]; - if ((menuTemplate->unk_14 == NULL) || (battleInput->unk_66E == 1)) { + if ((menuTemplate->touchscreenRect == NULL) || (battleInput->touchDisabled == TRUE)) { return 0xffffffff; } GF_ASSERT(menuTemplate->unk_18 != NULL); if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { - v1 = BattleInput_CatchingTutorialMain(battleInput); + rectHit = BattleInput_CatchingTutorialMain(battleInput); } else { - v1 = sub_02022664(menuTemplate->unk_14); + rectHit = sub_02022664(menuTemplate->touchscreenRect); - if (v1 == 0xffffffff) { - v1 = ov16_0226BE48(battleInput); + if (rectHit == 0xffffffff) { + rectHit = ov16_0226BE48(battleInput); v5++; } } - if (v1 == 0xffffffff) { - v0 = 0xffffffff; - v3 = 0xff; + if (rectHit == 0xffffffff) { + ret = 0xffffffff; + paletteId = 0xff; } else { - v0 = menuTemplate->unk_18[v1]; - v3 = menuTemplate->unk_1C[v1]; + ret = menuTemplate->unk_18[rectHit]; + paletteId = menuTemplate->unk_1C[rectHit]; } if (menuTemplate->unk_2C != NULL) { - v0 = menuTemplate->unk_2C(battleInput, v0, v3); + ret = menuTemplate->unk_2C(battleInput, ret, paletteId); - if (v0 != 0xffffffff) { + if (ret != 0xffffffff) { if (menuTemplate->funcSaveCursorPos != NULL) { - menuTemplate->funcSaveCursorPos(battleInput, v1); + menuTemplate->funcSaveCursorPos(battleInput, rectHit); } MI_CpuClear8(&battleInput->cursorMove, sizeof(BattleCursorMove)); - ov16_0226DDE8(battleInput->cursor); + BattleCursor_Disable(battleInput->cursor); if (v5 > 0) { - battleInput->unk_6C0 = 1; + battleInput->keyPressed = 1; } else { - battleInput->unk_6C0 = 0; + battleInput->keyPressed = 0; } } } - return v0; + return ret; } -BOOL ov16_02269348(BattleInput *battleInput) +BOOL BattleInput_CheckEffectEnded(BattleInput *battleInput) { - if ((battleInput->unk_0C == NULL) && (battleInput->unk_10 == NULL) && (ov16_0226BCD0(battleInput) == 1)) { - return 1; + if ((battleInput->effectTask == NULL) && (battleInput->unk_10 == NULL) && (ov16_0226BCD0(battleInput) == 1)) { + return TRUE; } - return 0; + return FALSE; } int ov16_02269368(int param0, int param1) @@ -1613,24 +1596,22 @@ int ov16_02269368(int param0, int param1) void ov16_0226940C(BattleInput *battleInput) { - int v0; - GXS_SetVisibleWnd(GX_WNDMASK_W0); G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); - v0 = 255 - (battleInput->unk_6AC / 0x100); + int x = 255 - (battleInput->xEdge / 0x100); - if (v0 < 0) { - v0 = 0; + if (x < 0) { + x = 0; } - G2S_SetWnd0Position(v0, 0, 255, 192); + G2S_SetWnd0Position(x, 0, 255, 192); } void ov16_0226947C(BattleInput *battleInput, int param1, int param2) { - if (battleInput->unk_6AC == param2 * 0x100) { + if (battleInput->xEdge == param2 * 0x100) { return; } @@ -1643,22 +1624,22 @@ void ov16_0226947C(BattleInput *battleInput, int param1, int param2) static void ov16_022694A8(SysTask *param0, void *param1) { BattleInput *battleInput = param1; - int v1 = 0; - BgConfig *v2; + int isFinished = 0; + BgConfig *bgConfig; - v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); - battleInput->unk_6AC += battleInput->unk_6B0; + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + battleInput->xEdge += battleInput->unk_6B0; - if (((battleInput->unk_6B0 <= 0) && (battleInput->unk_6AC <= battleInput->unk_6B4)) || ((battleInput->unk_6B0 > 0) && (battleInput->unk_6AC >= battleInput->unk_6B4))) { - battleInput->unk_6AC = battleInput->unk_6B4; - v1 = 1; + if (((battleInput->unk_6B0 <= 0) && (battleInput->xEdge <= battleInput->unk_6B4)) || ((battleInput->unk_6B0 > 0) && (battleInput->xEdge >= battleInput->unk_6B4))) { + battleInput->xEdge = battleInput->unk_6B4; + isFinished = 1; } - Bg_SetOffset(v2, 6, 0, battleInput->unk_6AC / 0x100); + Bg_SetOffset(bgConfig, 6, 0, battleInput->xEdge / 0x100); ov16_0226940C(battleInput); - if (v1 == 1) { - Bg_FillTilemap(v2, 7, (0x6000 / 0x20 - 1)); + if (isFinished == 1) { + Bg_FillTilemap(bgConfig, 7, (0x6000 / 0x20 - 1)); Bg_ToggleLayer(7, 0); Bg_SetPriority(7, 0); GXS_SetVisibleWnd(GX_WNDMASK_NONE); @@ -1667,12 +1648,12 @@ static void ov16_022694A8(SysTask *param0, void *param1) } } -static void ov16_02269550(BattleInput *battleInput, int param1) +static void BattleInput_InitSlideIn(BattleInput *battleInput, int param1) { - BOOL v0; - UnkStruct_ov16_0226B988 *v1; + BOOL ret; + BattleMenuSlideIn *menuSlideIn; - battleInput->unk_66E = 1; + battleInput->touchDisabled = TRUE; G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); @@ -1681,80 +1662,78 @@ static void ov16_02269550(BattleInput *battleInput, int param1) G2S_SetWnd1Position(0, (18 * 8), 255, 192); GXS_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1); - v1 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0226B988)); - MI_CpuClear8(v1, sizeof(UnkStruct_ov16_0226B988)); + menuSlideIn = Heap_AllocFromHeap(5, sizeof(BattleMenuSlideIn)); + MI_CpuClear8(menuSlideIn, sizeof(BattleMenuSlideIn)); - v1->battleInput = battleInput; - v1->unk_12 = param1; - v1->unk_08 = -(255 * 100); - v1->unk_0A = (40 * 100); - v1->unk_0C = ((255 * 100) - v1->unk_08) / 100; - v1->unk_0E = ((40 * 100) - v1->unk_0A) / 100; + menuSlideIn->battleInput = battleInput; + menuSlideIn->unk_12 = param1; + menuSlideIn->unk_08 = -(255 * 100); + menuSlideIn->unk_0A = (40 * 100); + menuSlideIn->unk_0C = ((255 * 100) - menuSlideIn->unk_08) / 100; + menuSlideIn->unk_0E = ((40 * 100) - menuSlideIn->unk_0A) / 100; Sound_PlayEffect(1806); - SysTask_Start(ov16_0226B988, v1, 1210); + SysTask_Start(ov16_0226B988, menuSlideIn, 1210); - v0 = SetHBlankCallback(ov16_0226BB94, v1); - GF_ASSERT(v0 == 1); + ret = SetHBlankCallback(ov16_0226BB94, menuSlideIn); + GF_ASSERT(ret == 1); - v1->unk_04 = SysTask_ExecuteOnVBlank(ov16_0226BA88, v1, 10); + menuSlideIn->unk_04 = SysTask_ExecuteOnVBlank(ov16_0226BA88, menuSlideIn, 10); } static void ov16_02269654(BattleInput *battleInput, int param1, int param2) { - int v0; - - v0 = battleInput->unk_1A.val1.unk_00; + int battlerType = battleInput->menu.val1.unk_00; - ov16_02269668(battleInput, param1, param2); - ov16_02269550(battleInput, v0); + BattleInput_CreateCommandSelectObjects(battleInput, param1, param2); + BattleInput_InitSlideIn(battleInput, battlerType); } -static void ov16_02269668(BattleInput *battleInput, int param1, int param2) +static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int param1, int param2) { - Strbuf *v0, *v1, *v2, *v3; + Strbuf *strFight, *strBag, *v2, *v3; MessageLoader *msgLoader; int v5; UnkStruct_ov16_02269668 *v6; - v6 = &battleInput->unk_1A.val1; + v6 = &battleInput->menu.val1; v5 = v6->unk_00; - battleInput->unk_6C1 = v6->unk_08; + battleInput->runCommandType = v6->unk_08; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); battleInput->unk_66A = v5; if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_SAFARI) { - v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00931); // BALL - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT + strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00931); // BALL + strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_PAL_PARK) { - v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01223); // BALL - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT + strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01223); // BALL + strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else { - v0 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00924); // FIGHT - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00925); // BAG + strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00924); // FIGHT + strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00925); // BAG v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00926); // POKĂ©MON } - if (battleInput->unk_6C1 == 1) { + if (battleInput->runCommandType == BI_RUNCMD_CANCEL) { v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00928); // CANCEL - battleInput->unk_66F = 1; + battleInput->canCancel = 1; } else { v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00927); // RUN - battleInput->unk_66F = 0; + battleInput->canCancel = 0; } - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strFight, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], strBag, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); - Strbuf_Free(v0); - Strbuf_Free(v1); + Strbuf_Free(strFight); + Strbuf_Free(strBag); Strbuf_Free(v2); Strbuf_Free(v3); @@ -1781,83 +1760,69 @@ static void ov16_02269668(BattleInput *battleInput, int param1, int param2) static void ov16_022698A8(BattleInput *battleInput, int param1, int param2) { - int v0; - - v0 = battleInput->unk_1A.val1.unk_00; + int battlerType = battleInput->menu.val1.unk_00; ov16_022698BC(battleInput, param1, param2); - ov16_02269550(battleInput, v0); + BattleInput_InitSlideIn(battleInput, battlerType); } static void ov16_022698BC(BattleInput *battleInput, int param1, int param2) { - int v0; - - v0 = battleInput->unk_1A.val1.unk_00; - - ov16_02269668(battleInput, param1, param2); + int battlerType = battleInput->menu.val1.unk_00; - { - BgConfig *v1; + BattleInput_CreateCommandSelectObjects(battleInput, param1, param2); - v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17); - Bg_ScheduleTilemapTransfer(v1, 5); - } + Bg_FillTilemapRect(bgConfig, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17); + Bg_ScheduleTilemapTransfer(bgConfig, 5); - sub_020129D0(battleInput->textObj[1].fontOAM, 0); - sub_020129D0(battleInput->textObj[2].fontOAM, 0); - sub_020129D0(battleInput->textObj[3].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[1].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[2].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[3].fontOAM, 0); } static void ov16_02269924(BattleInput *battleInput, int param1, int param2) { - int v0; - - v0 = battleInput->unk_1A.val1.unk_00; + int battlerType = battleInput->menu.val1.unk_00; ov16_02269938(battleInput, param1, param2); - ov16_02269550(battleInput, v0); + BattleInput_InitSlideIn(battleInput, battlerType); } static void ov16_02269938(BattleInput *battleInput, int param1, int param2) { - int v0; + int battlerType = battleInput->menu.val1.unk_00; - v0 = battleInput->unk_1A.val1.unk_00; - - ov16_02269668(battleInput, param1, param2); + BattleInput_CreateCommandSelectObjects(battleInput, param1, param2); { - BgConfig *v1; - - v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17); - Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17); - Bg_ScheduleTilemapTransfer(v1, 5); + Bg_FillTilemapRect(bgConfig, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17); + Bg_FillTilemapRect(bgConfig, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17); + Bg_ScheduleTilemapTransfer(bgConfig, 5); } - sub_020129D0(battleInput->textObj[1].fontOAM, 0); - sub_020129D0(battleInput->textObj[2].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[1].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[2].fontOAM, 0); } -static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) +static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, int param2) { - UnkStruct_ov16_02260C00 *v0; + BattleInputMoveMenu *moveMenu; int i; MessageLoader *v2; MoveDisplayObject *moveDisplay; TextColor ppColor; - v0 = &battleInput->unk_1A.val2; - GF_ASSERT(v0 != NULL); + moveMenu = &battleInput->menu.moveMenu; + GF_ASSERT(moveMenu != NULL); - battleInput->unk_66A = v0->unk_10; + battleInput->unk_66A = moveMenu->unk_10; v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); - moveDisplay = ov16_0226ABD4(battleInput, v0->unk_10); + moveDisplay = BattleInput_GetBattlerMoveDisplayObject(battleInput, moveMenu->unk_10); BattleInput_CreateTypeIcons(battleInput); @@ -1870,7 +1835,7 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) { for (i = 0; i < LEARNED_MOVES_MAX; i++) { - ppColor = GetPPTextColor(v0->unk_08[i], v0->unk_0C[i]); + ppColor = GetPPTextColor(moveMenu->unk_08[i], moveMenu->unk_0C[i]); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[9 + i], NULL, FONT_SYSTEM, ppColor, 4, 20023, Unk_ov16_022702D4[i][0], Unk_ov16_022702D4[i][1], 0, &moveDisplay->curPPText[i]); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[5 + i], NULL, FONT_SYSTEM, ppColor, 4, 20023, Unk_ov16_02270284[i][0], Unk_ov16_02270284[i][1], 0, &moveDisplay->maxPPText[i]); } @@ -1888,8 +1853,8 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) int moveType; for (i = 0; i < LEARNED_MOVES_MAX; i++) { - if (v0->unk_00[i] != 0) { - moveType = MoveTable_LoadParam(v0->unk_00[i], MOVEATTRIBUTE_TYPE); + if (moveMenu->unk_00[i] != 0) { + moveType = MoveTable_LoadParam(moveMenu->unk_00[i], MOVEATTRIBUTE_TYPE); ov16_0226B06C(battleInput, moveType, i); } else { ov16_0226B088(battleInput, i); @@ -1903,28 +1868,28 @@ static void ov16_022699AC(BattleInput *battleInput, int param1, int param2) v7 = BattleSystem_GetBgConfig(battleInput->battleSystem); - if (v0->unk_00[0] == 0) { - sub_020129D0(battleInput->textObj[0].fontOAM, 0); - sub_020129D0(battleInput->textObj[5].fontOAM, 0); - sub_020129D0(battleInput->textObj[9].fontOAM, 0); + if (moveMenu->unk_00[0] == 0) { + FontOAM_SetDrawFlag(battleInput->textObj[0].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[5].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[9].fontOAM, 0); } - if (v0->unk_00[1] == 0) { - sub_020129D0(battleInput->textObj[1].fontOAM, 0); - sub_020129D0(battleInput->textObj[6].fontOAM, 0); - sub_020129D0(battleInput->textObj[10].fontOAM, 0); + if (moveMenu->unk_00[1] == 0) { + FontOAM_SetDrawFlag(battleInput->textObj[1].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[6].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[10].fontOAM, 0); } - if (v0->unk_00[2] == 0) { - sub_020129D0(battleInput->textObj[2].fontOAM, 0); - sub_020129D0(battleInput->textObj[7].fontOAM, 0); - sub_020129D0(battleInput->textObj[11].fontOAM, 0); + if (moveMenu->unk_00[2] == 0) { + FontOAM_SetDrawFlag(battleInput->textObj[2].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[7].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[11].fontOAM, 0); } - if (v0->unk_00[3] == 0) { - sub_020129D0(battleInput->textObj[3].fontOAM, 0); - sub_020129D0(battleInput->textObj[8].fontOAM, 0); - sub_020129D0(battleInput->textObj[12].fontOAM, 0); + if (moveMenu->unk_00[3] == 0) { + FontOAM_SetDrawFlag(battleInput->textObj[3].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[8].fontOAM, 0); + FontOAM_SetDrawFlag(battleInput->textObj[12].fontOAM, 0); } } } @@ -1948,42 +1913,42 @@ static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int par static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *v1, *v2; + Strbuf *strForget, *v2; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01181); // Forget a move! + strForget = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01181); // Forget a move! v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01182); // Keep old moves! - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strForget, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); - Strbuf_Free(v1); + Strbuf_Free(strForget); Strbuf_Free(v2); } static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *v1, *v2, *v3, *v4; + Strbuf *strGiveUp, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = &battleInput->unk_1A.val4; + v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01186); // Give up on {move}? + strGiveUp = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01186); // Give up on {move}? v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01187); // Don't give up on {move}! v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, v1); + StringTemplate_Format(v5, v3, strGiveUp); StringTemplate_Format(v5, v4, v2); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); - Strbuf_Free(v1); + Strbuf_Free(strGiveUp); Strbuf_Free(v2); Strbuf_Free(v3); Strbuf_Free(v4); @@ -1992,12 +1957,12 @@ static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *v1; + Strbuf *strStop; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01260); // STOP + strStop = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01260); // STOP { BgConfig *v2; @@ -2021,33 +1986,33 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) Bg_ScheduleTilemapTransfer(v5, 5); } - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); - Strbuf_Free(v1); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strStop, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); + Strbuf_Free(strStop); } static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *v1, *v2, *v3, *v4; + Strbuf *strNextPokemon, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = &battleInput->unk_1A.val4; + v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01217); // Use next PokĂ©mon + strNextPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01217); // Use next PokĂ©mon v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01218); // Flee v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, v1); + StringTemplate_Format(v5, v3, strNextPokemon); StringTemplate_Format(v5, v4, v2); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); - Strbuf_Free(v1); + Strbuf_Free(strNextPokemon); Strbuf_Free(v2); Strbuf_Free(v3); Strbuf_Free(v4); @@ -2056,26 +2021,26 @@ static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *v1, *v2, *v3, *v4; + Strbuf *strSwitchPokemon, *v2, *v3, *v4; StringTemplate *v5; UnkStruct_ov16_022623F0 *v6; - v6 = &battleInput->unk_1A.val4; + v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); v5 = BattleSystem_StringTemplate(battleInput->battleSystem); - v1 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01215); // Switch PokĂ©mon + strSwitchPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01215); // Switch PokĂ©mon v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01216); // Keep battling v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, v1); + StringTemplate_Format(v5, v3, strSwitchPokemon); StringTemplate_Format(v5, v4, v2); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); - Strbuf_Free(v1); + Strbuf_Free(strSwitchPokemon); Strbuf_Free(v2); Strbuf_Free(v3); Strbuf_Free(v4); @@ -2083,7 +2048,7 @@ static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) { - UnkStruct_ov16_02260F14 *v0; + BattleInputPokemonMenu *pokemonMenu; int i; MessageLoader *v2; u8 v3[4]; @@ -2096,10 +2061,10 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) u8 v11[6]; int v12; - v0 = &battleInput->unk_1A.val3; + pokemonMenu = &battleInput->menu.val3; - battleInput->unk_66C = v0->unk_21; - battleInput->unk_66A = v0->unk_20; + battleInput->unk_66C = pokemonMenu->unk_21; + battleInput->unk_66A = pokemonMenu->unk_20; v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); v8 = BattleSystem_StringTemplate(battleInput->battleSystem); @@ -2115,16 +2080,16 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) for (i = 0; i < 4; i++) { v12 = v11[2 + i]; - if ((v0->unk_00[v12].unk_01_2 == 1) && (v3[i] == 1)) { - if (v0->unk_00[v12].unk_01_0 == 0) { + if ((pokemonMenu->unk_00[v12].unk_01_2 == 1) && (v3[i] == 1)) { + if (pokemonMenu->unk_00[v12].unk_01_0 == 0) { genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00962); // ♂ - } else if (v0->unk_00[v12].unk_01_0 == 1) { + } else if (pokemonMenu->unk_00[v12].unk_01_0 == 1) { genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00963); // ♀ } else { genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00964); //(genderless) } - v6 = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, v0->unk_00[v12].unk_00); + v6 = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, pokemonMenu->unk_00[v12].unk_00); v7 = Pokemon_GetBoxPokemon(v6); StringTemplate_SetNickname(v8, 0, v7); @@ -2142,10 +2107,10 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) { switch (i) { case 1: - ov16_0226A7A4(battleInput, v6, 3, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, v6, 3, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); break; case 3: - ov16_0226A7A4(battleInput, v6, 5, v0->unk_00[v12].unk_04, v0->unk_00[v12].unk_06, v0->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, v6, 5, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); break; } } @@ -2165,7 +2130,7 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) { - int v0, v1, v2; + int textObjId, frameType, v2; v2 = 0xff; @@ -2174,8 +2139,8 @@ static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) default: return param1; case 1: - v0 = 0; - v1 = 0; + textObjId = 0; + frameType = 0; switch (battleInput->unk_66A) { case 0: @@ -2188,39 +2153,38 @@ static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) } break; case 2: - v0 = 1; - v1 = 1; + textObjId = 1; + frameType = 1; break; case 3: - v0 = 2; - v1 = 1; + textObjId = 2; + frameType = 1; break; case 4: - v0 = 3; - v1 = 1; + textObjId = 3; + frameType = 1; break; } ov16_0226B318(battleInput, param2); - ov16_0226B2BC(ov16_0226B390, battleInput); - - battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703A4[param1 - 1]; - battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022702F4[param1 - 1]; - battleInput->unk_67C.unk_04_val3.unk_0C = 1; - battleInput->unk_67C.unk_04_val3.unk_08 = param1; - battleInput->unk_67C.unk_04_val3.unk_0D = v0; - battleInput->unk_67C.unk_04_val3.unk_0E = v2; - battleInput->unk_67C.unk_04_val3.unk_0F = v1; - battleInput->unk_67C.unk_04_val3.unk_11 = Unk_ov16_02270294[param1 - 1]; - battleInput->unk_67C.unk_04_val3.unk_10 = 1; + BattleInputEffect_AddTask(EffectTask_ButtonDown, battleInput); + + battleInput->effect.unk_04_val3.unk_00 = Unk_ov16_022703A4[param1 - 1]; + battleInput->effect.unk_04_val3.unk_04 = &Unk_ov16_022702F4[param1 - 1]; + battleInput->effect.unk_04_val3.unk_0C = 1; + battleInput->effect.unk_04_val3.unk_08 = param1; + battleInput->effect.unk_04_val3.unk_0D = textObjId; + battleInput->effect.unk_04_val3.unk_0E = v2; + battleInput->effect.unk_04_val3.frameType = frameType; + battleInput->effect.unk_04_val3.unk_11 = Unk_ov16_02270294[param1 - 1]; + battleInput->effect.unk_04_val3.unk_10 = 1; return param1; } static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) { - UnkStruct_ov16_02260C00 *v0; - u32 v1[2]; + BattleInputMoveMenu *moveMenu; u32 v2; const UnkStruct_ov16_0226A3F4 *v3[2]; const s16 *v4; @@ -2230,10 +2194,10 @@ static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) return param1; } - v0 = &battleInput->unk_1A.val2; + moveMenu = &battleInput->menu.moveMenu; if ((param1 >= 1) && (param1 <= 4)) { - if (v0->unk_00[param1 - 1] == 0) { + if (moveMenu->unk_00[param1 - 1] == 0) { return 0xffffffff; } } @@ -2258,97 +2222,97 @@ static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) } ov16_0226B318(battleInput, param2); - ov16_0226B2BC(ov16_0226B4E0, battleInput); + BattleInputEffect_AddTask(EffectTask_MoveButtonDown, battleInput); - battleInput->unk_67C.unk_04_val3.unk_00 = v4; - battleInput->unk_67C.unk_04_val3.unk_04 = v5; - battleInput->unk_67C.unk_04_val3.unk_0C = 3; - battleInput->unk_67C.unk_04_val3.unk_08 = param1; - battleInput->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->effect.unk_04_val3.unk_00 = v4; + battleInput->effect.unk_04_val3.unk_04 = v5; + battleInput->effect.unk_04_val3.unk_0C = 3; + battleInput->effect.unk_04_val3.unk_08 = param1; + battleInput->effect.unk_04_val3.unk_10 = 1; return param1; } static int ov16_0226A4A4(BattleInput *battleInput, int param1, int param2) { - int v0; + int textObjId; switch (param1) { case 0xffffffff: default: return param1; case 1: - v0 = 0; + textObjId = 0; break; case 0xff: - v0 = 1; + textObjId = 1; break; } ov16_0226B318(battleInput, param2); - ov16_0226B2BC(ov16_0226B390, battleInput); + BattleInputEffect_AddTask(EffectTask_ButtonDown, battleInput); if (param1 == 1) { - battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[1]; - battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[1]; + battleInput->effect.unk_04_val3.unk_00 = Unk_ov16_02270240[1]; + battleInput->effect.unk_04_val3.unk_04 = &Unk_ov16_0227021C[1]; } else { - battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_02270240[0]; - battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227021C[0]; + battleInput->effect.unk_04_val3.unk_00 = Unk_ov16_02270240[0]; + battleInput->effect.unk_04_val3.unk_04 = &Unk_ov16_0227021C[0]; } - battleInput->unk_67C.unk_04_val3.unk_0C = 6; - battleInput->unk_67C.unk_04_val3.unk_08 = param1; - battleInput->unk_67C.unk_04_val3.unk_0D = v0; - battleInput->unk_67C.unk_04_val3.unk_0F = 3; - battleInput->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->effect.unk_04_val3.unk_0C = 6; + battleInput->effect.unk_04_val3.unk_08 = param1; + battleInput->effect.unk_04_val3.unk_0D = textObjId; + battleInput->effect.unk_04_val3.frameType = 3; + battleInput->effect.unk_04_val3.unk_10 = 1; return param1; } static int ov16_0226A528(BattleInput *battleInput, int param1, int param2) { - UnkStruct_ov16_02260F14 *v0; - u8 v1[4]; + BattleInputPokemonMenu *pokemonMenu; + u8 moveRange[4]; - v0 = &battleInput->unk_1A.val3; + pokemonMenu = &battleInput->menu.val3; - ov16_0226B20C(battleInput, v1, 1); + ov16_0226B20C(battleInput, moveRange, 1); switch (param1) { case 0xffffffff: default: return param1; case 1: - if (v1[2 - 2] == 0) { + if (moveRange[2 - 2] == 0) { return 0xffffffff; } break; case 2: - if (v1[3 - 2] == 0) { + if (moveRange[3 - 2] == 0) { return 0xffffffff; } break; case 3: - if (v1[4 - 2] == 0) { + if (moveRange[4 - 2] == 0) { return 0xffffffff; } break; case 4: - if (v1[5 - 2] == 0) { + if (moveRange[5 - 2] == 0) { return 0xffffffff; } break; case 0xff: ov16_0226B318(battleInput, NELEMS(Unk_ov16_02270A0C) - 1); - ov16_0226B2BC(ov16_0226B390, battleInput); + BattleInputEffect_AddTask(EffectTask_ButtonDown, battleInput); - battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022703D4[NELEMS(Unk_ov16_022703D4) - 1]; - battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_0227033C[NELEMS(Unk_ov16_0227033C) - 1]; - battleInput->unk_67C.unk_04_val3.unk_0C = 4; - battleInput->unk_67C.unk_04_val3.unk_08 = param1; - battleInput->unk_67C.unk_04_val3.unk_0D = 4; - battleInput->unk_67C.unk_04_val3.unk_0F = 3; - battleInput->unk_67C.unk_04_val3.unk_10 = 1; + battleInput->effect.unk_04_val3.unk_00 = Unk_ov16_022703D4[NELEMS(Unk_ov16_022703D4) - 1]; + battleInput->effect.unk_04_val3.unk_04 = &Unk_ov16_0227033C[NELEMS(Unk_ov16_0227033C) - 1]; + battleInput->effect.unk_04_val3.unk_0C = 4; + battleInput->effect.unk_04_val3.unk_08 = param1; + battleInput->effect.unk_04_val3.unk_0D = 4; + battleInput->effect.unk_04_val3.frameType = 3; + battleInput->effect.unk_04_val3.unk_10 = 1; return param1; } @@ -2362,9 +2326,9 @@ static int ov16_0226A528(BattleInput *battleInput, int param1, int param2) } ov16_0226B314(battleInput, param1); - ov16_0226B2BC(ov16_0226B780, battleInput); + BattleInputEffect_AddTask(EffectTask_PokemonButtonDown, battleInput); - battleInput->unk_67C.unk_04_val4.unk_1C = param1; + battleInput->effect.pokemonSelect.unk_1C = param1; return param1; } @@ -2380,33 +2344,33 @@ static int ov16_0226A634(BattleInput *battleInput, int param1, int param2) } ov16_0226B318(battleInput, param2); - ov16_0226B2BC(ov16_0226B390, battleInput); + BattleInputEffect_AddTask(EffectTask_ButtonDown, battleInput); - battleInput->unk_67C.unk_04_val3.unk_00 = Unk_ov16_022701F4; - battleInput->unk_67C.unk_04_val3.unk_04 = &Unk_ov16_022701D0[0]; - battleInput->unk_67C.unk_04_val3.unk_0C = 6; - battleInput->unk_67C.unk_04_val3.unk_08 = param1; - battleInput->unk_67C.unk_04_val3.unk_0D = 0; - battleInput->unk_67C.unk_04_val3.unk_0F = 3; - battleInput->unk_67C.unk_04_val3.unk_10 = 0; + battleInput->effect.unk_04_val3.unk_00 = Unk_ov16_022701F4; + battleInput->effect.unk_04_val3.unk_04 = &Unk_ov16_022701D0[0]; + battleInput->effect.unk_04_val3.unk_0C = 6; + battleInput->effect.unk_04_val3.unk_08 = param1; + battleInput->effect.unk_04_val3.unk_0D = 0; + battleInput->effect.unk_04_val3.frameType = 3; + battleInput->effect.unk_04_val3.unk_10 = 0; return param1; } static void ov16_0226A698(BattleInput *battleInput) { - SpriteRenderer *v0; - SpriteGfxHandler *v1; + SpriteRenderer *spriteRenderer; + SpriteGfxHandler *gfxHandler; int v2, v3, v4; PaletteData *v5; - v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); v5 = BattleSystem_GetPaletteData(battleInput->battleSystem); - sub_0200CD7C(v5, 3, v0, v1, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); - sub_0200CE0C(v0, v1, 19, PokeIcon32KCellsFileIndex(), 0, 20021); - sub_0200CE3C(v0, v1, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); + sub_0200CD7C(v5, 3, spriteRenderer, gfxHandler, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); + sub_0200CE0C(spriteRenderer, gfxHandler, 19, PokeIcon32KCellsFileIndex(), 0, 20021); + sub_0200CE3C(spriteRenderer, gfxHandler, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); } static void ov16_0226A718(BattleInput *battleInput) @@ -2440,8 +2404,8 @@ static void ov16_0226A768(BattleInput *battleInput) static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5) { - SpriteRenderer *v0; - SpriteGfxHandler *v1; + SpriteRenderer *spriteRenderer; + SpriteGfxHandler *gfxHandler; u32 v2; SpriteTemplate v3; CellActorData *v4; @@ -2473,16 +2437,16 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, i return NULL; } - v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - sub_0200CBDC(v0, v1, 19, Pokemon_IconSpriteIndex(param1), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); + sub_0200CBDC(spriteRenderer, gfxHandler, 19, Pokemon_IconSpriteIndex(param1), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); v3 = Unk_ov16_022704B0; v3.resources[0] = v2; v3.x = Unk_ov16_02270304[v5][0]; v3.y = Unk_ov16_02270304[v5][1]; - v4 = SpriteActor_LoadResources(v0, v1, &v3); + v4 = SpriteActor_LoadResources(spriteRenderer, gfxHandler, &v3); sub_0200D500(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(param1)); @@ -2524,51 +2488,51 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, i static void ov16_0226A928(SysTask *param0, void *param1) { - CellActorData *v0 = param1; - sub_0200D330(v0); + CellActorData *actor = param1; + sub_0200D330(actor); } static int ov16_0226A934(u8 param0) { - int v0; + int animationState; switch (param0) { case 0: default: - v0 = 0; + animationState = 0; break; case 1: - v0 = 1; + animationState = 1; break; case 2: - v0 = 3; + animationState = 3; break; case 3: - v0 = 2; + animationState = 2; break; } - return v0; + return animationState; } -static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3) +static void ov16_0226A95C(const Strbuf *str, int param1, int *param2, int *param3) { - int v0, v1; + int width, charWidth; - v0 = Font_CalcStrbufWidth(param1, param0, 0); - v1 = v0 / 8; + width = Font_CalcStrbufWidth(param1, str, 0); + charWidth = width / 8; - if (FX_ModS32(v0, 8) != 0) { - v1++; + if (FX_ModS32(width, 8) != 0) { + charWidth++; } - *param2 = v0; - *param3 = v1; + *param2 = width; + *param3 = charWidth; } static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *str, enum Font param3, TextColor param4, int param5, int param6, int x, int y, int param9, BattleInputTextImage *param10) { - UnkStruct_020127E8 v0; + FontOAMInitData fontInit; Window window; SpriteManagerAllocation spriteManAlloc; int v3; @@ -2606,20 +2570,20 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe y += (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT) - 8; - v0.unk_00 = battleInput->unk_4C8; - v0.unk_04 = &window; - v0.unk_08 = sub_0200D9B0(v6); - v0.unk_0C = sub_0200D04C(v6, param6); - v0.unk_10 = NULL; - v0.unk_14 = spriteManAlloc.unk_04; - v0.unk_18 = x; - v0.unk_1C = y; - v0.unk_20 = 0; - v0.unk_24 = 100; - v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB; - v0.unk_2C = 5; - - fontOAM = sub_020127E8(&v0); + fontInit.unk_00 = battleInput->unk_4C8; + fontInit.unk_04 = &window; + fontInit.unk_08 = sub_0200D9B0(v6); + fontInit.unk_0C = sub_0200D04C(v6, param6); + fontInit.unk_10 = NULL; + fontInit.unk_14 = spriteManAlloc.unk_04; + fontInit.unk_18 = x; + fontInit.unk_1C = y; + fontInit.unk_20 = 0; + fontInit.unk_24 = 100; + fontInit.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB; + fontInit.unk_2C = 5; + + fontOAM = sub_020127E8(&fontInit); sub_02012AC0(fontOAM, param5); sub_020128C4(fontOAM, x, y); @@ -2648,7 +2612,7 @@ static void BattleInput_DestroyTextObjects(BattleInput *battleInput) static void ov16_0226AAF8(BattleInput *battleInput) { - u8 v0[4], v1[4]; + u8 moveRange[4], v1[4]; int j, i; u16 *v4, *v5; BgConfig *bgConfig; @@ -2656,9 +2620,9 @@ static void ov16_0226AAF8(BattleInput *battleInput) bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); v4 = Bg_GetTilemapBuffer(bgConfig, 5); - ov16_0226B20C(battleInput, v0, 0); + ov16_0226B20C(battleInput, moveRange, 0); - if (v0[0] == 1) { + if (moveRange[0] == 1) { ov16_0226B264(battleInput, 1, v1, 0); if (v1[3 - 1] == 1) { @@ -2682,7 +2646,7 @@ static void ov16_0226AAF8(BattleInput *battleInput) } } - if (v0[1] == 1) { + if (moveRange[1] == 1) { ov16_0226B264(battleInput, 2, v1, 0); if (v1[3 - 1] == 1) { @@ -2707,33 +2671,33 @@ static void ov16_0226AAF8(BattleInput *battleInput) } } -static MoveDisplayObject *ov16_0226ABD4(BattleInput *battleInput, int param1) +static MoveDisplayObject *BattleInput_GetBattlerMoveDisplayObject(BattleInput *battleInput, int battlerId) { - if (param1 >= 2) { - param1 -= 2; + if (battlerId >= 2) { + battlerId -= 2; } - return &battleInput->unk_68[param1]; + return &battleInput->moveDisplayObj[battlerId]; } -static void ov16_0226ABE8(BattleInput *battleInput) +static void BattleInput_FreeMoveDisplayObjects(BattleInput *battleInput) { int j, i; for (i = 0; i < 4; i++) { - for (j = 0; j < 4; j++) { - Heap_FreeToHeap(battleInput->unk_68[i].typeIcon[j]); + for (j = 0; j < LEARNED_MOVES_MAX; j++) { + Heap_FreeToHeap(battleInput->moveDisplayObj[i].typeIcon[j]); - if (battleInput->unk_68[i].moveNameText[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].moveNameText[j].unk_00); + if (battleInput->moveDisplayObj[i].moveNameText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->moveDisplayObj[i].moveNameText[j].unk_00); } - if (battleInput->unk_68[i].curPPText[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].curPPText[j].unk_00); + if (battleInput->moveDisplayObj[i].curPPText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->moveDisplayObj[i].curPPText[j].unk_00); } - if (battleInput->unk_68[i].maxPPText[j].unk_00.pixels != NULL) { - Window_Remove(&battleInput->unk_68[i].maxPPText[j].unk_00); + if (battleInput->moveDisplayObj[i].maxPPText[j].unk_00.pixels != NULL) { + Window_Remove(&battleInput->moveDisplayObj[i].maxPPText[j].unk_00); } } } @@ -2742,8 +2706,8 @@ static void ov16_0226ABE8(BattleInput *battleInput) void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo *moveDisplay) { MoveDisplayObject *moveDisplayObj; - void *v1; - NNSG2dCharacterData *v2; + void *charData; + NNSG2dCharacterData *charDataNNS; int i, v3, moveType; Strbuf *moveName; Strbuf *v7; @@ -2754,7 +2718,7 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * MessageLoader *v12; v12 = BattleSystem_GetMessageLoader(battleInput->battleSystem); - moveDisplayObj = ov16_0226ABD4(battleInput, param1); + moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, param1); v3 = sub_0208C098(6); v9 = MessageLoader_GetNewStrbuf(v12, pl_msg_00000368_00938); // PP v10 = BattleSystem_StringTemplate(battleInput->battleSystem); @@ -2764,9 +2728,9 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * for (i = 0; i < LEARNED_MOVES_MAX; i++) { if ((moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) && (moveDisplay->move[i] != 0)) { moveType = MoveTable_LoadParam(moveDisplay->move[i], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(sub_0207C944(), sub_0207C908(moveType), 1, &v2, HEAP_ID_BATTLE); - MI_CpuCopy32(v2->pRawData, moveDisplayObj->typeIcon[i], v3); - Heap_FreeToHeap(v1); + charData = Graphics_GetCharData(sub_0207C944(), sub_0207C908(moveType), 1, &charDataNNS, HEAP_ID_BATTLE); + MI_CpuCopy32(charDataNNS->pRawData, moveDisplayObj->typeIcon[i], v3); + Heap_FreeToHeap(charData); } if ((moveDisplayObj->moveNameText[i].unk_00.pixels == NULL) || ((moveDisplay->move[i] != moveDisplayObj->moveDisplay.move[i]) && (moveDisplay->move[i] != 0))) { @@ -2801,37 +2765,37 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor param4) { - int v0, v1; + int length, charLength; - ov16_0226A95C(param1, param2, &v0, &v1); + ov16_0226A95C(param1, param2, &length, &charLength); - param3->unk_12 = v0; - param3->unk_10 = v1; + param3->unk_12 = length; + param3->unk_10 = charLength; if (param3->unk_00.pixels != NULL) { Window_Remove(¶m3->unk_00); } Window_Init(¶m3->unk_00); - Window_AddToTopLeftCorner(BattleSystem_GetBgConfig(battleInput->battleSystem), ¶m3->unk_00, v1, 16 / 8, 0, 0); + Window_AddToTopLeftCorner(BattleSystem_GetBgConfig(battleInput->battleSystem), ¶m3->unk_00, charLength, 16 / 8, 0, 0); Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); } static void BattleInput_CreateTypeIcons(BattleInput *battleInput) { int i; - SpriteRenderer *v1; - SpriteGfxHandler *v2; + SpriteRenderer *renderer; + SpriteGfxHandler *gfxHandler; SpriteTemplate typeIconTemplate; - UnkStruct_ov16_02260C00 *v4; + BattleInputMoveMenu *v4; int type; int v6; MoveDisplayObject *moveDisplayObj; - v4 = &battleInput->unk_1A.val2; - v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - moveDisplayObj = ov16_0226ABD4(battleInput, battleInput->unk_66A); + v4 = &battleInput->menu.moveMenu; + renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, battleInput->unk_66A); typeIconTemplate = sTypeIconSpriteTemplate; for (i = 0; i < LEARNED_MOVES_MAX; i++) { @@ -2843,7 +2807,7 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) typeIconTemplate.x = sTypeIconPositions[i][0]; typeIconTemplate.y = sTypeIconPositions[i][1]; - battleInput->actorTypeIcons[i] = sub_0207CA58(v1, v2, type, &typeIconTemplate); + battleInput->actorTypeIcons[i] = sub_0207CA58(renderer, gfxHandler, type, &typeIconTemplate); sub_0200D500(battleInput->actorTypeIcons[i], typeIconTemplate.x, typeIconTemplate.y, ((192 + 80) << FX32_SHIFT)); @@ -2861,11 +2825,11 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) static void BattleInput_DestroyTypeIcons(BattleInput *battleInput) { int i; - SpriteRenderer *v1; - SpriteGfxHandler *v2; + SpriteRenderer *renderer; + SpriteGfxHandler *gfxHandler; - v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); for (i = 0; i < 4; i++) { if (battleInput->actorTypeIcons[i] != NULL) { @@ -2878,16 +2842,16 @@ static void BattleInput_DestroyTypeIcons(BattleInput *battleInput) static void ov16_0226B028(BattleInput *battleInput) { int i; - SpriteRenderer *v1; - SpriteGfxHandler *v2; + SpriteRenderer *renderer; + SpriteGfxHandler *gfxHandler; - v1 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); for (i = 0; i < 4; i++) { if (battleInput->unk_5FC[i] != NULL) { sub_0207CB00(battleInput->unk_5FC[i]); - sub_0207CAF8(v2, 20029 + i); + sub_0207CAF8(gfxHandler, 20029 + i); battleInput->unk_5FC[i] = NULL; } } @@ -2900,30 +2864,29 @@ static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2) static void ov16_0226B088(BattleInput *battleInput, int param1) { - PaletteData *v0; + PaletteData *palette; int i; - v0 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - for (i = param1; i < 4; i++) { + for (i = param1; i < LEARNED_MOVES_MAX; i++) { ov16_0226B31C(battleInput, &Unk_ov16_0227022C[i], &Unk_ov16_02270274[i], 3, 0); - PaletteData_LoadBuffer(v0, &battleInput->unk_58[0xe * 16], 1, (8 + i) * 16, 0x20); + PaletteData_LoadBuffer(palette, &battleInput->unk_58[0xe * 16], 1, (8 + i) * 16, 0x20); } } static void ov16_0226B0DC(BattleInput *battleInput, int param1) { - PaletteData *v0; - int v1; - const u8 v2[] = { 6, 0xc, 0xd, 5 }; + PaletteData *palette; + const u8 paletteNo[] = { 6, 0xc, 0xd, 5 }; BgConfig *v3; v3 = BattleSystem_GetBgConfig(battleInput->battleSystem); - v0 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); ov16_0226B31C(battleInput, &Unk_ov16_022701FC[param1], &Unk_ov16_022702C4[param1], 4, 0); - PaletteData_LoadBuffer(v0, &battleInput->unk_58[0xe * 16], 1, v2[param1] * 16, 0x20); + PaletteData_LoadBuffer(palette, &battleInput->unk_58[0xe * 16], 1, paletteNo[param1] * 16, 0x20); Bg_ScheduleTilemapTransfer(v3, 4); Bg_FillTilemapRect(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17); Bg_ScheduleTilemapTransfer(v3, 5); @@ -2931,9 +2894,7 @@ static void ov16_0226B0DC(BattleInput *battleInput, int param1) static void ov16_0226B198(void) { - int i; - - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { if (4 + i != 6) { Bg_ToggleLayer(4 + i, 0); } else { @@ -2964,18 +2925,18 @@ static void BattleInput_DestroyMenuObjects(BattleInput *battleInput) static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2) { - UnkStruct_ov16_02260F14 *v0; + BattleInputPokemonMenu *pokemonMenu; int i; - u8 v2[6]; + u8 battlerIdBuffer[6]; int v3; - v0 = &battleInput->unk_1A.val3; - ov16_0223F858(battleInput->battleSystem, v2); + pokemonMenu = &battleInput->menu.val3; + ov16_0223F858(battleInput->battleSystem, battlerIdBuffer); for (i = 0; i < 4; i++) { - v3 = v2[2 + i]; + v3 = battlerIdBuffer[2 + i]; - if ((param2 == 1) && (v0->unk_00[v3].unk_01_2 == 0)) { + if ((param2 == 1) && (pokemonMenu->unk_00[v3].unk_01_2 == 0)) { param1[i] = 0; } else { param1[i] = Unk_ov16_022705B0[battleInput->unk_66C][i]; @@ -2985,10 +2946,10 @@ static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2) static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int param3) { - UnkStruct_ov16_02260F14 *v0; + BattleInputPokemonMenu *pokemonMenu; int i; - v0 = &battleInput->unk_1A.val3; + pokemonMenu = &battleInput->menu.val3; switch (battleInput->unk_66C) { case 0: @@ -3010,29 +2971,29 @@ static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int } } -static void ov16_0226B2BC(SysTaskFunc param0, BattleInput *battleInput) +static void BattleInputEffect_AddTask(SysTaskFunc task, BattleInput *battleInput) { - GF_ASSERT(battleInput->unk_0C == NULL); + GF_ASSERT(battleInput->effectTask == NULL); - MI_CpuClear8(&battleInput->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); - battleInput->unk_0C = SysTask_Start(param0, battleInput, 1300); + MI_CpuClear8(&battleInput->effect, sizeof(BattleInputEffect)); + battleInput->effectTask = SysTask_Start(task, battleInput, 1300); } -static void ov16_0226B2F0(BattleInput *battleInput) +static void BattleInput_EffectTaskDone(BattleInput *battleInput) { - if (battleInput->unk_0C != NULL) { - SysTask_Done(battleInput->unk_0C); - battleInput->unk_0C = NULL; - MI_CpuClear8(&battleInput->unk_67C, sizeof(UnkStruct_ov16_02268A14_sub3)); + if (battleInput->effectTask != NULL) { + SysTask_Done(battleInput->effectTask); + battleInput->effectTask = NULL; + MI_CpuClear8(&battleInput->effect, sizeof(BattleInputEffect)); } } -static void inline_ov16_0226B314(SysTaskFunc param0, BattleInput *battleInput) +static void inline_ov16_0226B314(SysTaskFunc task, BattleInput *battleInput) { GF_ASSERT(battleInput->unk_10 == NULL); - MI_CpuClear8(&battleInput->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); - battleInput->unk_10 = SysTask_Start(param0, battleInput, 1320); + MI_CpuClear8(&battleInput->effectColor, sizeof(BattleInputEffectColor)); + battleInput->unk_10 = SysTask_Start(task, battleInput, 1320); } static void inline_ov16_0226B318_1_sub(BattleInput *battleInput) @@ -3040,62 +3001,51 @@ static void inline_ov16_0226B318_1_sub(BattleInput *battleInput) if (battleInput->unk_10 != NULL) { SysTask_Done(battleInput->unk_10); battleInput->unk_10 = NULL; - MI_CpuClear8(&battleInput->unk_6A0, sizeof(UnkStruct_ov16_02268A14_sub4)); + MI_CpuClear8(&battleInput->effectColor, sizeof(BattleInputEffectColor)); } } static void ov16_0226B314(BattleInput *battleInput, int param1) { return; - - inline_ov16_0226B314(inline_ov16_0226B314_1, battleInput); - battleInput->unk_6A0.unk_00 = param1; } static void ov16_0226B318(BattleInput *battleInput, int param1) { return; - - if (param1 == 0xff) { - return; - } - - inline_ov16_0226B314(inline_ov16_0226B318_1, battleInput); - battleInput->unk_6A0.unk_09 = param1; } -static void inline_ov16_0226B318_1(SysTask *param0, void *data) +static void inline_ov16_0226B318_1(SysTask *task, void *data) { BattleInput *battleInput = data; - UnkStruct_ov16_02268A14_sub4 *v1; - BgConfig *v2; + BattleInputEffectColor *effectColor; PaletteData *v3; int v4, v5; - v1 = &battleInput->unk_6A0; + effectColor = &battleInput->effectColor; v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; - switch (v1->unk_08) { + switch (effectColor->unk_08) { case 0: - v1->unk_04 = (10 << 8); - v1->unk_06 = -((10 << 8) / 2); - v1->unk_04 -= v1->unk_06; - v1->unk_08++; + effectColor->unk_04 = (10 << 8); + effectColor->unk_06 = -((10 << 8) / 2); + effectColor->unk_04 -= effectColor->unk_06; + effectColor->unk_08++; case 1: - v1->unk_04 += v1->unk_06; + effectColor->unk_04 += effectColor->unk_06; - if ((v1->unk_06 >= 0) && (v1->unk_04 >= (16 << 8))) { - v1->unk_04 = 16 << 8; + if ((effectColor->unk_06 >= 0) && (effectColor->unk_04 >= (16 << 8))) { + effectColor->unk_04 = 16 << 8; v5 = 1; - } else if ((v1->unk_06 < 0) && (v1->unk_04 <= 0)) { - v1->unk_04 = 0; + } else if ((effectColor->unk_06 < 0) && (effectColor->unk_04 <= 0)) { + effectColor->unk_04 = 0; v5 = 1; } - PaletteData_Blend(v3, 1, v1->unk_09 * 16, 16, (v1->unk_04 >> 8) / 2, 0x7fff); - PaletteData_Blend(v3, 1, v1->unk_09 * 16 + 1, 1, v1->unk_04 >> 8, 0x7b1a); - PaletteData_Blend(v3, 1, v1->unk_09 * 16 + 0xa, 1, v1->unk_04 >> 8, 0x4634); + PaletteData_Blend(v3, 1, effectColor->unk_09 * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); + PaletteData_Blend(v3, 1, effectColor->unk_09 * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); + PaletteData_Blend(v3, 1, effectColor->unk_09 * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); if (v5 == 1) { inline_ov16_0226B318_1_sub(battleInput); @@ -3106,43 +3056,42 @@ static void inline_ov16_0226B318_1(SysTask *param0, void *data) } } -static void inline_ov16_0226B314_1(SysTask *param0, void *data) +static void inline_ov16_0226B314_1(SysTask *task, void *data) { BattleInput *battleInput = data; - UnkStruct_ov16_02268A14_sub4 *v1; - BgConfig *v2; + BattleInputEffectColor *effectColor; PaletteData *v3; int i, v5; u8 v6[4]; - v1 = &battleInput->unk_6A0; + effectColor = &battleInput->effectColor; v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; - switch (v1->unk_08) { + switch (effectColor->unk_08) { case 0: - v1->unk_04 = (10 << 8); - v1->unk_06 = -((10 << 8) / 2); - v1->unk_04 -= v1->unk_06; - v1->unk_08++; + effectColor->unk_04 = (10 << 8); + effectColor->unk_06 = -((10 << 8) / 2); + effectColor->unk_04 -= effectColor->unk_06; + effectColor->unk_08++; case 1: - v1->unk_04 += v1->unk_06; + effectColor->unk_04 += effectColor->unk_06; - if ((v1->unk_06 >= 0) && (v1->unk_04 >= (16 << 8))) { - v1->unk_04 = 16 << 8; + if ((effectColor->unk_06 >= 0) && (effectColor->unk_04 >= (16 << 8))) { + effectColor->unk_04 = 16 << 8; v5 = 1; - } else if ((v1->unk_06 < 0) && (v1->unk_04 <= 0)) { - v1->unk_04 = 0; + } else if ((effectColor->unk_06 < 0) && (effectColor->unk_04 <= 0)) { + effectColor->unk_04 = 0; v5 = 1; } - ov16_0226B264(battleInput, v1->unk_00, v6, 1); + ov16_0226B264(battleInput, effectColor->unk_00, v6, 1); for (i = 0; i < 4; i++) { if (v6[i] == 1) { - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16, 16, (v1->unk_04 >> 8) / 2, 0x7fff); - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 1, 1, v1->unk_04 >> 8, 0x7b1a); - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 0xa, 1, v1->unk_04 >> 8, 0x4634); + PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); + PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); + PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); } } @@ -3157,13 +3106,13 @@ static void inline_ov16_0226B314_1(SysTask *param0, void *data) static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4) { int j, i; - BgConfig *v2; + BgConfig *bgConfig; u16 *v3, *v4; u16 *v5, *v6; int v7; - v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); - v3 = Bg_GetTilemapBuffer(v2, 4); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + v3 = Bg_GetTilemapBuffer(bgConfig, 4); v5 = battleInput->unk_3C[param3]; v7 = param1[param4]; @@ -3176,81 +3125,79 @@ static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const Unk } } - Bg_ScheduleTilemapTransfer(v2, 4); + Bg_ScheduleTilemapTransfer(bgConfig, 4); } -static void ov16_0226B390(SysTask *param0, void *param1) +static void EffectTask_ButtonDown(SysTask *task, void *data) { - BattleInput *battleInput = param1; - BgConfig *v1; - int v2, v3; - - v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); + BattleInput *battleInput = data; + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + int x, y; - switch (battleInput->unk_67C.unk_00) { + switch (battleInput->effect.state) { case 0: - ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); - sub_020129A4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, v2, v3 + -2); + ov16_0226B31C(battleInput, battleInput->effect.unk_04_val3.unk_00, battleInput->effect.unk_04_val3.unk_04, battleInput->effect.unk_04_val3.unk_0C, 2); + sub_020129A4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, x, y + -2); - if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, -2); + if ((battleInput->effect.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E] != NULL)) { + sub_0200D5DC(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, -2); } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; case 1: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 <= 0) { + if (battleInput->effect.wait <= 0) { break; } - battleInput->unk_67C.unk_02 = 0; - battleInput->unk_67C.unk_00++; + battleInput->effect.wait = 0; + battleInput->effect.state++; case 2: - ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); - sub_020129A4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[battleInput->unk_67C.unk_04_val3.unk_0D].fontOAM, v2, v3 + 1); + ov16_0226B31C(battleInput, battleInput->effect.unk_04_val3.unk_00, battleInput->effect.unk_04_val3.unk_04, battleInput->effect.unk_04_val3.unk_0C, 1); + sub_020129A4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, x, y + 1); - if ((battleInput->unk_67C.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(battleInput->unk_60C[battleInput->unk_67C.unk_04_val3.unk_0E], 0, 1); + if ((battleInput->effect.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E] != NULL)) { + sub_0200D5DC(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, 1); } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; default: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 > 0) { - ov16_0226B1C4(battleInput, battleInput->unk_67C.unk_04_val3.unk_10, 0); - ov16_0226B2F0(battleInput); + if (battleInput->effect.wait > 0) { + ov16_0226B1C4(battleInput, battleInput->effect.unk_04_val3.unk_10, 0); + BattleInput_EffectTaskDone(battleInput); return; } break; } } -static void ov16_0226B4E0(SysTask *param0, void *param1) +static void EffectTask_MoveButtonDown(SysTask *task, void *data) { - BattleInput *battleInput = param1; - BgConfig *v1; - int v2, v3; + BattleInput *battleInput = data; + BgConfig *bgConfig; + int x, y; int v4, v5, v6; - int v7, v8, v9; - UnkStruct_ov16_02260C00 *v10; + int v7, v8, moveNo; + BattleInputMoveMenu *v10; - v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); - v10 = &battleInput->unk_1A.val2; + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + v10 = &battleInput->menu.moveMenu; - switch (battleInput->unk_67C.unk_04_val3.unk_08) { + switch (battleInput->effect.unk_04_val3.unk_08) { case 1: v4 = 0; v5 = 9; v6 = 5; v7 = 0; v8 = 0; - v9 = v10->unk_00[0]; + moveNo = v10->unk_00[0]; break; case 2: v4 = 1; @@ -3258,7 +3205,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) v6 = 6; v7 = 1; v8 = 1; - v9 = v10->unk_00[1]; + moveNo = v10->unk_00[1]; break; case 3: v4 = 2; @@ -3266,7 +3213,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) v6 = 7; v7 = 2; v8 = 2; - v9 = v10->unk_00[2]; + moveNo = v10->unk_00[2]; break; case 4: v4 = 3; @@ -3274,7 +3221,7 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) v6 = 8; v7 = 3; v8 = 3; - v9 = v10->unk_00[3]; + moveNo = v10->unk_00[3]; break; case 0xff: default: @@ -3283,23 +3230,23 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) v6 = 0; v7 = 0; v8 = 0; - v9 = 0; + moveNo = 0; break; } - switch (battleInput->unk_67C.unk_00) { + switch (battleInput->effect.state) { case 0: - ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 2); + ov16_0226B31C(battleInput, battleInput->effect.unk_04_val3.unk_00, battleInput->effect.unk_04_val3.unk_04, battleInput->effect.unk_04_val3.unk_0C, 2); - if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(battleInput->textObj[v4].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v4].fontOAM, v2, v3 + -2); - sub_020129A4(battleInput->textObj[v5].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v5].fontOAM, v2, v3 + -2); - sub_020129A4(battleInput->textObj[v6].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + -2); + if (battleInput->effect.unk_04_val3.unk_08 != 0xff) { + sub_020129A4(battleInput->textObj[v4].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v4].fontOAM, x, y + -2); + sub_020129A4(battleInput->textObj[v5].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v5].fontOAM, x, y + -2); + sub_020129A4(battleInput->textObj[v6].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v6].fontOAM, x, y + -2); - if (v9 != 0) { + if (moveNo != 0) { sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, -2); if (battleInput->unk_5FC[v7] != NULL) { @@ -3307,33 +3254,33 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) } } } else { - sub_020129A4(battleInput->textObj[4].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[4].fontOAM, v2, v3 + -2); + sub_020129A4(battleInput->textObj[4].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[4].fontOAM, x, y + -2); } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; case 1: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 <= 0) { + if (battleInput->effect.wait <= 0) { break; } - battleInput->unk_67C.unk_02 = 0; - battleInput->unk_67C.unk_00++; + battleInput->effect.wait = 0; + battleInput->effect.state++; case 2: - ov16_0226B31C(battleInput, battleInput->unk_67C.unk_04_val3.unk_00, battleInput->unk_67C.unk_04_val3.unk_04, battleInput->unk_67C.unk_04_val3.unk_0C, 1); + ov16_0226B31C(battleInput, battleInput->effect.unk_04_val3.unk_00, battleInput->effect.unk_04_val3.unk_04, battleInput->effect.unk_04_val3.unk_0C, 1); - if (battleInput->unk_67C.unk_04_val3.unk_08 != 0xff) { - sub_020129A4(battleInput->textObj[v4].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v4].fontOAM, v2, v3 + 1); - sub_020129A4(battleInput->textObj[v5].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v5].fontOAM, v2, v3 + 1); - sub_020129A4(battleInput->textObj[v6].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[v6].fontOAM, v2, v3 + 1); + if (battleInput->effect.unk_04_val3.unk_08 != 0xff) { + sub_020129A4(battleInput->textObj[v4].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v4].fontOAM, x, y + 1); + sub_020129A4(battleInput->textObj[v5].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v5].fontOAM, x, y + 1); + sub_020129A4(battleInput->textObj[v6].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[v6].fontOAM, x, y + 1); - if (v9 != 0) { + if (moveNo != 0) { sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, 1); if (battleInput->unk_5FC[v7] != NULL) { @@ -3341,44 +3288,44 @@ static void ov16_0226B4E0(SysTask *param0, void *param1) } } } else { - sub_020129A4(battleInput->textObj[4].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[4].fontOAM, v2, v3 + 1); + sub_020129A4(battleInput->textObj[4].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[4].fontOAM, x, y + 1); } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; default: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 > 0) { + if (battleInput->effect.wait > 0) { ov16_0226B1C4(battleInput, 1, 1); - ov16_0226B2F0(battleInput); + BattleInput_EffectTaskDone(battleInput); return; } break; } } -static void ov16_0226B780(SysTask *param0, void *param1) +static void EffectTask_PokemonButtonDown(SysTask *task, void *data) { - BattleInput *battleInput = param1; - BgConfig *v1; - int i, v2, v3; + BattleInput *battleInput = data; + BgConfig *bgConfig; + int i, x, y; u8 v4[4]; - v1 = BattleSystem_GetBgConfig(battleInput->battleSystem); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - switch (battleInput->unk_67C.unk_00) { + switch (battleInput->effect.state) { case 0: - ov16_0226B264(battleInput, battleInput->unk_67C.unk_04_val4.unk_1C, v4, 1); + ov16_0226B264(battleInput, battleInput->effect.pokemonSelect.unk_1C, v4, 1); for (i = 0; i < 4; i++) { if (v4[i] == 1) { ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 2); if (battleInput->textObj[0 + i].fontOAM != NULL) { - sub_020129A4(battleInput->textObj[0 + i].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[0 + i].fontOAM, v2, v3 + -2); + sub_020129A4(battleInput->textObj[0 + i].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[0 + i].fontOAM, x, y + -2); } if (battleInput->unk_60C[i] != NULL) { @@ -3387,27 +3334,27 @@ static void ov16_0226B780(SysTask *param0, void *param1) } } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; case 1: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 <= 0) { + if (battleInput->effect.wait <= 0) { break; } - battleInput->unk_67C.unk_02 = 0; - battleInput->unk_67C.unk_00++; + battleInput->effect.wait = 0; + battleInput->effect.state++; case 2: - ov16_0226B264(battleInput, battleInput->unk_67C.unk_04_val4.unk_1C, v4, 1); + ov16_0226B264(battleInput, battleInput->effect.pokemonSelect.unk_1C, v4, 1); for (i = 0; i < 4; i++) { if (v4[i] == 1) { ov16_0226B31C(battleInput, Unk_ov16_022703D4[i], &Unk_ov16_0227033C[i], 4, 1); if (battleInput->textObj[0 + i].fontOAM != NULL) { - sub_020129A4(battleInput->textObj[0 + i].fontOAM, &v2, &v3); - sub_020128C4(battleInput->textObj[0 + i].fontOAM, v2, v3 + 1); + sub_020129A4(battleInput->textObj[0 + i].fontOAM, &x, &y); + sub_020128C4(battleInput->textObj[0 + i].fontOAM, x, y + 1); } if (battleInput->unk_60C[i] != NULL) { @@ -3416,19 +3363,19 @@ static void ov16_0226B780(SysTask *param0, void *param1) } } - battleInput->unk_67C.unk_00++; + battleInput->effect.state++; break; case 3: - battleInput->unk_67C.unk_02++; + battleInput->effect.wait++; - if (battleInput->unk_67C.unk_02 > 0) { - battleInput->unk_67C.unk_02 = 0; - battleInput->unk_67C.unk_00++; + if (battleInput->effect.wait > 0) { + battleInput->effect.wait = 0; + battleInput->effect.state++; } break; default: ov16_0226B1C4(battleInput, 1, 1); - ov16_0226B2F0(battleInput); + BattleInput_EffectTaskDone(battleInput); return; } } @@ -3467,36 +3414,36 @@ static TextColor GetPPTextColor(int pp, int maxPp) return TEXT_COLOR(1, 2, 0); } -static void ov16_0226B988(SysTask *task, void *param1) +static void ov16_0226B988(SysTask *task, void *data) { - UnkStruct_ov16_0226B988 *v0 = param1; - BgConfig *bgConfig = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); + BattleMenuSlideIn *menuSlideIn = data; + BgConfig *bgConfig = BattleSystem_GetBgConfig(menuSlideIn->battleInput->battleSystem); - switch (v0->unk_13) { + switch (menuSlideIn->state) { case 0: - v0->unk_08 += ((255 * 100) / 4); - v0->unk_0A -= ((40 * 100) / 4); - v0->unk_0C = ((255 * 100) - v0->unk_08) / 100; - v0->unk_0E = -v0->unk_0A / 100; - - if ((v0->unk_08 >= 0) || (v0->unk_0A <= 0)) { - v0->unk_08 = 0; - v0->unk_0A = (18 * 8); - v0->unk_0C = 0 / 100; - v0->unk_0E = 0 / 100; - v0->unk_13++; + menuSlideIn->unk_08 += ((255 * 100) / 4); + menuSlideIn->unk_0A -= ((40 * 100) / 4); + menuSlideIn->unk_0C = ((255 * 100) - menuSlideIn->unk_08) / 100; + menuSlideIn->unk_0E = -menuSlideIn->unk_0A / 100; + + if ((menuSlideIn->unk_08 >= 0) || (menuSlideIn->unk_0A <= 0)) { + menuSlideIn->unk_08 = 0; + menuSlideIn->unk_0A = (18 * 8); + menuSlideIn->unk_0C = 0 / 100; + menuSlideIn->unk_0E = 0 / 100; + menuSlideIn->state++; } break; case 1: - v0->battleInput->unk_66E = 0; - SysTask_Done(v0->unk_04); + menuSlideIn->battleInput->touchDisabled = FALSE; + SysTask_Done(menuSlideIn->unk_04); DisableHBlank(); GXS_SetVisibleWnd(GX_WNDMASK_NONE); - ov16_0226BCCC(v0->battleInput, 1); - v0->unk_13++; + ov16_0226BCCC(menuSlideIn->battleInput, 1); + menuSlideIn->state++; break; default: - if (ov16_0226BCD0(v0->battleInput) == 0) { + if (ov16_0226BCD0(menuSlideIn->battleInput) == 0) { break; } @@ -3504,48 +3451,48 @@ static void ov16_0226B988(SysTask *task, void *param1) Bg_SetOffset(bgConfig, 4, 3, 0); Bg_SetOffset(bgConfig, 5, 0, 0); Bg_SetOffset(bgConfig, 5, 3, 0); - BattleSystem_SetCommandSelectionFlags(v0->battleInput->battleSystem, 1); - Heap_FreeToHeap(param1); + BattleSystem_SetCommandSelectionFlags(menuSlideIn->battleInput->battleSystem, 1); + Heap_FreeToHeap(data); SysTask_Done(task); return; } } -static void ov16_0226BA88(SysTask *param0, void *param1) +static void ov16_0226BA88(SysTask *task, void *data) { - UnkStruct_ov16_0226B988 *v0 = param1; + BattleMenuSlideIn *menuSlideIn = data; s32 v2, v3, v4; - BgConfig *bgConfig = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(menuSlideIn->battleInput->battleSystem); - if (v0->unk_12 == 4) { - v4 = 255 - v0->unk_0C; + if (menuSlideIn->unk_12 == 4) { + v4 = 255 - menuSlideIn->unk_0C; if (v4 > 0) { v4 = 0; } Bg_SetOffset(bgConfig, 4, 0, v4); - Bg_SetOffset(bgConfig, 5, 0, 255 - v0->unk_0C); - v2 = -v0->unk_08 / 100; + Bg_SetOffset(bgConfig, 5, 0, 255 - menuSlideIn->unk_0C); + v2 = -menuSlideIn->unk_08 / 100; } else { - v4 = v0->unk_0C; + v4 = menuSlideIn->unk_0C; if (v4 < 0) { v4 = 0; } Bg_SetOffset(bgConfig, 4, 0, v4); - Bg_SetOffset(bgConfig, 5, 0, v0->unk_0C); + Bg_SetOffset(bgConfig, 5, 0, menuSlideIn->unk_0C); - v2 = 255 + v0->unk_08 / 100; + v2 = 255 + menuSlideIn->unk_08 / 100; } Bg_SetOffset(bgConfig, 4, 3, 0); Bg_SetOffset(bgConfig, 5, 3, 0); - v3 = (18 * 8) + (v0->unk_0A) / 100; + v3 = (18 * 8) + (menuSlideIn->unk_0A) / 100; if (v2 < 0) { v2 = 0; @@ -3559,7 +3506,7 @@ static void ov16_0226BA88(SysTask *param0, void *param1) v3 = 0; } - if (v0->unk_12 == 4) { + if (menuSlideIn->unk_12 == 4) { G2S_SetWnd0Position(0, 0, v2, (18 * 8)); } else { if (v2 == 0) { @@ -3570,61 +3517,61 @@ static void ov16_0226BA88(SysTask *param0, void *param1) } G2S_SetWnd1Position(0, (18 * 8), 255, v3); - v0->unk_10 = v0->unk_0E; + menuSlideIn->unk_10 = menuSlideIn->unk_0E; } -static void ov16_0226BB94(void *param0) +static void ov16_0226BB94(void *data) { - UnkStruct_ov16_0226B988 *v0 = param0; - s32 v1, v2; + BattleMenuSlideIn *menuSlideIn = data; + s32 vCnt, v2; - v1 = GX_GetVCount(); + vCnt = GX_GetVCount(); - if (v1 == (18 * 8)) { - BgConfig *v3 = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); + if (vCnt == (18 * 8)) { + BgConfig *v3 = BattleSystem_GetBgConfig(menuSlideIn->battleInput->battleSystem); Bg_SetOffset(v3, 4, 0, 0); - Bg_SetOffset(v3, 4, 3, v0->unk_10); + Bg_SetOffset(v3, 4, 3, menuSlideIn->unk_10); Bg_SetOffset(v3, 5, 0, 0); - Bg_SetOffset(v3, 5, 3, v0->unk_10); - } else if (v1 > 192) { - BgConfig *v4 = BattleSystem_GetBgConfig(v0->battleInput->battleSystem); + Bg_SetOffset(v3, 5, 3, menuSlideIn->unk_10); + } else if (vCnt > 192) { + BgConfig *bgConfig = BattleSystem_GetBgConfig(menuSlideIn->battleInput->battleSystem); - if (v0->unk_12 == 4) { - v2 = 255 - v0->unk_0C; + if (menuSlideIn->unk_12 == 4) { + v2 = 255 - menuSlideIn->unk_0C; if (v2 > 0) { v2 = 0; } - Bg_SetOffset(v4, 4, 0, 255 - v0->unk_0C); - Bg_SetOffset(v4, 5, 0, 255 - v0->unk_0C); + Bg_SetOffset(bgConfig, 4, 0, 255 - menuSlideIn->unk_0C); + Bg_SetOffset(bgConfig, 5, 0, 255 - menuSlideIn->unk_0C); } else { - v2 = v0->unk_0C; + v2 = menuSlideIn->unk_0C; if (v2 < 0) { v2 = 0; } - Bg_SetOffset(v4, 4, 0, v0->unk_0C); - Bg_SetOffset(v4, 5, 0, v0->unk_0C); + Bg_SetOffset(bgConfig, 4, 0, menuSlideIn->unk_0C); + Bg_SetOffset(bgConfig, 5, 0, menuSlideIn->unk_0C); } - Bg_SetOffset(v4, 4, 3, 0); - Bg_SetOffset(v4, 5, 3, 0); + Bg_SetOffset(bgConfig, 4, 3, 0); + Bg_SetOffset(bgConfig, 5, 3, 0); } } -static void ov16_0226BC50(SysTask *task, void *param1) +static void ov16_0226BC50(SysTask *task, void *data) { - BattleInput *battleInput = param1; - const BattleMenuTemplate *v1; + BattleInput *battleInput = data; + const BattleMenuTemplate *menu; int i; - v1 = &sBattleMenuTemplates[battleInput->curMenuId]; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; for (i = 0; i < 4; i++) { - if (v1->unk_04_val2[i] == 0xffff) { + if (menu->unk_04_val2[i] == 0xffff) { Bg_ToggleLayer(4 + i, 0); } else { Bg_ToggleLayer(4 + i, 1); @@ -3632,15 +3579,15 @@ static void ov16_0226BC50(SysTask *task, void *param1) } for (i = 0; i < 4; i++) { - Bg_SetPriority(4 + i, v1->unk_0C_val2[i]); + Bg_SetPriority(4 + i, menu->priority[i]); } SysTask_Done(task); } -static void ov16_0226BCBC(SysTask *task, void *param1) +static void ov16_0226BCBC(SysTask *task, void *data) { - BattleInput *battleInput = param1; + BattleInput *battleInput = data; ov16_0226B198(); SysTask_Done(task); @@ -3660,22 +3607,18 @@ BOOL ov16_0226BCD0(BattleInput *battleInput) return 0; } -static void ov16_0226BCE4(SysTask *task, void *param1) +static void ov16_0226BCE4(SysTask *task, void *data) { - BattleInput *battleInput = param1; - int v1; + BattleInput *battleInput = data; u16 v2; - PaletteData *v3; - s16 v4; - - v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); + PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - if (PaletteData_GetSelectedBuffersMask(v3) != 0) { + if (PaletteData_GetSelectedBuffersMask(palette) != 0) { return; } { - PaletteData_Blend(v3, 1, 16 * 0 + 1, 1, battleInput->unk_676 >> 8, 0x7e37); + PaletteData_Blend(palette, 1, 16 * 0 + 1, 1, battleInput->unk_676 >> 8, 0x7e37); if (battleInput->unk_674 == 0) { battleInput->unk_676 += 0x200; @@ -3693,10 +3636,10 @@ static void ov16_0226BCE4(SysTask *task, void *param1) } } -static void ov16_0226BD74(SysTask *task, void *param1) +static void ov16_0226BD74(SysTask *task, void *data) { - BattleInput *battleInput = param1; - PaletteData *v1; + BattleInput *battleInput = data; + PaletteData *palette; u16 *v2; int v3; int v4, v5; @@ -3707,13 +3650,13 @@ static void ov16_0226BD74(SysTask *task, void *param1) RenderControlFlags_ZeroSpeedUpBattle(); RenderControlFlags_ZeroWaitBattle(); - v1 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - if (PaletteData_GetSelectedBuffersMask(v1) != 0) { + if (PaletteData_GetSelectedBuffersMask(palette) != 0) { return; } - v2 = PaletteData_GetFadedBuffer(v1, 1); + v2 = PaletteData_GetFadedBuffer(palette, 1); v3 = (16 - 8) * 2; if (gCoreSys.touchHeld && ((v4 == 1) || (v5 == 1))) { @@ -3740,30 +3683,30 @@ static void ov16_0226BD74(SysTask *task, void *param1) static int ov16_0226BE48(BattleInput *battleInput) { BattleCursorMove *cursorMove; - const BattleMenuTemplate *v1; + const BattleMenuTemplate *menu; cursorMove = &battleInput->cursorMove; - v1 = &sBattleMenuTemplates[battleInput->curMenuId]; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; - if (v1->funcCursorMove == NULL) { + if (menu->funcCursorMove == NULL) { return 0xffffffff; } if (cursorMove->unk_00 == 0) { - if ((battleInput->unk_6C0 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { - if (battleInput->unk_6C0 == 0) { + if ((battleInput->keyPressed == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { + if (battleInput->keyPressed == 0) { Sound_PlayEffect(1500); } cursorMove->unk_00 = 1; - battleInput->unk_6C0 = 0; - v1->funcCursorMove(battleInput, 1); + battleInput->keyPressed = 0; + menu->funcCursorMove(battleInput, 1); } return 0xffffffff; } - return v1->funcCursorMove(battleInput, 0); + return menu->funcCursorMove(battleInput, 0); } static int ov16_0226BEC0(BattleInput *battleInput, int param1) @@ -3783,7 +3726,7 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1) cursorMove->x = v6->commandX; cursorMove->y = v6->commandY; v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3823,13 +3766,13 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: - if (battleInput->unk_66F == 1) { - for (i = 0; i < v2->unk_14[i].rect.top != 0xff; i++) { + if (battleInput->canCancel == 1) { + for (i = 0; i < v2->touchscreenRect[i].rect.top != 0xff; i++) { if (4 == v2->unk_18[i]) { return i; } @@ -3844,12 +3787,12 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1) static void BattleInput_SaveBattlerCursorPosition(BattleInput *battleInput, int param1) { BattleCursorPosition *cursor; - int v1, j, i; + int battler, j, i; - v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + battler = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - if ((param1 != 3) || (battleInput->unk_6C1 == 0)) { - cursor = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + if ((param1 != 3) || (battleInput->runCommandType == BI_RUNCMD_RUN)) { + cursor = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, battler)); for (i = 0; i < 2; i++) { for (j = 0; j < 3; j++) { @@ -3869,7 +3812,7 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) BattleCursorMove *cursorMove; u32 key; const BattleMenuTemplate *v2; - int v3, v4; + int v4; cursorMove = &battleInput->cursorMove; v2 = &sBattleMenuTemplates[battleInput->curMenuId]; @@ -3878,7 +3821,7 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) cursorMove->x = 0; cursorMove->y = 0; v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3890,7 +3833,7 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; @@ -3904,50 +3847,50 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) static int ov16_0226C1F8(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; - u32 v1; + u32 keyPressed; const BattleMenuTemplate *v2; - int v3, i; + int index, i; u8 v5[3][2]; - UnkStruct_ov16_02260C00 *v6; + BattleInputMoveMenu *moveMenu; BattleCursorPosition *cursorPos; cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); cursorMove = &battleInput->cursorMove; v2 = &sBattleMenuTemplates[battleInput->curMenuId]; - v6 = &battleInput->unk_1A.val2; + moveMenu = &battleInput->menu.moveMenu; if (param1 == 1) { cursorMove->x = cursorPos->moveX; cursorMove->y = cursorPos->moveY; - v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; + index = sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; - if ((v3 != 0) && (v6->unk_00[v3 - 1] == 0)) { + if ((index != 0) && (moveMenu->unk_00[index - 1] == 0)) { cursorPos->moveX = 0; cursorPos->moveY = 0; cursorMove->x = 0; cursorMove->y = 0; - v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; + index = sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; } - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[index].rect.left + 8, v2->touchscreenRect[index].rect.right - 8, v2->touchscreenRect[index].rect.top + 8, v2->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - MI_CpuCopy8(Unk_ov16_022701E4, v5, 3 * 2); - v1 = CursorMove_CheckKeyPress(cursorMove, 2, 3, v5[0]); + MI_CpuCopy8(sMoveMenuIndexMatrix, v5, 3 * 2); + keyPressed = CursorMove_CheckKeyPress(cursorMove, 2, 3, v5[0]); - switch (v1) { + switch (keyPressed) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v3 = Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + index = sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[index].rect.left + 8, v2->touchscreenRect[index].rect.right - 8, v2->touchscreenRect[index].rect.top + 8, v2->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - return Unk_ov16_022701E4[cursorMove->y][cursorMove->x]; + return sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: - for (i = 0; i < v2->unk_14[i].rect.top != 0xff; i++) { + for (i = 0; i < v2->touchscreenRect[i].rect.top != 0xff; i++) { if (0xff == v2->unk_18[i]) { return i; } @@ -3962,18 +3905,18 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int param1) { BattleCursorPosition *cursorPos; - int v1, j, i; + int battler, j, i; if (param1 == 0) { return; } - v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + battler = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, battler)); for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { - if (param1 == Unk_ov16_022701E4[i][j]) { + if (param1 == sMoveMenuIndexMatrix[i][j]) { cursorPos->moveX = j; cursorPos->moveY = i; return; @@ -3985,7 +3928,7 @@ static void BattleInput_SaveBattlerMovePosition(BattleInput *battleInput, int pa static int ov16_0226C3C8(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; - u32 v1; + u32 keyPressed; const BattleMenuTemplate *menu; int v3, v4; int v5 = 0; @@ -4038,20 +3981,20 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) v12 = 2; if ((v7[5 - 2] == 1) && (v7[3 - 2] == 1)) { - v21 = menu->unk_14[3].rect.left + 8; - v22 = menu->unk_14[1].rect.right - 8; - v19 = menu->unk_14[3].rect.top + 8; - v20 = menu->unk_14[3].rect.bottom - 8; + v21 = menu->touchscreenRect[3].rect.left + 8; + v22 = menu->touchscreenRect[1].rect.right - 8; + v19 = menu->touchscreenRect[3].rect.top + 8; + v20 = menu->touchscreenRect[3].rect.bottom - 8; } else if ((v7[5 - 2] == 1) && (v7[3 - 2] == 0)) { - v21 = menu->unk_14[3].rect.left + 8; - v22 = menu->unk_14[3].rect.right - 8; - v19 = menu->unk_14[3].rect.top + 8; - v20 = menu->unk_14[3].rect.bottom - 8; + v21 = menu->touchscreenRect[3].rect.left + 8; + v22 = menu->touchscreenRect[3].rect.right - 8; + v19 = menu->touchscreenRect[3].rect.top + 8; + v20 = menu->touchscreenRect[3].rect.bottom - 8; } else if ((v7[5 - 2] == 0) && (v7[3 - 2] == 1)) { - v21 = menu->unk_14[1].rect.left + 8; - v22 = menu->unk_14[1].rect.right - 8; - v19 = menu->unk_14[1].rect.top + 8; - v20 = menu->unk_14[1].rect.bottom - 8; + v21 = menu->touchscreenRect[1].rect.left + 8; + v22 = menu->touchscreenRect[1].rect.right - 8; + v19 = menu->touchscreenRect[1].rect.top + 8; + v20 = menu->touchscreenRect[1].rect.bottom - 8; } else { v21 = -1; v22 = -1; @@ -4060,20 +4003,20 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } if ((v7[2 - 2] == 1) && (v7[4 - 2] == 1)) { - v25 = menu->unk_14[0].rect.left + 8; - v26 = menu->unk_14[2].rect.right - 8; - v23 = menu->unk_14[0].rect.top + 8; - v24 = menu->unk_14[0].rect.bottom - 8; + v25 = menu->touchscreenRect[0].rect.left + 8; + v26 = menu->touchscreenRect[2].rect.right - 8; + v23 = menu->touchscreenRect[0].rect.top + 8; + v24 = menu->touchscreenRect[0].rect.bottom - 8; } else if ((v7[2 - 2] == 1) && (v7[4 - 2] == 0)) { - v25 = menu->unk_14[0].rect.left + 8; - v26 = menu->unk_14[0].rect.right - 8; - v23 = menu->unk_14[0].rect.top + 8; - v24 = menu->unk_14[0].rect.bottom - 8; + v25 = menu->touchscreenRect[0].rect.left + 8; + v26 = menu->touchscreenRect[0].rect.right - 8; + v23 = menu->touchscreenRect[0].rect.top + 8; + v24 = menu->touchscreenRect[0].rect.bottom - 8; } else if ((v7[2 - 2] == 0) && (v7[4 - 2] == 1)) { - v25 = menu->unk_14[2].rect.left + 8; - v26 = menu->unk_14[2].rect.right - 8; - v23 = menu->unk_14[2].rect.top + 8; - v24 = menu->unk_14[2].rect.bottom - 8; + v25 = menu->touchscreenRect[2].rect.left + 8; + v26 = menu->touchscreenRect[2].rect.right - 8; + v23 = menu->touchscreenRect[2].rect.top + 8; + v24 = menu->touchscreenRect[2].rect.bottom - 8; } else { v25 = -1; v26 = -1; @@ -4157,7 +4100,7 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } v4 = Unk_ov16_022701DC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, menu->unk_14[v4].rect.left + 8, menu->unk_14[v4].rect.right - 8, menu->unk_14[v4].rect.top + 8, menu->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[v4].rect.left + 8, menu->touchscreenRect[v4].rect.right - 8, menu->touchscreenRect[v4].rect.top + 8, menu->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { cursorMove->x = 0; cursorMove->y = 0; @@ -4179,19 +4122,19 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) } if (v5 == 0) { - v1 = CursorMove_CheckKeyPress(cursorMove, v11, v12, v8[0]); + keyPressed = CursorMove_CheckKeyPress(cursorMove, v11, v12, v8[0]); } else { - v1 = CursorMove_CheckKeyPress(cursorMove, v11, v12, NULL); + keyPressed = CursorMove_CheckKeyPress(cursorMove, v11, v12, NULL); } - switch (v1) { + switch (keyPressed) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: if (v5 == 0) { v4 = Unk_ov16_022701DC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, menu->unk_14[v4].rect.left + 8, menu->unk_14[v4].rect.right - 8, menu->unk_14[v4].rect.top + 8, menu->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[v4].rect.left + 8, menu->touchscreenRect[v4].rect.right - 8, menu->touchscreenRect[v4].rect.top + 8, menu->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { if (cursorMove->y == 0) { if (((v27 == -1) && (v28 == -1)) || (v17 == -1)) { @@ -4208,7 +4151,7 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) ov16_0226DE04(battleInput->cursor); } } else { - ov16_0226DD9C(battleInput->cursor, menu->unk_14[4].rect.left + 8, menu->unk_14[4].rect.right - 8, menu->unk_14[4].rect.top + 8, menu->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[4].rect.left + 8, menu->touchscreenRect[4].rect.right - 8, menu->touchscreenRect[4].rect.top + 8, menu->touchscreenRect[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); ov16_0226DE04(battleInput->cursor); } } @@ -4242,14 +4185,14 @@ static int ov16_0226C3C8(BattleInput *battleInput, int param1) static void ov16_0226C9B8(BattleInput *battleInput, int param1) { BattleCursorPosition *cursorPos; - int v1, j, i; + int battler, j, i; if (param1 == 4) { return; } - v1 = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); - cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, v1)); + battler = BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A); + cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, battler)); cursorPos->unk_06 = battleInput->unk_66C; @@ -4268,32 +4211,32 @@ static void ov16_0226C9B8(BattleInput *battleInput, int param1) static int ov16_0226CA14(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; - u32 v1; + u32 keyPressed; const BattleMenuTemplate *menu; - int v3, v4; + int index, v4; cursorMove = &battleInput->cursorMove; menu = &sBattleMenuTemplates[battleInput->curMenuId]; if (param1 == 1) { - v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, menu->unk_14[v3].rect.left + 8, menu->unk_14[v3].rect.right - 8, menu->unk_14[v3].rect.top + 8, menu->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + index = sTwoChoiceMenuIndexMatrix[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[index].rect.left + 8, menu->touchscreenRect[index].rect.right - 8, menu->touchscreenRect[index].rect.top + 8, menu->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } - v1 = CursorMove_CheckKeyPress(cursorMove, 1, 2, Unk_ov16_022701C8[0]); + keyPressed = CursorMove_CheckKeyPress(cursorMove, 1, 2, sTwoChoiceMenuIndexMatrix[0]); - switch (v1) { + switch (keyPressed) { case PAD_KEY_UP: case PAD_KEY_DOWN: case PAD_KEY_LEFT: case PAD_KEY_RIGHT: - v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, menu->unk_14[v3].rect.left + 8, menu->unk_14[v3].rect.right - 8, menu->unk_14[v3].rect.top + 8, menu->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + index = sTwoChoiceMenuIndexMatrix[cursorMove->y][cursorMove->x]; + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[index].rect.left + 8, menu->touchscreenRect[index].rect.right - 8, menu->touchscreenRect[index].rect.top + 8, menu->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: - v3 = Unk_ov16_022701C8[cursorMove->y][cursorMove->x]; - return v3; + index = sTwoChoiceMenuIndexMatrix[cursorMove->y][cursorMove->x]; + return index; case PAD_BUTTON_B: return 1; } @@ -4301,21 +4244,21 @@ static int ov16_0226CA14(BattleInput *battleInput, int param1) return 0xffffffff; } -static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, int param2, const u8 *param3) +static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int param2, const u8 *param3) { - int v0, v1; - u32 v2; + int y, x; + u32 key; - if (cursorMove->x >= param1) { - cursorMove->x = param1 - 1; + if (cursorMove->x >= xMax) { + cursorMove->x = xMax - 1; } if (cursorMove->y >= param2) { cursorMove->y = param2 - 1; } - v1 = cursorMove->x; - v0 = cursorMove->y; + x = cursorMove->x; + y = cursorMove->y; if (gCoreSys.pressedKeys & PAD_KEY_UP) { cursorMove->y--; @@ -4325,17 +4268,17 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, in } if (param3 != NULL) { - while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->y--; if (cursorMove->y < 0) { - cursorMove->y = v0; + cursorMove->y = y; break; } } } - v2 = PAD_KEY_UP; + key = PAD_KEY_UP; } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { cursorMove->y++; @@ -4344,17 +4287,17 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, in } if (param3 != NULL) { - while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->y++; if (cursorMove->y >= param2) { - cursorMove->y = v0; + cursorMove->y = y; break; } } } - v2 = PAD_KEY_DOWN; + key = PAD_KEY_DOWN; } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { cursorMove->x--; @@ -4363,40 +4306,40 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, in } if (param3 != NULL) { - while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->x--; if (cursorMove->x < 0) { - cursorMove->x = v1; + cursorMove->x = x; break; } } } - v2 = PAD_KEY_LEFT; + key = PAD_KEY_LEFT; } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { cursorMove->x++; - if (cursorMove->x >= param1) { - cursorMove->x = param1 - 1; + if (cursorMove->x >= xMax) { + cursorMove->x = xMax - 1; } if (param3 != NULL) { - while (param3[param1 * cursorMove->y + cursorMove->x] == 0xff) { + while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->x++; - if (cursorMove->x >= param1) { - cursorMove->x = v1; + if (cursorMove->x >= xMax) { + cursorMove->x = x; break; } } } - v2 = PAD_KEY_RIGHT; + key = PAD_KEY_RIGHT; } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { - v2 = PAD_BUTTON_A; + key = PAD_BUTTON_A; } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { - v2 = PAD_BUTTON_B; + key = PAD_BUTTON_B; } else { return 0; } @@ -4404,32 +4347,32 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int param1, in if (param3 != NULL) { int v3, v4; - v3 = param3[param1 * v0 + v1]; - v4 = param3[param1 * cursorMove->y + cursorMove->x]; + v3 = param3[xMax * y + x]; + v4 = param3[xMax * cursorMove->y + cursorMove->x]; if (v3 == v4) { - cursorMove->x = v1; - cursorMove->y = v0; + cursorMove->x = x; + cursorMove->y = y; } } - if ((cursorMove->x != v1) || (cursorMove->y != v0)) { + if ((cursorMove->x != x) || (cursorMove->y != y)) { Sound_PlayEffect(1500); - } else if (v2 & PAD_KEY) { + } else if (key & PAD_KEY) { return 0; } - return v2; + return key; } int BattleInput_GetCursorPressed(BattleInput *battleInput) { - return battleInput->unk_6C0; + return battleInput->keyPressed; } -void BattleInput_SetCursorPressed(BattleInput *battleInput, int param1) +void BattleInput_SetCursorPressed(BattleInput *battleInput, int key) { - battleInput->unk_6C0 = param1; + battleInput->keyPressed = key; } static int (*const sCatchingTutorialStateFuncs[])(BattleInput *) = { @@ -4439,9 +4382,9 @@ static int (*const sCatchingTutorialStateFuncs[])(BattleInput *) = { static int BattleInput_CatchingTutorialMain(BattleInput *battleInput) { - SpriteRenderer *v0 = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - SpriteGfxHandler *v1 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - PaletteData *v2 = BattleSystem_GetPaletteData(battleInput->battleSystem); + SpriteRenderer *spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); + SpriteGfxHandler *gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); int ret = 0xffffffff; if (ov16_0223F228(battleInput->battleSystem) == 0) { @@ -4526,7 +4469,7 @@ static int BattleInput_CatchingTutorialBag(BattleInput *battleInput) return 0xffffffff; } -void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) +void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int index) { BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); @@ -4558,7 +4501,7 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) Strbuf *src; MessageLoader *msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); int i; - const u16 v11[][2] = { + const u16 stopMsgId[][2] = { // Playback paused // Please wait { pl_msg_00000368_01261, pl_msg_00000368_01262 }, @@ -4576,14 +4519,14 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int param1) return; } - src = MessageLoader_GetNewStrbuf(msgLoader, v11[param1][i]); + src = MessageLoader_GetNewStrbuf(msgLoader, stopMsgId[index][i]); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1 + i], src, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); Strbuf_Free(src); } } -u8 ov16_0226D088(BattleInput *battleInput) +u8 BattleInput_GetRunCommandType(BattleInput *battleInput) { - return battleInput->unk_6C1; + return battleInput->runCommandType; } diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 0de6a0f5b9..5949559eb4 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -174,7 +174,7 @@ BattlerData *ov16_0225BFFC(BattleSystem *param0, UnkStruct_ov16_0223C2C0 *param1 void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int param3) { - BallThrow v0; + BallThrow ballThrow; s16 v1, v2; if (BattleSystem_GetBattleType(param0) & (0x20 | 0x200)) { @@ -185,17 +185,17 @@ void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int pa return; } - v0.type = Unk_ov16_0226F174[param1->battlerType]; - v0.heapID = 5; - v0.mode = 4; - v0.target = param1->battler; - v0.ballID = param2; - v0.cellActorSys = BattleSystem_GetSpriteRenderer(param0); - v0.paletteSys = BattleSystem_GetPaletteData(param0); - v0.surface = 0; - v0.bgPrio = 1; + ballThrow.type = Unk_ov16_0226F174[param1->battlerType]; + ballThrow.heapID = 5; + ballThrow.mode = 4; + ballThrow.target = param1->battler; + ballThrow.ballID = param2; + ballThrow.cellActorSys = BattleSystem_GetSpriteRenderer(param0); + ballThrow.paletteSys = BattleSystem_GetPaletteData(param0); + ballThrow.surface = 0; + ballThrow.bgPrio = 1; - param1->unk_84 = ov12_02237728(&v0); + param1->unk_84 = ov12_02237728(&ballThrow); ov12_02237E34(param1->unk_84, 100); ov12_02237E40(param1->unk_84, 2); @@ -659,14 +659,14 @@ static void ov16_0225C47C(BattleSystem *param0, BattlerData *param1) static void ov16_0225C558(BattleSystem *param0, BattlerData *param1) { u32 v0; - BattleInput *v1; + BattleInput *battleInput; v0 = BattleSystem_GetBattleType(param0); - v1 = BattleSystem_GetBattleInput(param0); + battleInput = BattleSystem_GetBattleInput(param0); if (param1->bootState == 0x0) { if ((v0 & 0x8) || (((v0 & 0x8) == 0) && (param1->battlerType != 4))) { - ov16_0226947C(v1, -0xd00, 0); + ov16_0226947C(battleInput, -0xd00, 0); } } @@ -685,7 +685,7 @@ static void ov16_0225C5B0(BattleSystem *param0, BattlerData *param1) static void ov16_0225C5E0(BattleSystem *param0, BattlerData *param1) { UnkStruct_ov16_02266498 *v0 = (UnkStruct_ov16_02266498 *)¶m1->data[0]; - Pokemon *v1; + Pokemon *pokemon; int v2, v3, v4; u32 v5; @@ -693,16 +693,16 @@ static void ov16_0225C5E0(BattleSystem *param0, BattlerData *param1) v3 = BattleSystem_PartyCount(param0, param1->battler); for (v2 = 0; v2 < v3; v2++) { - v1 = BattleSystem_PartyPokemon(param0, param1->battler, v2); + pokemon = BattleSystem_PartyPokemon(param0, param1->battler, v2); if (v0->unk_01 == 104) { v4 = ABILITY_NONE; } else { - v4 = Pokemon_GetValue(v1, MON_DATA_ABILITY, NULL); + v4 = Pokemon_GetValue(pokemon, MON_DATA_ABILITY, NULL); } if ((v0->unk_02 != 215) || ((v0->unk_02 == 215) && (v4 != ABILITY_SOUNDPROOF))) { - Pokemon_SetValue(v1, MON_DATA_STATUS_CONDITION, (u8 *)&v5); + Pokemon_SetValue(pokemon, MON_DATA_STATUS_CONDITION, (u8 *)&v5); } } @@ -771,34 +771,32 @@ static void ov16_0225C77C(BattleSystem *param0, BattlerData *param1) static void ov16_0225C79C(BattleSystem *param0, BattlerData *param1) { if (param1->bootState == 0x0) { - { - BattleInput *v0; - int v1; - Healthbar *v2; - NARC *v3; - NARC *v4; + BattleInput *battleInput; + int v1; + Healthbar *healthbar; + NARC *v3; + NARC *v4; - v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v0 = BattleSystem_GetBattleInput(param0); + v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + battleInput = BattleSystem_GetBattleInput(param0); - ov16_02268C04(v3, v4, v0, 0, 0, NULL); - ov16_0226BCCC(v0, 0); + BattleInput_ChangeMenu(v3, v4, battleInput, 0, 0, NULL); + ov16_0226BCCC(battleInput, 0); - NARC_dtor(v3); - NARC_dtor(v4); + NARC_dtor(v3); + NARC_dtor(v4); - v1 = BattleSystem_Partner(param0, param1->battler); + v1 = BattleSystem_Partner(param0, param1->battler); - if (v1 != param1->battler) { - v2 = ov16_0223F35C(param0, v1); - ov16_0226846C(v2); - } - - ov16_022675AC(¶m1->healthbar); - ov16_02269218(v0); - ov16_022647D8(param1); + if (v1 != param1->battler) { + healthbar = ov16_0223F35C(param0, v1); + ov16_0226846C(healthbar); } + + ov16_022675AC(¶m1->healthbar); + BattleInput_DisableBallGauge(battleInput); + ov16_022647D8(param1); } ClearCommand(param0, param1->battler, 47); @@ -851,13 +849,13 @@ static void ov16_0225C8E0(BattleSystem *param0, BattlerData *param1) { SpriteRenderer *v0; SpriteGfxHandler *v1; - PaletteData *v2; + PaletteData *palette; v0 = BattleSystem_GetSpriteRenderer(param0); v1 = BattleSystem_GetSpriteGfxHandler(param0); - v2 = BattleSystem_GetPaletteData(param0); + palette = BattleSystem_GetPaletteData(param0); - PartyGauge_LoadGraphics(v0, v1, v2); + PartyGauge_LoadGraphics(v0, v1, palette); ClearCommand(param0, param1->battler, 52); ZeroDataBuffer(param1); } @@ -971,8 +969,8 @@ static void ov16_0225CA60(BattleSystem *param0, BattlerData *param1) static void ov16_0225CA74(BattleSystem *param0, BattlerData *param1) { UnkStruct_ov16_02266A38 *v0 = (UnkStruct_ov16_02266A38 *)¶m1->data[0]; - Party *v1; - Pokemon *v2; + Party *party; + Pokemon *pokemon; int v3; int v4; int v5 = 0; @@ -985,16 +983,16 @@ static void ov16_0225CA74(BattleSystem *param0, BattlerData *param1) BattleSystem_SetResultFlag(param0, v0->unk_04); } else { for (v4 = 0; v4 < BattleSystem_MaxBattlers(param0); v4++) { - v1 = BattleSystem_Party(param0, v4); + party = BattleSystem_Party(param0, v4); - for (v3 = 0; v3 < Party_GetCurrentCount(v1); v3++) { - v2 = Party_GetPokemonBySlotIndex(v1, v3); + for (v3 = 0; v3 < Party_GetCurrentCount(party); v3++) { + pokemon = Party_GetPokemonBySlotIndex(party, v3); - if ((Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL)) && (Pokemon_GetValue(v2, MON_DATA_IS_EGG, NULL) == 0)) { + if ((Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL)) && (Pokemon_GetValue(pokemon, MON_DATA_IS_EGG, NULL) == 0)) { if (Battler_Side(param0, v4)) { - v6 += Pokemon_GetValue(v2, MON_DATA_CURRENT_HP, NULL); + v6 += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } else { - v5 += Pokemon_GetValue(v2, MON_DATA_CURRENT_HP, NULL); + v5 += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } } diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 174f995d72..ebeb13f62d 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -12210,7 +12210,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript Window v9; int v10; SpriteManagerAllocation v11; - UnkStruct_020127E8 v12; + FontOAMInitData v12; int v13; v4 = BattleSystem_GetMessageLoader(param0); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 542da7662c..ba4a14cd6f 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -354,7 +354,7 @@ void ov16_0223B430(BattleSystem *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); ov16_02268A88(param0->battleInput); - ov16_02268C04(v0, v1, param0->battleInput, 0, 1, NULL); + BattleInput_ChangeMenu(v0, v1, param0->battleInput, 0, 1, NULL); BattleInput_CreateBallGagueObjects(v1, param0->battleInput); NARC_dtor(v0); NARC_dtor(v1); @@ -594,7 +594,7 @@ static void ov16_0223B790(OverlayManager *param0) v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v8, v9, v0->battleInput, 0, 1, NULL); + BattleInput_ChangeMenu(v8, v9, v0->battleInput, 0, 1, NULL); BattleInput_CreateBallGagueObjects(v9, v0->battleInput); NARC_dtor(v8); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 704cebe32e..b3a2e180ab 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -115,7 +115,7 @@ u8 Battler_Side(BattleSystem *battleSystem, int param1); void *ov16_0223E220(BattleSystem *battleSystem); PCBoxes *ov16_0223E228(BattleSystem *battleSystem); enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem *battleSystem); +int BattleSystem_GetBackgroundId(BattleSystem *battleSystem); int BattleSystem_MapHeader(BattleSystem *battleSystem); int BattleSystem_Partner(BattleSystem *battleSys, int battler); int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); @@ -514,7 +514,7 @@ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys) return battleSys->terrain; } -int ov16_0223E240(BattleSystem *battleSystem) +int BattleSystem_GetBackgroundId(BattleSystem *battleSystem) { return battleSystem->unk_2400; } diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index b243943951..f5d6964cd5 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -26,7 +26,7 @@ void BattleCursor_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2 BattleCursor *BattleCursor_New(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); void BattleCursor_Free(BattleCursor *param0); void ov16_0226DD7C(BattleCursor *param0, int param1, int param2, int param3, int param4); -void ov16_0226DDE8(BattleCursor *param0); +void BattleCursor_Disable(BattleCursor *param0); static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0, @@ -141,7 +141,7 @@ void ov16_0226DDC0(BattleCursor *param0, int param1, int param2, int param3, fx3 SpriteActor_EnableObject(param0->unk_00[4], 1); } -void ov16_0226DDE8(BattleCursor *param0) +void BattleCursor_Disable(BattleCursor *param0) { int v0; diff --git a/src/battle/ov16_0226E148.c b/src/battle/ov16_0226E148.c index 378b8e0e66..d454d3afdf 100644 --- a/src/battle/ov16_0226E148.c +++ b/src/battle/ov16_0226E148.c @@ -62,14 +62,14 @@ static void ov16_0226E188(SysTask *param0, void *param1) v2 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - ov16_02268C04(v2, v3, battleInput, 18, 0, NULL); + BattleInput_ChangeMenu(v2, v3, battleInput, 18, 0, NULL); NARC_dtor(v2); NARC_dtor(v3); } v0->unk_04++; break; case 1: - if (ov16_02269348(battleInput) == 1) { + if (BattleInput_CheckEffectEnded(battleInput) == 1) { v0->unk_04++; } break; diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index e802dee00b..f229465d70 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1565,7 +1565,7 @@ static void ov10_022212AC(UnkStruct_ov10_0221FB28 *param0) static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *param2) { Window *v0; - UnkStruct_020127E8 v1; + FontOAMInitData v1; v0 = ¶m0->unk_10[0]; @@ -1605,8 +1605,8 @@ static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0) ov10_0222130C(param0, 1, param0->unk_00->unk_14[0]); ov10_0222130C(param0, 3, param0->unk_00->unk_14[1]); - sub_020129D0(param0->unk_B3C[1], 0); - sub_020129D0(param0->unk_B3C[3], 0); + FontOAM_SetDrawFlag(param0->unk_B3C[1], 0); + FontOAM_SetDrawFlag(param0->unk_B3C[3], 0); } } diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 7fd1c062b6..2368366070 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -943,5 +943,5 @@ void ov13_022256E8(UnkStruct_ov13_022213F0 *param0) { ov13_02228A60(param0->unk_2084, 0); ov13_02228A90(param0->unk_2084); - ov16_0226DDE8(ov13_02228A58(param0->unk_2084)); + BattleCursor_Disable(ov13_02228A58(param0->unk_2084)); } diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index 297989e49d..75fda5ca41 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -303,7 +303,7 @@ void ov13_02228050(UnkStruct_ov13_02227244 *param0) { ov13_02228A60(param0->unk_34, 0); ov13_02228A90(param0->unk_34); - ov16_0226DDE8(ov13_02228A58(param0->unk_34)); + BattleCursor_Disable(ov13_02228A58(param0->unk_34)); } static void ov13_02228070(UnkStruct_ov13_02227244 *param0) diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 9822ecd4f7..4ef6b83c27 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -113,7 +113,7 @@ void ov17_0223F1E0(GenericPointerData *param0) void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 5fdf7f8e5b..4f7d41f7cd 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -790,9 +790,9 @@ static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 *param0, int param1, int param ov17_02240138(param0, ¶m0->unk_40[8 + v2], NULL, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33008, Unk_ov17_02253314[v2][1][0], Unk_ov17_02253314[v2][1][1], 0, &v8->unk_A0[v2]); if (v0[v2] == 0) { - sub_020129D0(param0->unk_40[0 + v2].unk_00, 0); - sub_020129D0(param0->unk_40[4 + v2].unk_00, 0); - sub_020129D0(param0->unk_40[8 + v2].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_40[0 + v2].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_40[4 + v2].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_40[8 + v2].unk_00, 0); } } @@ -946,7 +946,7 @@ static int ov17_02240094(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2 static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_02240138 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 *param10) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 32c46103c7..d501db8e92 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1245,8 +1245,8 @@ static void ov17_0224262C(UnkStruct_ov17_02246F24 *param0, GXOamMode param1, int sub_02012AF0(param0->unk_0C.unk_180[v0].unk_00, param1); sub_02012AF0(param0->unk_0C.unk_1C8[v0].unk_00, param1); - sub_020129D0(param0->unk_0C.unk_180[v0].unk_00, v3); - sub_020129D0(param0->unk_0C.unk_1C8[v0].unk_00, v3); + FontOAM_SetDrawFlag(param0->unk_0C.unk_180[v0].unk_00, v3); + FontOAM_SetDrawFlag(param0->unk_0C.unk_1C8[v0].unk_00, v3); } } diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 4dd109d334..0ef25ee2ba 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -675,7 +675,7 @@ static void ov17_02249B54(UnkStruct_ov17_02249B30 *param0) static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249BC4 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; @@ -773,7 +773,7 @@ static void ov17_02249CFC(UnkStruct_ov17_022492DC *param0, int param1) for (v1 = v2; v1 <= v3; v1++) { if (param0->unk_1C[v1].unk_00 != NULL) { - sub_020129D0(param0->unk_1C[v1].unk_00, param1); + FontOAM_SetDrawFlag(param0->unk_1C[v1].unk_00, param1); } } } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index f045a99689..fa6c8d60fb 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -647,13 +647,13 @@ void ov17_0224A674(UnkStruct_ov17_0224A1EC *param0) for (v0 = 0; v0 < 3; v0++) { ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, ¶m0->unk_96C[0][v0], v1, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12); - sub_020129D0(param0->unk_96C[0][v0].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_96C[0][v0].unk_00, 0); ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, ¶m0->unk_96C[1][v0], v2, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12); - sub_020129D0(param0->unk_96C[1][v0].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_96C[1][v0].unk_00, 0); ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, ¶m0->unk_96C[2][v0], v3, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12); - sub_020129D0(param0->unk_96C[2][v0].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_96C[2][v0].unk_00, 0); } Strbuf_Free(v1); @@ -699,13 +699,13 @@ void ov17_0224A7E0(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, Spri SpriteActor_EnableObject(v5->unk_00, 1); for (v1 = 0; v1 < 3; v1++) { - sub_020129D0(param0->unk_96C[v1][v4].unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_96C[v1][v4].unk_00, 0); } v5->unk_04 = ¶m0->unk_96C[param3][v4]; ov17_0223F2F8(v5->unk_04, v2, v3, 1); - sub_020129D0(v5->unk_04->unk_00, 1); + FontOAM_SetDrawFlag(v5->unk_04->unk_00, 1); v5->unk_08 = SysTask_Start(ov17_0224A8D4, v5, ((30000 + 10000) + 200)); } @@ -738,7 +738,7 @@ static void ov17_0224A8D4(SysTask *param0, void *param1) } break; default: - sub_020129D0(v0->unk_04->unk_00, 0); + FontOAM_SetDrawFlag(v0->unk_04->unk_00, 0); SpriteActor_EnableObject(v0->unk_00, 0); v0->unk_08 = NULL; SysTask_Done(param0); diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index a2868ab558..459a3fcfed 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -232,7 +232,7 @@ void ov21_021D22E0(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D4CB8 *par void ov21_021D22F8(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4CB8 *param1, int param2, int param3, u32 param4) { if ((param3 == param0->unk_28) && (param4 == param0->unk_2C)) { - sub_020129D0(param0->unk_08->unk_00, 1); + FontOAM_SetDrawFlag(param0->unk_08->unk_00, 1); return; } else { param0->unk_28 = param3; @@ -281,7 +281,7 @@ void ov21_021D23C0(const UnkStruct_ov21_021D13FC *param0, BOOL param1) } if (param0->unk_1B0.unk_08->unk_00) { - sub_020129D0(param0->unk_1B0.unk_08->unk_00, param1); + FontOAM_SetDrawFlag(param0->unk_1B0.unk_08->unk_00, param1); } } @@ -953,7 +953,7 @@ void ov21_021D2E44(UnkStruct_ov21_021D22F8 *param0, BOOL param1) } if (param0->unk_08->unk_00) { - sub_020129D0(param0->unk_08->unk_00, param1); + FontOAM_SetDrawFlag(param0->unk_08->unk_00, param1); } } diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 478fd2bbed..b30b4be5ba 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -78,7 +78,7 @@ UnkStruct_ov21_021D4CA0 *ov21_021D4CA0(const UnkStruct_ov21_021D4CB8 *param0) UnkStruct_ov21_021D4CA0 *ov21_021D4CB8(const UnkStruct_ov21_021D4CB8 *param0, int param1) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; UnkStruct_ov21_021D4CA0 *v1; v1 = ov21_021D4EB4(param0->unk_00); diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 8afcf7bd07..de96a2bc3b 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -700,7 +700,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 sub_02012A60(param0->unk_0C[0]->unk_00, v4 + 3); if (param2->unk_1C->unk_04->unk_1740 == 1) { - sub_020129D0(param0->unk_0C[0]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_0C[0]->unk_00, 0); } ov21_021D4DA0(v0); @@ -714,7 +714,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 sub_02012A60(param0->unk_0C[1]->unk_00, v4 + 3); if ((ov21_021D36A4(param2->unk_1C->unk_04, 1) == 0) || (param2->unk_1C->unk_04->unk_1740 == 1)) { - sub_020129D0(param0->unk_0C[1]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_0C[1]->unk_00, 0); } ov21_021D4DA0(v0); diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index aa27e3f873..02f1d3aa38 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -1117,10 +1117,10 @@ static void ov21_021DD9E8(PokedexMapDisplay *mapDisplay, const EncounterCollecti { if ((mapDisplay->numVisibleDungeons <= 0) && (mapDisplay->numVisibleFields <= 0) && (mapDisplay->dungeonsZero <= 0) && (mapDisplay->fieldsZero <= 0)) { CellActor_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 1); - sub_020129D0(mapDisplay->AreaUnknownSpriteManager->unk_00, 1); + FontOAM_SetDrawFlag(mapDisplay->AreaUnknownSpriteManager->unk_00, 1); } else { CellActor_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 0); - sub_020129D0(mapDisplay->AreaUnknownSpriteManager->unk_00, 0); + FontOAM_SetDrawFlag(mapDisplay->AreaUnknownSpriteManager->unk_00, 0); } } @@ -1130,9 +1130,9 @@ static void ov21_021DDA48(PokedexMapDisplay *mapDisplay, int param1) for (v0 = 0; v0 < 3; v0++) { if (v0 == param1) { - sub_020129D0(mapDisplay->unk_E0[v0]->unk_00, 1); + FontOAM_SetDrawFlag(mapDisplay->unk_E0[v0]->unk_00, 1); } else { - sub_020129D0(mapDisplay->unk_E0[v0]->unk_00, 0); + FontOAM_SetDrawFlag(mapDisplay->unk_E0[v0]->unk_00, 0); } } } diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 98698290cc..6ceed432b1 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -737,7 +737,7 @@ static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32 param1->unk_04[v4] = ov21_021D4CA0(&v1); sub_02012A60(param1->unk_04[v4]->unk_00, v3); - sub_020129D0(param1->unk_04[v4]->unk_00, 0); + FontOAM_SetDrawFlag(param1->unk_04[v4]->unk_00, 0); ov21_021D4DA0(v0); } @@ -1591,8 +1591,8 @@ static BOOL ov21_021E3F98(UnkStruct_ov21_021E3440 *param0, BOOL param1) static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param2) { - sub_020129D0(param0->unk_04[param2]->unk_00, 0); - sub_020129D0(param0->unk_04[param1]->unk_00, 1); + FontOAM_SetDrawFlag(param0->unk_04[param2]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_04[param1]->unk_00, 1); } static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_021E342C *param1) diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 840c7ac0d6..419ecd6ef0 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -956,7 +956,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D sub_02012A60(param0->unk_50[1]->unk_00, v4 + 0); ov21_021D4DA0(v0); - sub_020129D0(param0->unk_50[1]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_50[1]->unk_00, 0); } static void ov21_021E599C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1) @@ -1153,11 +1153,11 @@ static void ov21_021E5C18(UnkStruct_ov21_021E51DC *param0, int param1) static void ov21_021E5C4C(UnkStruct_ov21_021E5004 *param0) { if (param0->unk_40 == 0) { - sub_020129D0(param0->unk_50[0]->unk_00, 1); - sub_020129D0(param0->unk_50[1]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_50[0]->unk_00, 1); + FontOAM_SetDrawFlag(param0->unk_50[1]->unk_00, 0); } else { - sub_020129D0(param0->unk_50[0]->unk_00, 0); - sub_020129D0(param0->unk_50[1]->unk_00, 1); + FontOAM_SetDrawFlag(param0->unk_50[0]->unk_00, 0); + FontOAM_SetDrawFlag(param0->unk_50[1]->unk_00, 1); } } diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index bdc59f2bf2..e1f4859cb4 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -67,7 +67,7 @@ void ov22_02259C58(UnkStruct_ov22_02259C58 *param0, UnkStruct_ov22_02259C58_1 *p void ov22_02259C9C(UnkStruct_ov22_0225A154 *param0, UnkStruct_ov22_02259C9C *param1) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; ov22_02259C58(¶m0->unk_00, ¶m1->unk_00); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 4ff6a4bcf8..ef29db07a4 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -481,7 +481,7 @@ void ov62_02230AF0(UnkStruct_0208C06C *param0) sub_0200D364(param0->unk_534.unk_00[v0].unk_00, param0->unk_534.unk_190[v0]->unk_0C); ov62_02230FC8(param0, ¶m0->unk_534.unk_00[v0], param0->unk_534.unk_190[v0]->unk_08, param0->unk_534.unk_190[v0]); sub_020128C4(param0->unk_534.unk_00[v0].unk_14, 36, -8); - sub_020129D0(param0->unk_534.unk_00[v0].unk_14, 1); + FontOAM_SetDrawFlag(param0->unk_534.unk_00[v0].unk_14, 1); SpriteActor_EnableObject(param0->unk_534.unk_00[v0].unk_00, 1); } } @@ -503,18 +503,18 @@ void ov62_02230B9C(UnkStruct_0208C06C *param0, BOOL param1) for (v0 = 0; v0 < 5; v0++) { if (param0->unk_534.unk_00[v0].unk_0C == 0) { - sub_020129D0(param0->unk_534.unk_00[v0].unk_14, 0); + FontOAM_SetDrawFlag(param0->unk_534.unk_00[v0].unk_14, 0); SpriteActor_EnableObject(param0->unk_534.unk_00[v0].unk_00, 0); } else { - sub_020129D0(param0->unk_534.unk_00[v0].unk_14, param1); + FontOAM_SetDrawFlag(param0->unk_534.unk_00[v0].unk_14, param1); SpriteActor_EnableObject(param0->unk_534.unk_00[v0].unk_00, param1); } if (param0->unk_534.unk_C8[v0].unk_0C == 0) { - sub_020129D0(param0->unk_534.unk_C8[v0].unk_14, 0); + FontOAM_SetDrawFlag(param0->unk_534.unk_C8[v0].unk_14, 0); SpriteActor_EnableObject(param0->unk_534.unk_C8[v0].unk_00, 0); } else { - sub_020129D0(param0->unk_534.unk_C8[v0].unk_14, param1); + FontOAM_SetDrawFlag(param0->unk_534.unk_C8[v0].unk_14, param1); SpriteActor_EnableObject(param0->unk_534.unk_C8[v0].unk_00, param1); } } @@ -644,7 +644,7 @@ void ov62_02230E74(CellActorData *param0, s16 *param1, s16 *param2) void ov62_02230E80(UnkStruct_0208C06C *param0) { s16 v0, v1; - UnkStruct_020127E8 v2; + FontOAMInitData v2; Strbuf *v3; int v4; MessageLoader *v5; @@ -684,7 +684,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0) sub_02012AC0(v7[v11]->unk_14, (2 - 1)); Window_Remove(&v6); - sub_020129D0(v7[v11]->unk_14, 0); + FontOAM_SetDrawFlag(v7[v11]->unk_14, 0); } } } @@ -764,7 +764,7 @@ void ov62_0223113C(UnkStruct_0208C06C *param0) void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2) { s16 v0, v1; - UnkStruct_020127E8 v2; + FontOAMInitData v2; Strbuf *v3; int v4; MessageLoader *v5; @@ -801,7 +801,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par sub_02012AC0(param0->unk_0C, (2 - 1)); Window_Remove(&v6); - sub_020129D0(param0->unk_0C, 0); + FontOAM_SetDrawFlag(param0->unk_0C, 0); } void ov62_0223124C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2) diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index ed8db7520f..366737c914 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -2798,7 +2798,7 @@ void ov62_0223454C(UnkStruct_0208C06C *param0, UnkStruct_ov62_022312B0 *param1, ov62_0223124C(param1, ¶m0->unk_14, param3); SpriteActor_SetSpritePositionXY(param1->unk_08, param4, param5); sub_020128C4(param1->unk_0C, param6, param7); - sub_020129D0(param1->unk_0C, param9); + FontOAM_SetDrawFlag(param1->unk_0C, param9); sub_0200D364(param1->unk_08, param8); } diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 3ba5aa6684..b0a50130e2 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -298,7 +298,7 @@ BOOL ov62_02235008(UnkStruct_0208C06C *param0) sub_0200D638(param0->unk_534.unk_C8[v1].unk_00, &v0->unk_00[v1].unk_0C, &v2); sub_0200D614(param0->unk_534.unk_C8[v1].unk_00, v0->unk_00[v1].unk_0C, (25 + (36 * (5 - 1)) + (16 * (5 - (param0->unk_534.unk_1AC)))) * FX32_ONE); sub_020128C4(param0->unk_534.unk_C8[v1].unk_14, 36, -8); - sub_020129D0(param0->unk_534.unk_C8[v1].unk_14, 1); + FontOAM_SetDrawFlag(param0->unk_534.unk_C8[v1].unk_14, 1); } param0->unk_08++; diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c index e2e8ff1143..a726f3298a 100644 --- a/src/overlay062/ov62_02235278.c +++ b/src/overlay062/ov62_02235278.c @@ -305,7 +305,7 @@ static BOOL ov62_02235580(UnkStruct_0208C06C *param0) sub_0200D364(param0->unk_534.unk_00[v4].unk_00, param0->unk_818[param0->unk_534.unk_1B0].unk_0C); ov62_02230FC8(param0, ¶m0->unk_534.unk_00[param0->unk_534.unk_1A4], param0->unk_818[param0->unk_534.unk_1B0].unk_08, ¶m0->unk_818[param0->unk_534.unk_1B0]); - sub_020129D0(param0->unk_534.unk_00[param0->unk_534.unk_1A4].unk_14, 1); + FontOAM_SetDrawFlag(param0->unk_534.unk_00[param0->unk_534.unk_1A4].unk_14, 1); SpriteActor_EnableObject(param0->unk_534.unk_00[v4].unk_00, 1); } else { v5->unk_04 = v5->unk_00 - 4; diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 0db7476d43..0b644eeef2 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -741,7 +741,7 @@ static void ov62_02236C20(UnkStruct_0208C06C *param0) sub_0200D364(v0->unk_158[0].unk_08, 0); SpriteActor_SetSpritePositionXY(v0->unk_158[0].unk_08, 80, 232); sub_020128C4(v0->unk_158[0].unk_0C, 36, -8); - sub_020129D0(v0->unk_158[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_158[0].unk_0C, 1); } static void ov62_02236C94(UnkStruct_0208C06C *param0) diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index 42edeaa755..76bde760a7 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -109,7 +109,7 @@ static void ov62_02236D48(UnkStruct_0208C06C *param0) SpriteActor_SetSpritePositionXY(v0->unk_9C[1].unk_08, 128, 232); sub_020128C4(v0->unk_9C[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_9C[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_9C[1].unk_0C, 1); v0->unk_94[1] = ov62_022313E0(param0, NNS_G2D_VRAM_TYPE_2DSUB); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index faab054d19..fe26b8a079 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1304,11 +1304,11 @@ static void ov62_0223958C(UnkStruct_0208C06C *param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_198[1].unk_08, 1); - sub_020129D0(v0->unk_198[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_198[1].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_198[0].unk_08, 32, 232); } else { SpriteActor_EnableObject(v0->unk_198[1].unk_08, 0); - sub_020129D0(v0->unk_198[1].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_198[1].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_198[0].unk_08, 80, 232); } @@ -1336,8 +1336,8 @@ static void ov62_02239608(UnkStruct_0208C06C *param0) SpriteActor_SetSpritePositionXY(v0->unk_198[1].unk_08, 128, 232); sub_020128C4(v0->unk_198[0].unk_0C, 36, -8); sub_020128C4(v0->unk_198[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_198[0].unk_0C, 1); - sub_020129D0(v0->unk_198[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_198[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_198[1].unk_0C, 1); ov62_0223958C(param0, 0); } diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index d90f684982..57d1613338 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -578,11 +578,11 @@ static void ov62_0223A4C8(UnkStruct_0208C06C *param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_348[1].unk_08, 1); - sub_020129D0(v0->unk_348[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_348[1].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_348[0].unk_08, 32, 232); } else { SpriteActor_EnableObject(v0->unk_348[1].unk_08, 0); - sub_020129D0(v0->unk_348[1].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_348[1].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_348[0].unk_08, 80, 232); } diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index a2e336311c..5bbee1a0eb 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -795,11 +795,11 @@ static void ov62_0223D3A8 (UnkStruct_0208C06C * param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_A4[0].unk_08, 1); - sub_020129D0(v0->unk_A4[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_A4[0].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_A4[1].unk_08, 128, 232); } else { SpriteActor_EnableObject(v0->unk_A4[0].unk_08, 0); - sub_020129D0(v0->unk_A4[0].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_A4[0].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_A4[1].unk_08, 80, 232); } @@ -825,8 +825,8 @@ static void ov62_0223D424 (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_A4[1].unk_08, 128, 232); sub_020128C4(v0->unk_A4[0].unk_0C, 36, -8); sub_020128C4(v0->unk_A4[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_A4[0].unk_0C, 0); - sub_020129D0(v0->unk_A4[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_A4[0].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_A4[1].unk_0C, 1); ov62_0223D3A8(param0, 1); } diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 849f6596ba..93a9915a09 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -227,8 +227,8 @@ static void ov62_0223E01C (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_114[1].unk_08, 128, 232); sub_020128C4(v0->unk_114[0].unk_0C, 36, -8); sub_020128C4(v0->unk_114[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_114[0].unk_0C, 1); - sub_020129D0(v0->unk_114[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_114[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_114[1].unk_0C, 1); ov62_0223F0A8(param0, 0); } @@ -870,7 +870,7 @@ static void ov62_0223EF60 (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_114[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64); sub_0200D364(v0->unk_114[v1].unk_08, v3[v1]); sub_020128C4(v0->unk_114[v1].unk_0C, 36, -8); - sub_020129D0(v0->unk_114[v1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_114[v1].unk_0C, 1); } } @@ -904,11 +904,11 @@ static void ov62_0223F0A8 (UnkStruct_0208C06C * param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_114[1].unk_08, 1); - sub_020129D0(v0->unk_114[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_114[1].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_114[0].unk_08, 32, 232); } else { SpriteActor_EnableObject(v0->unk_114[1].unk_08, 0); - sub_020129D0(v0->unk_114[1].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_114[1].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_114[0].unk_08, 80, 232); } diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 497ed5a058..c1b4907165 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -3253,7 +3253,7 @@ static void ov62_02244BE4 (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_10[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64); sub_0200D364(v0->unk_10[v1].unk_08, v3[v1]); sub_020128C4(v0->unk_10[v1].unk_0C, 36, -8); - sub_020129D0(v0->unk_10[v1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[v1].unk_0C, 1); } } @@ -4023,11 +4023,11 @@ static void ov62_02245AC8 (UnkStruct_0208C06C * param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_10[0].unk_08, 1); - sub_020129D0(v0->unk_10[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[0].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_10[1].unk_08, 128, 232 - 64); } else { SpriteActor_EnableObject(v0->unk_10[0].unk_08, 0); - sub_020129D0(v0->unk_10[0].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_10[0].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_10[1].unk_08, 80, 232 - 64); } @@ -4053,8 +4053,8 @@ static void ov62_02245B24 (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_10[1].unk_08, 128, 232 - 64); sub_020128C4(v0->unk_10[0].unk_0C, 36, -8); sub_020128C4(v0->unk_10[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_10[0].unk_0C, 1); - sub_020129D0(v0->unk_10[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[1].unk_0C, 1); sub_0200D364(v0->unk_10[0].unk_08, 0); sub_0200D364(v0->unk_10[1].unk_08, 1); @@ -4080,11 +4080,11 @@ static void ov62_02245C08 (UnkStruct_0208C06C * param0, int param1) if (param1 == 0) { SpriteActor_EnableObject(v0->unk_10[1].unk_08, 1); - sub_020129D0(v0->unk_10[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[1].unk_0C, 1); SpriteActor_SetSpritePositionXY(v0->unk_10[0].unk_08, 32, 232); } else { SpriteActor_EnableObject(v0->unk_10[1].unk_08, 0); - sub_020129D0(v0->unk_10[1].unk_0C, 0); + FontOAM_SetDrawFlag(v0->unk_10[1].unk_0C, 0); SpriteActor_SetSpritePositionXY(v0->unk_10[0].unk_08, 80, 232); } @@ -4120,8 +4120,8 @@ static void ov62_02245C64 (UnkStruct_0208C06C * param0) SpriteActor_SetSpritePositionXY(v0->unk_10[1].unk_08, 128, 232); sub_020128C4(v0->unk_10[0].unk_0C, 36, -8); sub_020128C4(v0->unk_10[1].unk_0C, 36, -8); - sub_020129D0(v0->unk_10[0].unk_0C, 1); - sub_020129D0(v0->unk_10[1].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[0].unk_0C, 1); + FontOAM_SetDrawFlag(v0->unk_10[1].unk_0C, 1); ov62_02245C08(param0, 0); } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 6de24b49c1..600a5209e2 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -6643,7 +6643,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 Strbuf* v4; UnkStruct_02012B20 * v5; int v6; - UnkStruct_020127E8 v7; + FontOAMInitData v7; u32 v8; CellActorInitParamsEx v9[3] = { { @@ -6784,7 +6784,7 @@ static void ov65_02234DA0 (UnkStruct_ov65_0222EBE0 * param0) { if (param0->unk_BE0.unk_238 == 2) { CellActor_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1); - sub_020129D0(param0->unk_BE0.unk_234, 1); + FontOAM_SetDrawFlag(param0->unk_BE0.unk_234, 1); } param0->unk_BE0.unk_238 = 0; diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index d4ea4dfc1d..fc5427e36f 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -135,13 +135,13 @@ void ov76_0223B940(UnkStruct_ov76_0223DE00 *param0) void ov76_0223B96C(UnkStruct_ov76_0223DE00 *param0, BOOL param1) { - sub_020129D0(param0->unk_D4.unk_164[0], param1); - sub_020129D0(param0->unk_D4.unk_164[1], param1); + FontOAM_SetDrawFlag(param0->unk_D4.unk_164[0], param1); + FontOAM_SetDrawFlag(param0->unk_D4.unk_164[1], param1); } void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Strbuf *v1; int v2; int v3; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 63252dfb8b..c6b00779c5 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -271,7 +271,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U ov104_0223E29C(param0, &v0->unk_7C, v10, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 2004, 208 + -92 + param0->unk_28, 11 * 8 + param0->unk_2A, 0, NULL); - sub_020129D0(v0->unk_7C.unk_00, 0); + FontOAM_SetDrawFlag(v0->unk_7C.unk_00, 0); Strbuf_Free(v10); MessageLoader_Free(v9); } @@ -370,7 +370,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U PaletteData_BlendMulti(param0->unk_1C, 2, param0->unk_164 ^ 0x3fff, 14, 0x0); PaletteData_Blend(param0->unk_1C, 2, param0->unk_160 * 16, 16, 0, (GX_RGB(0, 0, 0))); sub_0200AB4C(-14, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD, 1); - sub_020129D0(v0->unk_7C.unk_00, 1); + FontOAM_SetDrawFlag(v0->unk_7C.unk_00, 1); param0->unk_00++; } break; @@ -421,7 +421,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E3B8 *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C *param10) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 75cb7705a4..9a98f01f94 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -1003,7 +1003,7 @@ static void ov113_0225D484(UnkStruct_ov113_0225DBCC *param0) v2 = MessageLoader_GetNewStrbuf(param0->unk_30, 1); ov113_0225E15C(param0, ¶m0->unk_19C0, v2, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 0, 10003, 0x1c * 8, 176, 1); - sub_020129D0(param0->unk_19C0.unk_00, 1); + FontOAM_SetDrawFlag(param0->unk_19C0.unk_00, 1); Strbuf_Free(v2); } } @@ -1503,7 +1503,7 @@ static void ov113_0225E118(UnkStruct_ov113_0225DBCC *param0) static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225E250 *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 33a453f20b..b6dd7c48f7 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -4424,7 +4424,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 { int v2; BOOL v3; - UnkStruct_020127E8 v4; + FontOAMInitData v4; param0->unk_5C = Strbuf_Init(16, param3); Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); @@ -4455,7 +4455,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 param0->unk_48 = sub_02012B60(&v4, param0->unk_4C); - sub_020129D0(param0->unk_48, 0); + FontOAM_SetDrawFlag(param0->unk_48, 0); Window_Remove(¶m0->unk_38); } @@ -4499,7 +4499,7 @@ static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 Window_Remove(¶m0->unk_38); } - sub_020129D0(param0->unk_48, 1); + FontOAM_SetDrawFlag(param0->unk_48, 1); CellActor_SetDrawFlag(param0->unk_34, 1); param0->unk_98 = 1; @@ -4556,7 +4556,7 @@ static void ov115_02265820(UnkStruct_ov115_02265788 *param0) param0->unk_94--; } else { param0->unk_98 = 0; - sub_020129D0(param0->unk_48, 0); + FontOAM_SetDrawFlag(param0->unk_48, 0); CellActor_SetDrawFlag(param0->unk_34, 0); } break; diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index 26a2393f19..3b02b8f5ca 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -2011,7 +2011,7 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022 void ov117_02265DB8(BgConfig *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { - UnkStruct_020127E8 v0; + FontOAMInitData v0; Window v1; SpriteManagerAllocation v2; int v3; diff --git a/src/unk_02012744.c b/src/unk_02012744.c index 1dcebb5cd5..049c21b515 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -66,8 +66,8 @@ static int sub_02012DE4(int param0, int param1, int param2, UnkStruct_02013034 * static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5); static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, int param7); static int sub_02013034(const UnkStruct_02013034 *param0, int param1); -static void sub_02013088(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3); -static CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2); +static void sub_02013088(const FontOAMInitData *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3); +static CellActor *sub_02013100(const FontOAMInitData *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2); static void sub_020130DC(FontOAM *param0); static UnkStruct_02013034 *sub_02013188(int param0); static void sub_020131A4(UnkStruct_02013034 *param0); @@ -129,7 +129,7 @@ void sub_020127BC(UnkStruct_02012744 *param0) Heap_FreeToHeap(param0); } -FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0) +FontOAM *sub_020127E8(const FontOAMInitData *param0) { FontOAM *v0; UnkStruct_02013034 v1; @@ -256,7 +256,7 @@ void sub_020129A4(const FontOAM *param0, int *param1, int *param2) *param2 = param0->unk_10; } -void sub_020129D0(FontOAM *param0, BOOL param1) +void FontOAM_SetDrawFlag(FontOAM *param0, BOOL param1) { int v0; @@ -357,7 +357,7 @@ int sub_02012B58(const UnkStruct_02012B20 *param0, int param1) return sub_02013034(¶m0->unk_00, param1); } -FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1) +FontOAM *sub_02012B60(const FontOAMInitData *param0, const UnkStruct_02012B20 *param1) { FontOAM *v0; NNSG2dImageProxy *v1; @@ -693,7 +693,7 @@ static int sub_02013034(const UnkStruct_02013034 *param0, int param1) return v3; } -static void sub_02013088(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3) +static void sub_02013088(const FontOAMInitData *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3) { UnkStruct_02013034 *v0; int v1; @@ -722,7 +722,7 @@ static void sub_020130DC(FontOAM *param0) } } -static CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2) +static CellActor *sub_02013100(const FontOAMInitData *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2) { CellActorInitParams v0; CellActorResourceData v1; diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 3e400aa39c..9d5ab58aef 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -697,7 +697,7 @@ void sub_0208B064 (UnkStruct_02089688 * param0) void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int param3, int param4) { s16 v0, v1; - UnkStruct_020127E8 v2; + FontOAMInitData v2; Strbuf* v3; int v4; int v5; From d297701359868d686256ddd3defaa08b603d7bd7 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:36:38 -0500 Subject: [PATCH 5/6] Rename some functions --- include/battle/battle_input.h | 4 +- include/battle/ov16_0223DF00.h | 4 +- include/battle/ov16_0226DE44.h | 6 +- src/battle/battle_display.c | 6 +- src/battle/battle_input.c | 628 ++++++++++++++++----------------- src/battle/battle_io_command.c | 2 +- src/battle/ov16_0223DF00.c | 8 +- src/battle/ov16_0226DE44.c | 8 +- src/overlay013/ov13_022264F4.c | 6 +- src/overlay013/ov13_02227BDC.c | 2 +- 10 files changed, 335 insertions(+), 339 deletions(-) diff --git a/include/battle/battle_input.h b/include/battle/battle_input.h index c788118d68..2750ead28c 100644 --- a/include/battle/battle_input.h +++ b/include/battle/battle_input.h @@ -25,9 +25,9 @@ void BattleInput_EnableBallGauge(BattleInput *input); void BattleInput_DisableBallGauge(BattleInput *input); int BattleInput_CheckTouch(BattleInput *input); BOOL BattleInput_CheckEffectEnded(BattleInput *input); -int ov16_02269368(int param0, int param1); +int GetSelectedMonsFromMoveRange(int param0, int param1); void ov16_0226940C(BattleInput *input); -void ov16_0226947C(BattleInput *input, int param1, int param2); +void BattleInput_StartHorizontalScrollTask(BattleInput *input, int param1, int param2); void ov16_0226AC98(BattleInput *input, int param1, const MoveDisplayInfo *param2); void ov16_0226BCCC(BattleInput *input, int param1); BOOL ov16_0226BCD0(BattleInput *input); diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 0915d6b10a..7f6bd0159b 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -222,8 +222,8 @@ int ov16_0223F1F8(BattleSystem *battleSys); u16 *ov16_0223F204(BattleSystem *battleSys); u16 *ov16_0223F210(BattleSystem *battleSys); int BattleSystem_FieldWeather(BattleSystem *battleSys); -u8 ov16_0223F228(BattleSystem *battleSys); -void ov16_0223F234(BattleSystem *battleSys, u8 param1); +u8 BattleSystem_GetCatchingTutorialState(BattleSystem *battleSys); +void CatchingTutorial_SetCatchingTutorialState(BattleSystem *battleSys, u8 param1); int ov16_0223F240(BattleSystem *battleSys); void ov16_0223F24C(BattleSystem *battleSys, int param1); void ov16_0223F268(BattleSystem *battleSys); diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index a0c04ce867..501741d0d2 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -12,10 +12,10 @@ void CatchingTutorialFinger_LoadResources(SpriteRenderer *param0, SpriteGfxHandl void CatchingTutorialFinger_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); CatchingTutorialFinger *CatchingTutorialFinger_Create(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); void CatchingTutorialFinger_Free(CatchingTutorialFinger *param0); -void ov16_0226DF80(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3); +void CatchingTutorialFinger_SetPosition(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3); void ov16_0226DFB0(CatchingTutorialFinger *param0, int param1, int param2); void ov16_0226DFBC(CatchingTutorialFinger *param0); -void ov16_0226DFD0(CatchingTutorialFinger *param0, int param1); -BOOL ov16_0226DFD4(CatchingTutorialFinger *param0); +void CatchingTutorialFinger_RequestTouch(CatchingTutorialFinger *param0, int param1); +BOOL CatchingTutorialFinger_CheckTouchAnimationFinished(CatchingTutorialFinger *param0); #endif // POKEPLATINUM_OV16_0226DE44_H diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 9c427eb829..33c9722221 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -2913,7 +2913,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) v9 = BattleSystem_GetMessageLoader(v0->unk_00); if (v4 & 0x400) { - switch (ov16_0223F228(v0->unk_00)) { + switch (BattleSystem_GetCatchingTutorialState(v0->unk_00)) { case 0: v10.tags = 2; v10.params[0] = v0->unk_09 | (v0->unk_23 << 8); @@ -3304,7 +3304,7 @@ static void ov16_02260C00(SysTask *param0, void *param1) v0->unk_20++; default: if (ov16_0226BCD0(battleInput) == 1) { - ov16_0223F234(v0->unk_00, 1); + CatchingTutorial_SetCatchingTutorialState(v0->unk_00, 1); ClearCommand(v0->unk_00, v0->unk_1D, v0->unk_1C); Heap_FreeToHeap(param1); SysTask_Done(param0); @@ -3437,7 +3437,7 @@ static void ov16_02260F14(SysTask *param0, void *param1) } v6.unk_20 = v0->unk_0E; - v6.unk_21 = ov16_02269368(v0->unk_30, v0->unk_0E); + v6.unk_21 = GetSelectedMonsFromMoveRange(v0->unk_30, v0->unk_0E); BattleInput_ChangeMenu(v8, v9, battleInput, 12, 0, &v6); NARC_dtor(v8); diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index d8226c4f90..29897342dc 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -147,7 +147,7 @@ typedef struct { typedef struct { const UnkStruct_ov16_022702F4 *unk_00; u8 unk_04; - s8 unk_05; + s8 y; } UnkStruct_ov16_02268A14_sub1; typedef struct { @@ -157,15 +157,15 @@ typedef struct { } BattleInputTextObject; typedef struct { - s16 unk_00; + s16 dx; u8 unk_02; - u8 unk_03; + u8 state; u8 unk_04; - u8 unk_05; + u8 wait; u8 unk_06; u8 unk_07; u8 unk_08; -} UnkStruct_ov16_02268FCC; +} BallGaugeAnimation; typedef struct { u8 unk_00; @@ -218,7 +218,7 @@ struct BattleInput_t { CellActorData *unk_5FC[4]; CellActorData *unk_60C[4]; SysTask *unk_61C[4]; - UnkStruct_ov16_02268FCC unk_62C[6]; + BallGaugeAnimation ballGaugeAnimations[6]; SysTask *unk_664; u8 unk_668; u8 unk_669; @@ -235,9 +235,9 @@ struct BattleInput_t { SysTask *unk_678; BattleInputEffect effect; BattleInputEffectColor effectColor; - s32 xEdge; - s32 unk_6B0; - s32 unk_6B4; + s32 scrollXEdge; + s32 scrollXSpeed; + s32 scrollXEnd; BattleCursor *cursor; BattleCursorMove cursorMove; u8 keyPressed; @@ -311,8 +311,8 @@ static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput static void ov16_02269F68(BattleInput *battleInput, int param1, int param2); static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2); static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2); -static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2); -static void ov16_0226B088(BattleInput *battleInput, int param1); +static void BattleInput_LoadMoveButtonPalette(BattleInput *battleInput, int param1, int param2); +static void BattleInput_LoadBlankMoveButtonPalettes(BattleInput *battleInput, int param1); static void ov16_0226B0DC(BattleInput *battleInput, int param1); static int ov16_0226A934(u8 param0); static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput); @@ -330,8 +330,8 @@ static void EffectTask_PokemonButtonDown(SysTask *task, void *param1); static void ov16_0226B264(BattleInput *battleInput, int param1, u8 *param2, int param3); static void ov16_0226B20C(BattleInput *battleInput, u8 *param1, int param2); static void ov16_0226B318(BattleInput *battleInput, int param1); -void ov16_0226947C(BattleInput *battleInput, int param1, int param2); -static void ov16_022694A8(SysTask *task, void *param1); +void BattleInput_StartHorizontalScrollTask(BattleInput *battleInput, int param1, int param2); +static void Task_BattleMenuScrollHorizontal(SysTask *task, void *param1); static void ov16_0226B314(BattleInput *battleInput, int param1); static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, BattleInputTextImage *param10); static void BattleInput_DestroyTextObjects(BattleInput *battleInput); @@ -347,7 +347,7 @@ static TextColor GetPPTextColor(int param0, int param1); void ov16_0226BCCC(BattleInput *battleInput, int param1); BOOL ov16_0226BCD0(BattleInput *battleInput); static void ov16_0226BCE4(SysTask *task, void *param1); -static void ov16_02268FCC(SysTask *task, void *param1); +static void Task_AnimateBallGauge(SysTask *task, void *param1); static int ov16_0226BE48(BattleInput *battleInput); static int ov16_0226BEC0(BattleInput *battleInput, int param1); static int ov16_0226C1F8(BattleInput *battleInput, int param1); @@ -892,7 +892,7 @@ __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_022702 { 0x12, 0x17, 0xB, 0x14 }, }; -__attribute__((aligned(4))) static const s16 Unk_ov16_022703F4[][3] = { +__attribute__((aligned(4))) static const s16 sMoveButtonTouchscreenOffset[][3] = { { 0x0, 0xC0, 0x180 }, { 0x0, 0xC0, 0x180 }, { 0x0, 0xC0, 0x180 }, @@ -900,7 +900,7 @@ __attribute__((aligned(4))) static const s16 Unk_ov16_022703F4[][3] = { { 0x0, 0xC0, 0x180 }, }; -__attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_02270378[] = { +__attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 sMoveButtonTouchscreenRect[] = { { 0x2, 0x9, 0x0, 0xF }, { 0x2, 0x9, 0x10, 0x1F }, { 0xA, 0x11, 0x0, 0xF }, @@ -1050,7 +1050,7 @@ void ov16_022687A0(BgConfig *bgConfig) } } -void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *battleSystem, int gender, u8 *param4) +void *BattleInput_NewInit(NARC *narcUnused, NARC *param1, BattleSystem *battleSystem, int gender, u8 *param4) { BattleInput *battleInput; PaletteData *palette; @@ -1187,14 +1187,14 @@ void ov16_02268A88(BattleInput *battleInput) { BgConfig *bgConfig; SpriteRenderer *spriteRenderer; - SpriteGfxHandler *v2; - PaletteData *v3; + SpriteGfxHandler *gfxHandler; + PaletteData *palette; int i; spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - v2 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); int v5; @@ -1206,16 +1206,16 @@ void ov16_02268A88(BattleInput *battleInput) Graphics_LoadTilesToBgLayer(7, v5, bgConfig, 4, 0, 0x6000, 1, HEAP_ID_BATTLE); - sub_0207C9EC(spriteRenderer, v2, 20017, 20017); - MoveTypeIcon_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); + sub_0207C9EC(spriteRenderer, gfxHandler, 20017, 20017); + MoveTypeIcon_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, gfxHandler, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (i = 0; i < 4; i++) { - sub_0207C948(spriteRenderer, v2, NNS_G2D_VRAM_TYPE_2DSUB, TYPE_NORMAL, 20025 + i); + sub_0207C948(spriteRenderer, gfxHandler, NNS_G2D_VRAM_TYPE_2DSUB, TYPE_NORMAL, 20025 + i); } if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { - CatchingTutorialFinger_LoadResources(spriteRenderer, v2, HEAP_ID_BATTLE, v3, 20412, 20036, 20406, 20395); - battleInput->catchingTutorial.finger = CatchingTutorialFinger_Create(spriteRenderer, v2, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0); + CatchingTutorialFinger_LoadResources(spriteRenderer, gfxHandler, HEAP_ID_BATTLE, palette, 20412, 20036, 20406, 20395); + battleInput->catchingTutorial.finger = CatchingTutorialFinger_Create(spriteRenderer, gfxHandler, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0); } } @@ -1238,7 +1238,7 @@ void ov16_02268B8C(BattleInput *battleInput) } } -void BattleInput_ChangeMenu(NARC *param0, NARC *param1, BattleInput *battleInput, int menuId, int param4, void *param5) +void BattleInput_ChangeMenu(NARC *narcUnused, NARC *param1, BattleInput *battleInput, int menuId, int param4, void *param5) { const BattleMenuTemplate *menuTemplate, *prevMenuTemplate; int i; @@ -1318,7 +1318,7 @@ void BattleInput_CreateBallGagueObjects(NARC *narc, BattleInput *battleInput) BattleInput_DisableBallGauge(battleInput); GF_ASSERT(battleInput->unk_08 == NULL); - battleInput->unk_08 = SysTask_Start(ov16_02268FCC, battleInput, 1300); + battleInput->unk_08 = SysTask_Start(Task_AnimateBallGauge, battleInput, 1300); PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); BattleCursor_LoadResources(spriteRenderer, spriteGfxHandler, palette, 5, 20411, 20035, 20405, 20394); @@ -1359,71 +1359,71 @@ static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput) BattleCursor_Free(battleInput->cursor); } -static void ov16_02268FCC(SysTask *task, void *data) +static void Task_AnimateBallGauge(SysTask *task, void *data) { BattleInput *battleInput = data; int i; - UnkStruct_ov16_02268FCC *v2; + BallGaugeAnimation *ballAnim; for (i = 0; i < 6; i++) { - v2 = &battleInput->unk_62C[i]; + ballAnim = &battleInput->ballGaugeAnimations[i]; - switch (v2->unk_03) { + switch (ballAnim->state) { case 0: default: if (sub_0200D400(battleInput->actorBallGague[i]->unk_00) == 0) { break; } - if (v2->unk_02 >= 87) { - v2->unk_04 = 0; - v2->unk_05 = 10; + if (ballAnim->unk_02 >= 87) { + ballAnim->unk_04 = 0; + ballAnim->wait = 10; } else { break; } - v2->unk_05 += LCRNG_Next() % 8; - v2->unk_07 = 2; - v2->unk_03++; + ballAnim->wait += LCRNG_Next() % 8; + ballAnim->unk_07 = 2; + ballAnim->state++; break; case 1: - if (v2->unk_05 > 0) { - v2->unk_05--; + if (ballAnim->wait > 0) { + ballAnim->wait--; break; } - v2->unk_03++; + ballAnim->state++; break; case 2: case 4: sub_0200D7C0(battleInput->actorBallGague[i], 0x800); - v2->unk_00 += 0x180; + ballAnim->dx += 0x180; - sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); - v2->unk_06++; + sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + ballAnim->unk_06++; - if (v2->unk_06 >= v2->unk_07) { - v2->unk_06 = 0; + if (ballAnim->unk_06 >= ballAnim->unk_07) { + ballAnim->unk_06 = 0; - if (v2->unk_03 == 2) { - v2->unk_03++; + if (ballAnim->state == 2) { + ballAnim->state++; } else { sub_0200D79C(battleInput->actorBallGague[i], 0); sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); - v2->unk_00 = 0; + ballAnim->dx = 0; - if (v2->unk_08 < 1) { - v2->unk_08++; + if (ballAnim->unk_08 < 1) { + ballAnim->unk_08++; - if (v2->unk_07 > 1) { - v2->unk_07--; + if (ballAnim->unk_07 > 1) { + ballAnim->unk_07--; } - v2->unk_03 = 2; + ballAnim->state = 2; } else { - v2->unk_08 = 0; - v2->unk_03 = 0; + ballAnim->unk_08 = 0; + ballAnim->state = 0; } } } @@ -1431,14 +1431,14 @@ static void ov16_02268FCC(SysTask *task, void *data) break; case 3: sub_0200D7C0(battleInput->actorBallGague[i], -0x800); - v2->unk_00 -= 0x180; + ballAnim->dx -= 0x180; - sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT)); - v2->unk_06++; + sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + ballAnim->unk_06++; - if (v2->unk_06 >= v2->unk_07 * 2) { - v2->unk_06 = 0; - v2->unk_03++; + if (ballAnim->unk_06 >= ballAnim->unk_07 * 2) { + ballAnim->unk_06 = 0; + ballAnim->state++; } break; } @@ -1448,7 +1448,7 @@ static void ov16_02268FCC(SysTask *task, void *data) void ov16_0226914C(BattleInput *battleInput, const u8 *param1) { for (int i = 0; i < 6; i++) { - battleInput->unk_62C[i].unk_02 = param1[i]; + battleInput->ballGaugeAnimations[i].unk_02 = param1[i]; } } @@ -1564,22 +1564,22 @@ BOOL BattleInput_CheckEffectEnded(BattleInput *battleInput) return FALSE; } -int ov16_02269368(int param0, int param1) +int GetSelectedMonsFromMoveRange(int moveRange, int battlerId) { - switch (param0) { + switch (moveRange) { case 0x0: - return (param1 == 4) ? 9 : 8; + return (battlerId == 4) ? 9 : 8; case 0x1: case 0x2: case 0x10: - return (param1 == 4) ? 6 : 4; + return (battlerId == 4) ? 6 : 4; case 0x4: case 0x80: return 1; case 0x8: - return (param1 == 4) ? 7 : 2; + return (battlerId == 4) ? 7 : 2; case 0x100: - return (param1 == 4) ? 4 : 6; + return (battlerId == 4) ? 4 : 6; case 0x40: return 3; case 0x200: @@ -1600,7 +1600,7 @@ void ov16_0226940C(BattleInput *battleInput) G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); - int x = 255 - (battleInput->xEdge / 0x100); + int x = 255 - (battleInput->scrollXEdge / 0x100); if (x < 0) { x = 0; @@ -1609,33 +1609,33 @@ void ov16_0226940C(BattleInput *battleInput) G2S_SetWnd0Position(x, 0, 255, 192); } -void ov16_0226947C(BattleInput *battleInput, int param1, int param2) +void BattleInput_StartHorizontalScrollTask(BattleInput *battleInput, int xSpeed, int xEnd) { - if (battleInput->xEdge == param2 * 0x100) { + if (battleInput->scrollXEdge == xEnd * 0x100) { return; } - battleInput->unk_6B0 = param1; - battleInput->unk_6B4 = param2 << 8; + battleInput->scrollXSpeed = xSpeed; + battleInput->scrollXEnd = xEnd << 8; - SysTask_Start(ov16_022694A8, battleInput, 1200); + SysTask_Start(Task_BattleMenuScrollHorizontal, battleInput, 1200); } -static void ov16_022694A8(SysTask *param0, void *param1) +static void Task_BattleMenuScrollHorizontal(SysTask *task, void *data) { - BattleInput *battleInput = param1; + BattleInput *battleInput = data; int isFinished = 0; BgConfig *bgConfig; bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - battleInput->xEdge += battleInput->unk_6B0; + battleInput->scrollXEdge += battleInput->scrollXSpeed; - if (((battleInput->unk_6B0 <= 0) && (battleInput->xEdge <= battleInput->unk_6B4)) || ((battleInput->unk_6B0 > 0) && (battleInput->xEdge >= battleInput->unk_6B4))) { - battleInput->xEdge = battleInput->unk_6B4; + if (((battleInput->scrollXSpeed <= 0) && (battleInput->scrollXEdge <= battleInput->scrollXEnd)) || ((battleInput->scrollXSpeed > 0) && (battleInput->scrollXEdge >= battleInput->scrollXEnd))) { + battleInput->scrollXEdge = battleInput->scrollXEnd; isFinished = 1; } - Bg_SetOffset(bgConfig, 6, 0, battleInput->xEdge / 0x100); + Bg_SetOffset(bgConfig, 6, 0, battleInput->scrollXEdge / 0x100); ov16_0226940C(battleInput); if (isFinished == 1) { @@ -1643,12 +1643,12 @@ static void ov16_022694A8(SysTask *param0, void *param1) Bg_ToggleLayer(7, 0); Bg_SetPriority(7, 0); GXS_SetVisibleWnd(GX_WNDMASK_NONE); - SysTask_Done(param0); + SysTask_Done(task); return; } } -static void BattleInput_InitSlideIn(BattleInput *battleInput, int param1) +static void BattleInput_InitSlideIn(BattleInput *battleInput, int battlerId) { BOOL ret; BattleMenuSlideIn *menuSlideIn; @@ -1666,7 +1666,7 @@ static void BattleInput_InitSlideIn(BattleInput *battleInput, int param1) MI_CpuClear8(menuSlideIn, sizeof(BattleMenuSlideIn)); menuSlideIn->battleInput = battleInput; - menuSlideIn->unk_12 = param1; + menuSlideIn->unk_12 = battlerId; menuSlideIn->unk_08 = -(255 * 100); menuSlideIn->unk_0A = (40 * 100); menuSlideIn->unk_0C = ((255 * 100) - menuSlideIn->unk_08) / 100; @@ -1691,7 +1691,7 @@ static void ov16_02269654(BattleInput *battleInput, int param1, int param2) static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int param1, int param2) { - Strbuf *strFight, *strBag, *v2, *v3; + Strbuf *strFight, *strBag, *strPokemon, *strRun; MessageLoader *msgLoader; int v5; UnkStruct_ov16_02269668 *v6; @@ -1708,34 +1708,34 @@ static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_SAFARI) { strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00931); // BALL strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD + strPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_PAL_PARK) { strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01223); // BALL strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00932); // BAIT - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD + strPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00933); // MUD } else { strFight = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00924); // FIGHT strBag = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00925); // BAG - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00926); // POKĂ©MON + strPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00926); // POKĂ©MON } if (battleInput->runCommandType == BI_RUNCMD_CANCEL) { - v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00928); // CANCEL + strRun = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00928); // CANCEL battleInput->canCancel = 1; } else { - v3 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00927); // RUN + strRun = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00927); // RUN battleInput->canCancel = 0; } BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strFight, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], strBag, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[2], strPokemon, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[3], strRun, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); Strbuf_Free(strFight); Strbuf_Free(strBag); - Strbuf_Free(v2); - Strbuf_Free(v3); + Strbuf_Free(strPokemon); + Strbuf_Free(strRun); if ((BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_NO_MOVES) == 0) { Pokemon *v7; @@ -1812,7 +1812,7 @@ static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, { BattleInputMoveMenu *moveMenu; int i; - MessageLoader *v2; + MessageLoader *msgLoader; MoveDisplayObject *moveDisplay; TextColor ppColor; @@ -1821,7 +1821,7 @@ static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, battleInput->unk_66A = moveMenu->unk_10; - v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); moveDisplay = BattleInput_GetBattlerMoveDisplayObject(battleInput, moveMenu->unk_10); BattleInput_CreateTypeIcons(battleInput); @@ -1842,11 +1842,9 @@ static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, } { - Strbuf *v5; - - v5 = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00929); // CANCEL - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); - Strbuf_Free(v5); + Strbuf *strCancel = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00929); // CANCEL + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], strCancel, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL); + Strbuf_Free(strCancel); } { @@ -1855,9 +1853,9 @@ static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (moveMenu->unk_00[i] != 0) { moveType = MoveTable_LoadParam(moveMenu->unk_00[i], MOVEATTRIBUTE_TYPE); - ov16_0226B06C(battleInput, moveType, i); + BattleInput_LoadMoveButtonPalette(battleInput, moveType, i); } else { - ov16_0226B088(battleInput, i); + BattleInput_LoadBlankMoveButtonPalettes(battleInput, i); break; } } @@ -1913,44 +1911,44 @@ static void BattleInput_CreateYesNoTextObjects(BattleInput *battleInput, int par static void ov16_02269D14(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *strForget, *v2; + Strbuf *strForget, *strKeep; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); strForget = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01181); // Forget a move! - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01182); // Keep old moves! + strKeep = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01182); // Keep old moves! BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strForget, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], strKeep, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(strForget); - Strbuf_Free(v2); + Strbuf_Free(strKeep); } static void BattleInput_CreateCancelLearningMoveObjects(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *strGiveUp, *v2, *v3, *v4; - StringTemplate *v5; + Strbuf *strGiveUp, *strDontGiveUp, *strGiveUpFormated, *v4; + StringTemplate *strTemplate; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v5 = BattleSystem_StringTemplate(battleInput->battleSystem); + strTemplate = BattleSystem_StringTemplate(battleInput->battleSystem); strGiveUp = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01186); // Give up on {move}? - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01187); // Don't give up on {move}! - v3 = Strbuf_Init(100, 5); + strDontGiveUp = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01187); // Don't give up on {move}! + strGiveUpFormated = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); - StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, strGiveUp); - StringTemplate_Format(v5, v4, v2); + StringTemplate_SetMoveName(strTemplate, 0, v6->unk_00); + StringTemplate_Format(strTemplate, strGiveUpFormated, strGiveUp); + StringTemplate_Format(strTemplate, v4, strDontGiveUp); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strGiveUpFormated, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(strGiveUp); - Strbuf_Free(v2); - Strbuf_Free(v3); + Strbuf_Free(strDontGiveUp); + Strbuf_Free(strGiveUpFormated); Strbuf_Free(v4); } @@ -1965,25 +1963,25 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) strStop = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01260); // STOP { - BgConfig *v2; - NNSG2dScreenData *v3; + BgConfig *bgConfig; + NNSG2dScreenData *screenData; void *v4; - v4 = Graphics_GetScrnData(7, 46, 1, &v3, 5); - MI_CpuCopy32(v3->rawData, battleInput->unk_3C[6], 0x800); + v4 = Graphics_GetScrnData(7, 46, 1, &screenData, 5); + MI_CpuCopy32(screenData->rawData, battleInput->unk_3C[6], 0x800); Heap_FreeToHeap(v4); - v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); - Bg_LoadTilemapBuffer(v2, 4, battleInput->unk_3C[6], 0x800); - Bg_ScheduleTilemapTransfer(v2, 4); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + Bg_LoadTilemapBuffer(bgConfig, 4, battleInput->unk_3C[6], 0x800); + Bg_ScheduleTilemapTransfer(bgConfig, 4); } { - BgConfig *v5 = BattleSystem_GetBgConfig(battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); MI_CpuClear32(battleInput->unk_3C[4], 0x800); - Bg_LoadTilemapBuffer(v5, 5, battleInput->unk_3C[4], 0x800); - Bg_ScheduleTilemapTransfer(v5, 5); + Bg_LoadTilemapBuffer(bgConfig, 5, battleInput->unk_3C[4], 0x800); + Bg_ScheduleTilemapTransfer(bgConfig, 5); } BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strStop, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL); @@ -1993,56 +1991,56 @@ static void ov16_02269E94(BattleInput *battleInput, int param1, int param2) static void ov16_02269F68(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *strNextPokemon, *v2, *v3, *v4; - StringTemplate *v5; + Strbuf *strNextPokemon, *strFlee, *strNextPokemonFormated, *v4; + StringTemplate *strTemplate; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v5 = BattleSystem_StringTemplate(battleInput->battleSystem); + strTemplate = BattleSystem_StringTemplate(battleInput->battleSystem); strNextPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01217); // Use next PokĂ©mon - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01218); // Flee - v3 = Strbuf_Init(100, 5); + strFlee = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01218); // Flee + strNextPokemonFormated = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); - StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, strNextPokemon); - StringTemplate_Format(v5, v4, v2); + StringTemplate_SetMoveName(strTemplate, 0, v6->unk_00); + StringTemplate_Format(strTemplate, strNextPokemonFormated, strNextPokemon); + StringTemplate_Format(strTemplate, v4, strFlee); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strNextPokemonFormated, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(strNextPokemon); - Strbuf_Free(v2); - Strbuf_Free(v3); + Strbuf_Free(strFlee); + Strbuf_Free(strNextPokemonFormated); Strbuf_Free(v4); } static void ov16_0226A04C(BattleInput *battleInput, int param1, int param2) { MessageLoader *msgLoader; - Strbuf *strSwitchPokemon, *v2, *v3, *v4; - StringTemplate *v5; + Strbuf *strSwitchPokemon, *strKeepBattling, *strSwitchtPokemonFormated, *v4; + StringTemplate *strTemplate; UnkStruct_ov16_022623F0 *v6; v6 = &battleInput->menu.val4; msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v5 = BattleSystem_StringTemplate(battleInput->battleSystem); + strTemplate = BattleSystem_StringTemplate(battleInput->battleSystem); strSwitchPokemon = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01215); // Switch PokĂ©mon - v2 = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01216); // Keep battling - v3 = Strbuf_Init(100, 5); + strKeepBattling = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_01216); // Keep battling + strSwitchtPokemonFormated = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); - StringTemplate_SetMoveName(v5, 0, v6->unk_00); - StringTemplate_Format(v5, v3, strSwitchPokemon); - StringTemplate_Format(v5, v4, v2); + StringTemplate_SetMoveName(strTemplate, 0, v6->unk_00); + StringTemplate_Format(strTemplate, strSwitchtPokemonFormated, strSwitchPokemon); + StringTemplate_Format(strTemplate, v4, strKeepBattling); - BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); + BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strSwitchtPokemonFormated, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL); Strbuf_Free(strSwitchPokemon); - Strbuf_Free(v2); - Strbuf_Free(v3); + Strbuf_Free(strKeepBattling); + Strbuf_Free(strSwitchtPokemonFormated); Strbuf_Free(v4); } @@ -2050,12 +2048,12 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) { BattleInputPokemonMenu *pokemonMenu; int i; - MessageLoader *v2; + MessageLoader *msgLoader; u8 v3[4]; Strbuf *v4, *genderMarker; - Pokemon *v6; + Pokemon *pokemon; BoxPokemon *v7; - StringTemplate *v8; + StringTemplate *stringTemplate; TextColor v9; u8 v10[6]; u8 v11[6]; @@ -2066,8 +2064,8 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) battleInput->unk_66C = pokemonMenu->unk_21; battleInput->unk_66A = pokemonMenu->unk_20; - v2 = BattleSystem_GetMessageLoader(battleInput->battleSystem); - v8 = BattleSystem_StringTemplate(battleInput->battleSystem); + msgLoader = BattleSystem_GetMessageLoader(battleInput->battleSystem); + stringTemplate = BattleSystem_StringTemplate(battleInput->battleSystem); ov16_0226B20C(battleInput, v3, 0); ov16_0226A698(battleInput); @@ -2082,18 +2080,18 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) if ((pokemonMenu->unk_00[v12].unk_01_2 == 1) && (v3[i] == 1)) { if (pokemonMenu->unk_00[v12].unk_01_0 == 0) { - genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00962); // ♂ + genderMarker = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00962); // ♂ } else if (pokemonMenu->unk_00[v12].unk_01_0 == 1) { - genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00963); // ♀ + genderMarker = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00963); // ♀ } else { - genderMarker = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00964); //(genderless) + genderMarker = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00964); //(genderless) } - v6 = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, pokemonMenu->unk_00[v12].unk_00); - v7 = Pokemon_GetBoxPokemon(v6); + pokemon = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, pokemonMenu->unk_00[v12].unk_00); + v7 = Pokemon_GetBoxPokemon(pokemon); - StringTemplate_SetNickname(v8, 0, v7); - StringTemplate_Format(v8, v4, genderMarker); + StringTemplate_SetNickname(stringTemplate, 0, v7); + StringTemplate_Format(stringTemplate, v4, genderMarker); if (i & 1) { v9 = TEXT_COLOR(1, 2, 3); @@ -2107,10 +2105,10 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) { switch (i) { case 1: - ov16_0226A7A4(battleInput, v6, 3, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, pokemon, 3, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); break; case 3: - ov16_0226A7A4(battleInput, v6, 5, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); + ov16_0226A7A4(battleInput, pokemon, 5, pokemonMenu->unk_00[v12].unk_04, pokemonMenu->unk_00[v12].unk_06, pokemonMenu->unk_00[v12].unk_02); break; } } @@ -2123,16 +2121,16 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) Strbuf_Free(v4); - Strbuf *strCancel = MessageLoader_GetNewStrbuf(v2, pl_msg_00000368_00930); // CANCEL + Strbuf *strCancel = MessageLoader_GetNewStrbuf(msgLoader, pl_msg_00000368_00930); // CANCEL BattleInput_CreateTextObject(battleInput, &battleInput->textObj[4], strCancel, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); Strbuf_Free(strCancel); } static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) { - int textObjId, frameType, v2; + int textObjId, frameType, battler; - v2 = 0xff; + battler = 0xff; switch (param1) { case 0xffffffff: @@ -2144,11 +2142,11 @@ static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) switch (battleInput->unk_66A) { case 0: - v2 = battleInput->unk_66A; + battler = battleInput->unk_66A; break; case 2: case 4: - v2 = battleInput->unk_66A - 2; + battler = battleInput->unk_66A - 2; break; } break; @@ -2174,7 +2172,7 @@ static int ov16_0226A318(BattleInput *battleInput, int param1, int param2) battleInput->effect.unk_04_val3.unk_0C = 1; battleInput->effect.unk_04_val3.unk_08 = param1; battleInput->effect.unk_04_val3.unk_0D = textObjId; - battleInput->effect.unk_04_val3.unk_0E = v2; + battleInput->effect.unk_04_val3.unk_0E = battler; battleInput->effect.unk_04_val3.frameType = frameType; battleInput->effect.unk_04_val3.unk_11 = Unk_ov16_02270294[param1 - 1]; battleInput->effect.unk_04_val3.unk_10 = 1; @@ -2187,8 +2185,8 @@ static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) BattleInputMoveMenu *moveMenu; u32 v2; const UnkStruct_ov16_0226A3F4 *v3[2]; - const s16 *v4; - const UnkStruct_ov16_022702F4 *v5; + const s16 *offsets; + const UnkStruct_ov16_022702F4 *touchscreenRect; if (param1 == 0xffffffff) { return param1; @@ -2212,20 +2210,20 @@ static int ov16_0226A3F4(BattleInput *battleInput, int param1, int param2) case 2: case 3: case 4: - v4 = Unk_ov16_022703F4[param1 - 1]; - v5 = &Unk_ov16_02270378[param1 - 1]; + offsets = sMoveButtonTouchscreenOffset[param1 - 1]; + touchscreenRect = &sMoveButtonTouchscreenRect[param1 - 1]; break; case 0xff: - v4 = Unk_ov16_022703F4[NELEMS(Unk_ov16_022703F4) - 1]; - v5 = &Unk_ov16_02270378[NELEMS(Unk_ov16_022703F4) - 1]; + offsets = sMoveButtonTouchscreenOffset[NELEMS(sMoveButtonTouchscreenOffset) - 1]; + touchscreenRect = &sMoveButtonTouchscreenRect[NELEMS(sMoveButtonTouchscreenOffset) - 1]; break; } ov16_0226B318(battleInput, param2); BattleInputEffect_AddTask(EffectTask_MoveButtonDown, battleInput); - battleInput->effect.unk_04_val3.unk_00 = v4; - battleInput->effect.unk_04_val3.unk_04 = v5; + battleInput->effect.unk_04_val3.unk_00 = offsets; + battleInput->effect.unk_04_val3.unk_04 = touchscreenRect; battleInput->effect.unk_04_val3.unk_0C = 3; battleInput->effect.unk_04_val3.unk_08 = param1; battleInput->effect.unk_04_val3.unk_10 = 1; @@ -2318,11 +2316,11 @@ static int ov16_0226A528(BattleInput *battleInput, int param1, int param2) } { - BgConfig *v2; + BgConfig *bgConfig; - v2 = BattleSystem_GetBgConfig(battleInput->battleSystem); - Bg_FillTilemap(v2, 5, (0x6000 / 0x20 - 1)); - Bg_ScheduleTilemapTransfer(v2, 5); + bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); + Bg_FillTilemap(bgConfig, 5, (0x6000 / 0x20 - 1)); + Bg_ScheduleTilemapTransfer(bgConfig, 5); } ov16_0226B314(battleInput, param1); @@ -2362,13 +2360,13 @@ static void ov16_0226A698(BattleInput *battleInput) SpriteRenderer *spriteRenderer; SpriteGfxHandler *gfxHandler; int v2, v3, v4; - PaletteData *v5; + PaletteData *palette; spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - v5 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - sub_0200CD7C(v5, 3, spriteRenderer, gfxHandler, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); + sub_0200CD7C(palette, 3, spriteRenderer, gfxHandler, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); sub_0200CE0C(spriteRenderer, gfxHandler, 19, PokeIcon32KCellsFileIndex(), 0, 20021); sub_0200CE3C(spriteRenderer, gfxHandler, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); } @@ -2402,34 +2400,34 @@ static void ov16_0226A768(BattleInput *battleInput) } } -static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5) +static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *pokemon, int battlerType, int hp, int maxHp, int status) { SpriteRenderer *spriteRenderer; SpriteGfxHandler *gfxHandler; u32 v2; - SpriteTemplate v3; + SpriteTemplate spriteTemplate; CellActorData *v4; - int v5; + int battler; - if (param2 >= 2) { - v5 = param2 - 2; + if (battlerType >= 2) { + battler = battlerType - 2; } else { - v5 = param2; + battler = battlerType; } - GF_ASSERT(battleInput->unk_60C[v5] == NULL); - GF_ASSERT(battleInput->unk_61C[v5] == NULL); + GF_ASSERT(battleInput->unk_60C[battler] == NULL); + GF_ASSERT(battleInput->unk_61C[battler] == NULL); - switch (param2) { - case 0: - case 2: - case 4: + switch (battlerType) { + case BATTLER_TYPE_SOLO_PLAYER: + case BATTLER_TYPE_PLAYER_SIDE_SLOT_1: + case BATTLER_TYPE_PLAYER_SIDE_SLOT_2: v2 = 20036; break; - case 3: + case BATTLER_TYPE_ENEMY_SIDE_SLOT_1: v2 = 20037; break; - case 5: + case BATTLER_TYPE_ENEMY_SIDE_SLOT_2: v2 = 20038; break; default: @@ -2440,26 +2438,26 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, i spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - sub_0200CBDC(spriteRenderer, gfxHandler, 19, Pokemon_IconSpriteIndex(param1), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); + sub_0200CBDC(spriteRenderer, gfxHandler, 19, Pokemon_IconSpriteIndex(pokemon), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); - v3 = Unk_ov16_022704B0; - v3.resources[0] = v2; - v3.x = Unk_ov16_02270304[v5][0]; - v3.y = Unk_ov16_02270304[v5][1]; - v4 = SpriteActor_LoadResources(spriteRenderer, gfxHandler, &v3); + spriteTemplate = Unk_ov16_022704B0; + spriteTemplate.resources[0] = v2; + spriteTemplate.x = Unk_ov16_02270304[battler][0]; + spriteTemplate.y = Unk_ov16_02270304[battler][1]; + v4 = SpriteActor_LoadResources(spriteRenderer, gfxHandler, &spriteTemplate); - sub_0200D500(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); - CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(param1)); + sub_0200D500(v4, spriteTemplate.x, spriteTemplate.y, ((192 + 80) << FX32_SHIFT)); + CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(pokemon)); { int v6 = 0; - if ((param3 == 0) || (param5 == 2)) { + if ((hp == 0) || (status == 2)) { v6 = 0; - } else if (param5 == 3) { + } else if (status == 3) { v6 = 5; } else { - switch (HealthBar_Color(param3, param4, (8 * 6))) { + switch (HealthBar_Color(hp, maxHp, (8 * 6))) { case 4: v6 = 1; break; @@ -2480,23 +2478,23 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, i sub_0200D330(v4); - battleInput->unk_60C[v5] = v4; - battleInput->unk_61C[v5] = SysTask_Start(ov16_0226A928, v4, 1300); + battleInput->unk_60C[battler] = v4; + battleInput->unk_61C[battler] = SysTask_Start(ov16_0226A928, v4, 1300); return v4; } -static void ov16_0226A928(SysTask *param0, void *param1) +static void ov16_0226A928(SysTask *task, void *data) { - CellActorData *actor = param1; + CellActorData *actor = data; sub_0200D330(actor); } -static int ov16_0226A934(u8 param0) +static int ov16_0226A934(u8 task) { int animationState; - switch (param0) { + switch (task) { case 0: default: animationState = 0; @@ -2515,11 +2513,11 @@ static int ov16_0226A934(u8 param0) return animationState; } -static void ov16_0226A95C(const Strbuf *str, int param1, int *param2, int *param3) +static void ov16_0226A95C(const Strbuf *str, int font, int *param2, int *param3) { int width, charWidth; - width = Font_CalcStrbufWidth(param1, str, 0); + width = Font_CalcStrbufWidth(font, str, 0); charWidth = width / 8; if (FX_ModS32(width, 8) != 0) { @@ -2530,7 +2528,7 @@ static void ov16_0226A95C(const Strbuf *str, int param1, int *param2, int *param *param3 = charWidth; } -static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *str, enum Font param3, TextColor param4, int param5, int param6, int x, int y, int param9, BattleInputTextImage *param10) +static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTextObject *textObj, const Strbuf *str, enum Font param3, TextColor textColor, int param5, int param6, int x, int y, int param9, BattleInputTextImage *param10) { FontOAMInitData fontInit; Window window; @@ -2538,12 +2536,12 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe int v3; FontOAM *fontOAM; BgConfig *bgConfig; - SpriteGfxHandler *v6; + SpriteGfxHandler *gfxHandler; int v7, v8; GF_ASSERT(textObj->fontOAM == NULL); - v6 = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); if (param10 == NULL) { @@ -2556,7 +2554,7 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe if (param10 == NULL) { Window_Init(&window); Window_AddToTopLeftCorner(bgConfig, &window, v8, 16 / 8, 0, 0); - Text_AddPrinterWithParamsColorAndSpacing(&window, param3, str, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); + Text_AddPrinterWithParamsColorAndSpacing(&window, param3, str, 0, 0, TEXT_SPEED_NO_TRANSFER, textColor, 0, 0, NULL); } else { window = param10->unk_00; } @@ -2572,8 +2570,8 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe fontInit.unk_00 = battleInput->unk_4C8; fontInit.unk_04 = &window; - fontInit.unk_08 = sub_0200D9B0(v6); - fontInit.unk_0C = sub_0200D04C(v6, param6); + fontInit.unk_08 = sub_0200D9B0(gfxHandler); + fontInit.unk_0C = sub_0200D04C(gfxHandler, param6); fontInit.unk_10 = NULL; fontInit.unk_14 = spriteManAlloc.unk_04; fontInit.unk_18 = x; @@ -2599,9 +2597,7 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe static void BattleInput_DestroyTextObjects(BattleInput *battleInput) { - int i; - - for (i = 0; i < 13; i++) { + for (int i = 0; i < 13; i++) { if (battleInput->textObj[i].fontOAM != NULL) { sub_02012870(battleInput->textObj[i].fontOAM); sub_0201EE28(&battleInput->textObj[i].spriteManAlloc); @@ -2612,22 +2608,22 @@ static void BattleInput_DestroyTextObjects(BattleInput *battleInput) static void ov16_0226AAF8(BattleInput *battleInput) { - u8 moveRange[4], v1[4]; + u8 moveRange[4], hitsMultiple[4]; int j, i; - u16 *v4, *v5; + u16 *src, *v5; BgConfig *bgConfig; bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - v4 = Bg_GetTilemapBuffer(bgConfig, 5); + src = Bg_GetTilemapBuffer(bgConfig, 5); ov16_0226B20C(battleInput, moveRange, 0); if (moveRange[0] == 1) { - ov16_0226B264(battleInput, 1, v1, 0); + ov16_0226B264(battleInput, 1, hitsMultiple, 0); - if (v1[3 - 1] == 1) { + if (hitsMultiple[3 - 1] == 1) { for (i = 12; i <= 16; i++) { - v5 = &v4[i * 32]; + v5 = &src[i * 32]; for (j = 0xf; j <= 0x10; j++) { v5[j] = 0x2a4; @@ -2635,9 +2631,9 @@ static void ov16_0226AAF8(BattleInput *battleInput) } } - if (v1[4 - 1] == 1) { + if (hitsMultiple[4 - 1] == 1) { for (i = 10; i <= 10; i++) { - v5 = &v4[i * 32]; + v5 = &src[i * 32]; for (j = 2; j <= 12; j++) { v5[j] = 0x2a4; @@ -2647,11 +2643,11 @@ static void ov16_0226AAF8(BattleInput *battleInput) } if (moveRange[1] == 1) { - ov16_0226B264(battleInput, 2, v1, 0); + ov16_0226B264(battleInput, 2, hitsMultiple, 0); - if (v1[3 - 1] == 1) { + if (hitsMultiple[3 - 1] == 1) { for (i = 10; i <= 10; i++) { - v5 = &v4[i * 32]; + v5 = &src[i * 32]; for (j = 0x13; j <= 0x1d; j++) { v5[j] = 0x2a4; @@ -2659,9 +2655,9 @@ static void ov16_0226AAF8(BattleInput *battleInput) } } - if (v1[4 - 1] == 1) { + if (hitsMultiple[4 - 1] == 1) { for (i = 3; i <= 7; i++) { - v5 = &v4[i * 32]; + v5 = &src[i * 32]; for (j = 0xf; j <= 0x10; j++) { v5[j] = 0x2a4; @@ -2703,7 +2699,7 @@ static void BattleInput_FreeMoveDisplayObjects(BattleInput *battleInput) } } -void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo *moveDisplay) +void ov16_0226AC98(BattleInput *battleInput, int battlerId, const MoveDisplayInfo *moveDisplay) { MoveDisplayObject *moveDisplayObj; void *charData; @@ -2718,7 +2714,7 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * MessageLoader *v12; v12 = BattleSystem_GetMessageLoader(battleInput->battleSystem); - moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, param1); + moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, battlerId); v3 = sub_0208C098(6); v9 = MessageLoader_GetNewStrbuf(v12, pl_msg_00000368_00938); // PP v10 = BattleSystem_StringTemplate(battleInput->battleSystem); @@ -2763,7 +2759,7 @@ void ov16_0226AC98(BattleInput *battleInput, int param1, const MoveDisplayInfo * moveDisplayObj->moveDisplay = *moveDisplay; } -static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor param4) +static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum Font param2, BattleInputTextImage *param3, TextColor textColor) { int length, charLength; @@ -2778,7 +2774,7 @@ static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum F Window_Init(¶m3->unk_00); Window_AddToTopLeftCorner(BattleSystem_GetBgConfig(battleInput->battleSystem), ¶m3->unk_00, charLength, 16 / 8, 0, 0); - Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL); + Text_AddPrinterWithParamsColorAndSpacing(¶m3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, textColor, 0, 0, NULL); } static void BattleInput_CreateTypeIcons(BattleInput *battleInput) @@ -2787,12 +2783,12 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) SpriteRenderer *renderer; SpriteGfxHandler *gfxHandler; SpriteTemplate typeIconTemplate; - BattleInputMoveMenu *v4; + BattleInputMoveMenu *moveMenu; int type; int v6; MoveDisplayObject *moveDisplayObj; - v4 = &battleInput->menu.moveMenu; + moveMenu = &battleInput->menu.moveMenu; renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, battleInput->unk_66A); @@ -2801,8 +2797,8 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) for (i = 0; i < LEARNED_MOVES_MAX; i++) { GF_ASSERT(battleInput->actorTypeIcons[i] == NULL); - if (v4->unk_00[i] != 0) { - type = MoveTable_LoadParam(v4->unk_00[i], MOVEATTRIBUTE_TYPE); + if (moveMenu->unk_00[i] != 0) { + type = MoveTable_LoadParam(moveMenu->unk_00[i], MOVEATTRIBUTE_TYPE); typeIconTemplate.resources[0] = 20025 + i; typeIconTemplate.x = sTypeIconPositions[i][0]; typeIconTemplate.y = sTypeIconPositions[i][1]; @@ -2857,19 +2853,19 @@ static void ov16_0226B028(BattleInput *battleInput) } } -static void ov16_0226B06C(BattleInput *battleInput, int param1, int param2) +static void BattleInput_LoadMoveButtonPalette(BattleInput *battleInput, int moveType, int movePos) { - ov11_0221F81C(BattleSystem_GetPaletteData(battleInput->battleSystem), param1, 5, 1, 8 + param2); + ov11_0221F81C(BattleSystem_GetPaletteData(battleInput->battleSystem), moveType, HEAP_ID_BATTLE, 1, 8 + movePos); } -static void ov16_0226B088(BattleInput *battleInput, int param1) +static void BattleInput_LoadBlankMoveButtonPalettes(BattleInput *battleInput, int movePos) { PaletteData *palette; int i; palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - for (i = param1; i < LEARNED_MOVES_MAX; i++) { + for (i = movePos; i < LEARNED_MOVES_MAX; i++) { ov16_0226B31C(battleInput, &Unk_ov16_0227022C[i], &Unk_ov16_02270274[i], 3, 0); PaletteData_LoadBuffer(palette, &battleInput->unk_58[0xe * 16], 1, (8 + i) * 16, 0x20); } @@ -3019,11 +3015,11 @@ static void inline_ov16_0226B318_1(SysTask *task, void *data) { BattleInput *battleInput = data; BattleInputEffectColor *effectColor; - PaletteData *v3; - int v4, v5; + PaletteData *palette; + int v5; effectColor = &battleInput->effectColor; - v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; switch (effectColor->unk_08) { @@ -3043,9 +3039,9 @@ static void inline_ov16_0226B318_1(SysTask *task, void *data) v5 = 1; } - PaletteData_Blend(v3, 1, effectColor->unk_09 * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); - PaletteData_Blend(v3, 1, effectColor->unk_09 * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); - PaletteData_Blend(v3, 1, effectColor->unk_09 * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); + PaletteData_Blend(palette, 1, effectColor->unk_09 * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); + PaletteData_Blend(palette, 1, effectColor->unk_09 * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); + PaletteData_Blend(palette, 1, effectColor->unk_09 * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); if (v5 == 1) { inline_ov16_0226B318_1_sub(battleInput); @@ -3060,12 +3056,12 @@ static void inline_ov16_0226B314_1(SysTask *task, void *data) { BattleInput *battleInput = data; BattleInputEffectColor *effectColor; - PaletteData *v3; + PaletteData *palette; int i, v5; u8 v6[4]; effectColor = &battleInput->effectColor; - v3 = BattleSystem_GetPaletteData(battleInput->battleSystem); + palette = BattleSystem_GetPaletteData(battleInput->battleSystem); v5 = 0; switch (effectColor->unk_08) { @@ -3089,9 +3085,9 @@ static void inline_ov16_0226B314_1(SysTask *task, void *data) for (i = 0; i < 4; i++) { if (v6[i] == 1) { - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); - PaletteData_Blend(v3, 1, Unk_ov16_02270A0C[i] * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); + PaletteData_Blend(palette, 1, Unk_ov16_02270A0C[i] * 16, 16, (effectColor->unk_04 >> 8) / 2, 0x7fff); + PaletteData_Blend(palette, 1, Unk_ov16_02270A0C[i] * 16 + 1, 1, effectColor->unk_04 >> 8, 0x7b1a); + PaletteData_Blend(palette, 1, Unk_ov16_02270A0C[i] * 16 + 0xa, 1, effectColor->unk_04 >> 8, 0x4634); } } @@ -3107,17 +3103,17 @@ static void ov16_0226B31C(BattleInput *battleInput, const s16 *param1, const Unk { int j, i; BgConfig *bgConfig; - u16 *v3, *v4; + u16 *src, *v4; u16 *v5, *v6; int v7; bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - v3 = Bg_GetTilemapBuffer(bgConfig, 4); + src = Bg_GetTilemapBuffer(bgConfig, 4); v5 = battleInput->unk_3C[param3]; v7 = param1[param4]; for (i = param2->unk_00; i <= param2->unk_01; i++) { - v4 = &v3[i * 32]; + v4 = &src[i * 32]; v6 = &v5[i * 32]; for (j = param2->unk_02; j <= param2->unk_03; j++) { @@ -3593,7 +3589,7 @@ static void ov16_0226BCBC(SysTask *task, void *data) SysTask_Done(task); } -void ov16_0226BCCC(BattleInput *battleInput, int param1) +void ov16_0226BCCC(BattleInput *battleInput, int unused) { return; } @@ -3811,17 +3807,17 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; u32 key; - const BattleMenuTemplate *v2; + const BattleMenuTemplate *menu; int v4; cursorMove = &battleInput->cursorMove; - v2 = &sBattleMenuTemplates[battleInput->curMenuId]; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; if (param1 == 1) { cursorMove->x = 0; cursorMove->y = 0; v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[v4].rect.left + 8, menu->touchscreenRect[v4].rect.right - 8, menu->touchscreenRect[v4].rect.top + 8, menu->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3833,7 +3829,7 @@ static int ov16_0226C100(BattleInput *battleInput, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[v4].rect.left + 8, v2->touchscreenRect[v4].rect.right - 8, v2->touchscreenRect[v4].rect.top + 8, v2->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[v4].rect.left + 8, menu->touchscreenRect[v4].rect.right - 8, menu->touchscreenRect[v4].rect.top + 8, menu->touchscreenRect[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701CC[cursorMove->y][cursorMove->x]; @@ -3848,7 +3844,7 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) { BattleCursorMove *cursorMove; u32 keyPressed; - const BattleMenuTemplate *v2; + const BattleMenuTemplate *menu; int index, i; u8 v5[3][2]; BattleInputMoveMenu *moveMenu; @@ -3856,7 +3852,7 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) cursorPos = Battler_GetCursorPosition(BattleSystem_BattlerData(battleInput->battleSystem, BattleSystem_BattlerOfType(battleInput->battleSystem, battleInput->unk_66A))); cursorMove = &battleInput->cursorMove; - v2 = &sBattleMenuTemplates[battleInput->curMenuId]; + menu = &sBattleMenuTemplates[battleInput->curMenuId]; moveMenu = &battleInput->menu.moveMenu; if (param1 == 1) { @@ -3872,7 +3868,7 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) index = sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; } - ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[index].rect.left + 8, v2->touchscreenRect[index].rect.right - 8, v2->touchscreenRect[index].rect.top + 8, v2->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[index].rect.left + 8, menu->touchscreenRect[index].rect.right - 8, menu->touchscreenRect[index].rect.top + 8, menu->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3885,13 +3881,13 @@ static int ov16_0226C1F8(BattleInput *battleInput, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: index = sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; - ov16_0226DD9C(battleInput->cursor, v2->touchscreenRect[index].rect.left + 8, v2->touchscreenRect[index].rect.right - 8, v2->touchscreenRect[index].rect.top + 8, v2->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(battleInput->cursor, menu->touchscreenRect[index].rect.left + 8, menu->touchscreenRect[index].rect.right - 8, menu->touchscreenRect[index].rect.top + 8, menu->touchscreenRect[index].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return sMoveMenuIndexMatrix[cursorMove->y][cursorMove->x]; case PAD_BUTTON_B: - for (i = 0; i < v2->touchscreenRect[i].rect.top != 0xff; i++) { - if (0xff == v2->unk_18[i]) { + for (i = 0; i < menu->touchscreenRect[i].rect.top != 0xff; i++) { + if (0xff == menu->unk_18[i]) { return i; } } @@ -4244,7 +4240,7 @@ static int ov16_0226CA14(BattleInput *battleInput, int param1) return 0xffffffff; } -static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int param2, const u8 *param3) +static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int yMax, const u8 *moveData) { int y, x; u32 key; @@ -4253,8 +4249,8 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int cursorMove->x = xMax - 1; } - if (cursorMove->y >= param2) { - cursorMove->y = param2 - 1; + if (cursorMove->y >= yMax) { + cursorMove->y = yMax - 1; } x = cursorMove->x; @@ -4267,8 +4263,8 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int cursorMove->y = 0; } - if (param3 != NULL) { - while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { + if (moveData != NULL) { + while (moveData[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->y--; if (cursorMove->y < 0) { @@ -4282,15 +4278,15 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { cursorMove->y++; - if (cursorMove->y >= param2) { - cursorMove->y = param2 - 1; + if (cursorMove->y >= yMax) { + cursorMove->y = yMax - 1; } - if (param3 != NULL) { - while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { + if (moveData != NULL) { + while (moveData[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->y++; - if (cursorMove->y >= param2) { + if (cursorMove->y >= yMax) { cursorMove->y = y; break; } @@ -4305,8 +4301,8 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int cursorMove->x = 0; } - if (param3 != NULL) { - while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { + if (moveData != NULL) { + while (moveData[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->x--; if (cursorMove->x < 0) { @@ -4324,8 +4320,8 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int cursorMove->x = xMax - 1; } - if (param3 != NULL) { - while (param3[xMax * cursorMove->y + cursorMove->x] == 0xff) { + if (moveData != NULL) { + while (moveData[xMax * cursorMove->y + cursorMove->x] == 0xff) { cursorMove->x++; if (cursorMove->x >= xMax) { @@ -4344,13 +4340,13 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int return 0; } - if (param3 != NULL) { - int v3, v4; + if (moveData != NULL) { + int prevIndex, index; - v3 = param3[xMax * y + x]; - v4 = param3[xMax * cursorMove->y + cursorMove->x]; + prevIndex = moveData[xMax * y + x]; + index = moveData[xMax * cursorMove->y + cursorMove->x]; - if (v3 == v4) { + if (prevIndex == index) { cursorMove->x = x; cursorMove->y = y; } @@ -4387,7 +4383,7 @@ static int BattleInput_CatchingTutorialMain(BattleInput *battleInput) PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); int ret = 0xffffffff; - if (ov16_0223F228(battleInput->battleSystem) == 0) { + if (BattleSystem_GetCatchingTutorialState(battleInput->battleSystem) == 0) { GF_ASSERT(battleInput->catchingTutorial.state < NELEMS(sCatchingTutorialStateFuncs)); ret = sCatchingTutorialStateFuncs[battleInput->catchingTutorial.state](battleInput); } else { @@ -4407,12 +4403,12 @@ static int BattleInput_CatchingTutorialFight(BattleInput *battleInput) { switch (battleInput->catchingTutorial.subState) { case 0: - ov16_0226DF80(battleInput->catchingTutorial.finger, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + CatchingTutorialFinger_SetPosition(battleInput->catchingTutorial.finger, 128, 84 - 24, ((192 + 80) << FX32_SHIFT)); + CatchingTutorialFinger_RequestTouch(battleInput->catchingTutorial.finger, 60); battleInput->catchingTutorial.subState++; break; default: - if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(battleInput->catchingTutorial.finger) == TRUE) { battleInput->catchingTutorial.subState++; return 0; } @@ -4427,12 +4423,12 @@ static int BattleInput_CatchingTutorialMove(BattleInput *battleInput) { switch (battleInput->catchingTutorial.subState) { case 0: - ov16_0226DF80(battleInput->catchingTutorial.finger, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + CatchingTutorialFinger_SetPosition(battleInput->catchingTutorial.finger, 64, 46 - 24, ((192 + 80) << FX32_SHIFT)); + CatchingTutorialFinger_RequestTouch(battleInput->catchingTutorial.finger, 60); battleInput->catchingTutorial.subState++; break; default: - if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(battleInput->catchingTutorial.finger) == TRUE) { battleInput->catchingTutorial.subState++; return 1; } @@ -4454,12 +4450,12 @@ static int BattleInput_CatchingTutorialBag(BattleInput *battleInput) } break; case 1: - ov16_0226DF80(battleInput->catchingTutorial.finger, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); - ov16_0226DFD0(battleInput->catchingTutorial.finger, 60); + CatchingTutorialFinger_SetPosition(battleInput->catchingTutorial.finger, 40, 170 - 24, ((192 + 80) << FX32_SHIFT)); + CatchingTutorialFinger_RequestTouch(battleInput->catchingTutorial.finger, 60); battleInput->catchingTutorial.subState++; break; default: - if (ov16_0226DFD4(battleInput->catchingTutorial.finger) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(battleInput->catchingTutorial.finger) == 1) { battleInput->catchingTutorial.subState++; return 1; } @@ -4479,7 +4475,7 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int index) LoadStandardWindowGraphics(bgConfig, 5, 0x20, 1, 0, HEAP_ID_BATTLE); PaletteData_LoadBufferFromHardware(palette, 1, 1 * 16, 0x20); - int v2 = 0x20, v3 = 1; + int fillVal = 0x20, paletteNo = 1; int v4, v5, v6, v7; v4 = 1; @@ -4487,15 +4483,15 @@ void BattleInput_PrintRecordingStopMessage(BattleInput *battleInput, int index) v6 = 30; v7 = 6; - Bg_FillTilemapRect(bgConfig, 5, v2, v4, v5, 1, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3); - Bg_FillTilemapRect(bgConfig, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3); + Bg_FillTilemapRect(bgConfig, 5, fillVal, v4, v5, 1, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 1, v4 + 1, v5, v6 - 2, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 2, v4 + v6 - 1, v5, 1, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 3, v4, v5 + 1, 1, v7 - 2, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 6, v4, v5 + v7 - 1, 1, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, paletteNo); + Bg_FillTilemapRect(bgConfig, 5, fillVal + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, paletteNo); Bg_ScheduleTilemapTransfer(bgConfig, 5); Strbuf *src; diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 5949559eb4..a27c34ed5a 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -666,7 +666,7 @@ static void ov16_0225C558(BattleSystem *param0, BattlerData *param1) if (param1->bootState == 0x0) { if ((v0 & 0x8) || (((v0 & 0x8) == 0) && (param1->battlerType != 4))) { - ov16_0226947C(battleInput, -0xd00, 0); + BattleInput_StartHorizontalScrollTask(battleInput, -0xd00, 0); } } diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index b3a2e180ab..7c80cb2f57 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -147,8 +147,8 @@ int ov16_0223F1F8(BattleSystem *battleSystem); u16 *ov16_0223F204(BattleSystem *battleSystem); u16 *ov16_0223F210(BattleSystem *battleSystem); int BattleSystem_FieldWeather(BattleSystem *battleSystem); -u8 ov16_0223F228(BattleSystem *battleSystem); -void ov16_0223F234(BattleSystem *battleSystem, u8 param1); +u8 BattleSystem_GetCatchingTutorialState(BattleSystem *battleSystem); +void CatchingTutorial_SetCatchingTutorialState(BattleSystem *battleSystem, u8 param1); int ov16_0223F240(BattleSystem *battleSystem); void ov16_0223F24C(BattleSystem *battleSystem, int param1); void ov16_0223F268(BattleSystem *battleSystem); @@ -1238,12 +1238,12 @@ int BattleSystem_FieldWeather(BattleSystem *battleSys) return battleSys->fieldWeather; } -u8 ov16_0223F228(BattleSystem *battleSystem) +u8 BattleSystem_GetCatchingTutorialState(BattleSystem *battleSystem) { return battleSystem->unk_241D; } -void ov16_0223F234(BattleSystem *battleSystem, u8 param1) +void CatchingTutorial_SetCatchingTutorialState(BattleSystem *battleSystem, u8 param1) { battleSystem->unk_241D = param1; } diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index dae5e80e91..87f611b870 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -105,7 +105,7 @@ void CatchingTutorialFinger_Free(CatchingTutorialFinger *param0) Heap_FreeToHeap(param0); } -void ov16_0226DF80(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3) +void CatchingTutorialFinger_SetPosition(CatchingTutorialFinger *param0, int param1, int param2, fx32 param3) { ov16_0226E13C(param0); @@ -119,7 +119,7 @@ void ov16_0226DF80(CatchingTutorialFinger *param0, int param1, int param2, fx32 void ov16_0226DFB0(CatchingTutorialFinger *param0, int param1, int param2) { - ov16_0226DF80(param0, param1, param2, (192 << FX32_SHIFT)); + CatchingTutorialFinger_SetPosition(param0, param1, param2, (192 << FX32_SHIFT)); } void ov16_0226DFBC(CatchingTutorialFinger *param0) @@ -128,12 +128,12 @@ void ov16_0226DFBC(CatchingTutorialFinger *param0) ov16_0226E13C(param0); } -void ov16_0226DFD0(CatchingTutorialFinger *param0, int param1) +void CatchingTutorialFinger_RequestTouch(CatchingTutorialFinger *param0, int param1) { param0->unk_18 = param1; } -BOOL ov16_0226DFD4(CatchingTutorialFinger *param0) +BOOL CatchingTutorialFinger_CheckTouchAnimationFinished(CatchingTutorialFinger *param0) { return param0->unk_1B; } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 63c3b3771c..22a8405b23 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -582,7 +582,7 @@ static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0) switch (param0->unk_1159) { case 0: - if (ov16_0226DFD4(param0->unk_38) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(param0->unk_38) == 1) { Sound_PlayEffect(1501); param0->unk_114D = 2; param0->unk_114B = 12; @@ -599,7 +599,7 @@ static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0) param0->unk_1159++; break; case 2: - if (ov16_0226DFD4(param0->unk_38) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(param0->unk_38) == 1) { Sound_PlayEffect(1501); param0->unk_00->unk_27[param0->unk_114D] = 0; param0->unk_114B = 12; @@ -616,7 +616,7 @@ static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0) param0->unk_1159++; break; case 4: - if (ov16_0226DFD4(param0->unk_38) == 1) { + if (CatchingTutorialFinger_CheckTouchAnimationFinished(param0->unk_38) == 1) { Sound_PlayEffect(1501); param0->unk_00->unk_1C = ov13_02227BA8(param0, param0->unk_00->unk_27[param0->unk_114D]); param0->unk_00->unk_1E = param0->unk_114D; diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index 75fda5ca41..1422cfa7eb 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -333,7 +333,7 @@ void ov13_022280F0(UnkStruct_ov13_02227244 *param0, u8 param1) { if (param0->unk_00->unk_14 == 1) { ov16_0226DFB0(param0->unk_38, Unk_ov13_02229BFC[param1][0], Unk_ov13_02229BFC[param1][1]); - ov16_0226DFD0(param0->unk_38, 60); + CatchingTutorialFinger_RequestTouch(param0->unk_38, 60); } else { ov16_0226DFBC(param0->unk_38); } From 4df8633bb7d5a811464bff189e3bf985efb04cb3 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:33:00 -0500 Subject: [PATCH 6/6] Merge 2 --- src/battle/battle_input.c | 385 ++++++++++++++++----------------- src/battle/healthbar.c | 14 +- src/overlay012/ov12_0221FC20.c | 4 +- tools/cw/lmgr8c/lmgr8c.c | 13 +- 4 files changed, 207 insertions(+), 209 deletions(-) diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index 29897342dc..6bbaf11dfa 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -5,13 +5,8 @@ #include "struct_decls/battle_system.h" #include "struct_decls/font_oam.h" -#include "struct_decls/struct_0200C6E4_decl.h" -#include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/sprite_template.h" -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "battle/battle_display.h" @@ -26,13 +21,11 @@ #include "battle/struct_ov16_0226C378.h" #include "battle/struct_ov16_0226DC24_decl.h" #include "battle/struct_ov16_0226DEEC_decl.h" -#include "gmm/message_bank_battle_strings.h" #include "overlay011/ov11_0221F800.h" #include "assert.h" #include "bg_window.h" -#include "cell_actor.h" -#include "core_sys.h" +#include "char_transfer.h" #include "enums.h" #include "font.h" #include "graphics.h" @@ -52,16 +45,16 @@ #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "unk_02005474.h" -#include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02017728.h" -#include "unk_0201E86C.h" #include "unk_0207C908.h" #include "unk_0208C098.h" +#include "res/text/bank/battle_strings.h" + typedef struct { BattleInput *battleInput; SysTask *unk_04; @@ -152,7 +145,7 @@ typedef struct { typedef struct { FontOAM *fontOAM; - SpriteManagerAllocation spriteManAlloc; + CharTransferAllocation charTransferAlloc; u16 unk_10; } BattleInputTextObject; @@ -212,11 +205,11 @@ struct BattleInput_t { UnkStruct_02012744 *unk_4C8; BattleInputTextObject textObj[13]; UnkStruct_02012B20 *unk_5B8; - CellActorData *actorBallGague[6]; - CellActorData *actorBallGagueOpponent[6]; - CellActorData *actorTypeIcons[4]; - CellActorData *unk_5FC[4]; - CellActorData *unk_60C[4]; + ManagedSprite *spriteBallGauge[6]; + ManagedSprite *spriteBallGaugeOpponent[6]; + ManagedSprite *spriteTypeIcons[4]; + ManagedSprite *unk_5FC[4]; + ManagedSprite *unk_60C[4]; SysTask *unk_61C[4]; BallGaugeAnimation ballGaugeAnimations[6]; SysTask *unk_664; @@ -338,8 +331,8 @@ static void BattleInput_DestroyTextObjects(BattleInput *battleInput); static void ov16_0226A698(BattleInput *battleInput); static void ov16_0226A718(BattleInput *battleInput); static void ov16_0226A768(BattleInput *battleInput); -static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5); -static void ov16_0226A928(SysTask *task, void *param1); +static ManagedSprite *ov16_0226A7A4(BattleInput *battleInput, Pokemon *param1, int param2, int param3, int param4, int param5); +static void Task_SpriteTickFrame(SysTask *task, void *data); static void ov16_0226B988(SysTask *task, void *param1); static void ov16_0226BA88(SysTask *task, void *param1); static void ov16_0226BB94(void *data); @@ -826,7 +819,7 @@ static const BattleMenuTemplate sBattleMenuTemplates[] = { }, }; -static const SpriteTemplate sBallGagueTemplate = { +static const SpriteTemplate sBallGaugeTemplate = { 0xC, 0xD, 0x0, @@ -1186,13 +1179,13 @@ void BattleInput_Free(BattleInput *battleInput) void ov16_02268A88(BattleInput *battleInput) { BgConfig *bgConfig; - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; PaletteData *palette; int i; - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); palette = BattleSystem_GetPaletteData(battleInput->battleSystem); @@ -1206,35 +1199,35 @@ void ov16_02268A88(BattleInput *battleInput) Graphics_LoadTilesToBgLayer(7, v5, bgConfig, 4, 0, 0x6000, 1, HEAP_ID_BATTLE); - sub_0207C9EC(spriteRenderer, gfxHandler, 20017, 20017); - MoveTypeIcon_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, gfxHandler, NNS_G2D_VRAM_TYPE_2DSUB, 20020); + sub_0207C9EC(spriteSystem, spriteManager, 20017, 20017); + MoveTypeIcon_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteSystem, spriteManager, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (i = 0; i < 4; i++) { - sub_0207C948(spriteRenderer, gfxHandler, NNS_G2D_VRAM_TYPE_2DSUB, TYPE_NORMAL, 20025 + i); + sub_0207C948(spriteSystem, spriteManager, NNS_G2D_VRAM_TYPE_2DSUB, TYPE_NORMAL, 20025 + i); } if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { - CatchingTutorialFinger_LoadResources(spriteRenderer, gfxHandler, HEAP_ID_BATTLE, palette, 20412, 20036, 20406, 20395); - battleInput->catchingTutorial.finger = CatchingTutorialFinger_Create(spriteRenderer, gfxHandler, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0); + CatchingTutorialFinger_LoadResources(spriteSystem, spriteManager, HEAP_ID_BATTLE, palette, 20412, 20036, 20406, 20395); + battleInput->catchingTutorial.finger = CatchingTutorialFinger_Create(spriteSystem, spriteManager, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0); } } void ov16_02268B8C(BattleInput *battleInput) { int i; - SpriteRenderer *spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - SpriteGfxHandler *spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + SpriteSystem *spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + SpriteManager *spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); for (i = 0; i < 4; i++) { - sub_0207CA34(spriteGfxHandler, 20025 + i); + sub_0207CA34(spriteManager, 20025 + i); } - sub_0207CA3C(spriteGfxHandler, 20020); - sub_0207CA44(spriteGfxHandler, 20017, 20017); + sub_0207CA3C(spriteManager, 20020); + sub_0207CA44(spriteManager, 20017, 20017); if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { CatchingTutorialFinger_Free(battleInput->catchingTutorial.finger); - CatchingTutorialFinger_FreeResources(spriteGfxHandler, 20412, 20036, 20406, 20395); + CatchingTutorialFinger_FreeResources(spriteManager, 20412, 20036, 20406, 20395); } } @@ -1243,8 +1236,8 @@ void BattleInput_ChangeMenu(NARC *narcUnused, NARC *param1, BattleInput *battleI const BattleMenuTemplate *menuTemplate, *prevMenuTemplate; int i; BgConfig *bgConfig; - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; if (param5 != NULL) { MI_CpuCopy8(param5, &battleInput->menu, sizeof(BattleInputMenu)); @@ -1253,8 +1246,8 @@ void BattleInput_ChangeMenu(NARC *narcUnused, NARC *param1, BattleInput *battleI battleInput->touchDisabled = FALSE; bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); if (battleInput->curMenuId == -1) { param4 = 1; @@ -1274,7 +1267,7 @@ void BattleInput_ChangeMenu(NARC *narcUnused, NARC *param1, BattleInput *battleI } } - SpriteRenderer_LoadPalette(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteRenderer, gfxHandler, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteSystem_LoadPaletteBufferFromOpenNarc(BattleSystem_GetPaletteData(battleInput->battleSystem), 3, spriteSystem, spriteManager, param1, 72, 0, 7, NNS_G2D_VRAM_TYPE_2DSUB, 20023); battleInput->curMenuId = menuId; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 8, 12); @@ -1290,29 +1283,29 @@ void BattleInput_ChangeMenu(NARC *narcUnused, NARC *param1, BattleInput *battleI void BattleInput_CreateBallGagueObjects(NARC *narc, BattleInput *battleInput) { int i; - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *spriteGfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; - GF_ASSERT(battleInput->actorBallGague[0] == NULL && battleInput->actorBallGagueOpponent[0] == NULL); + GF_ASSERT(battleInput->spriteBallGauge[0] == NULL && battleInput->spriteBallGaugeOpponent[0] == NULL); - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 207, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 209, 1, 20015); + SpriteSystem_LoadCharResObjFromOpenNarc(spriteSystem, spriteManager, narc, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteSystem_LoadCellResObjFromOpenNarc(spriteSystem, spriteManager, narc, 207, 1, 20015); + SpriteSystem_LoadAnimResObjFromOpenNarc(spriteSystem, spriteManager, narc, 209, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 204, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(spriteRenderer, spriteGfxHandler, narc, 206, 1, 20016); + SpriteSystem_LoadCharResObjFromOpenNarc(spriteSystem, spriteManager, narc, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteSystem_LoadCellResObjFromOpenNarc(spriteSystem, spriteManager, narc, 204, 1, 20016); + SpriteSystem_LoadAnimResObjFromOpenNarc(spriteSystem, spriteManager, narc, 206, 1, 20016); for (i = 0; i < 6; i++) { - battleInput->actorBallGague[i] = SpriteActor_LoadResources(spriteRenderer, spriteGfxHandler, &sBallGagueTemplate); - sub_0200D4D0(battleInput->actorBallGague[i]->unk_00, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); - sub_0200D6A4(battleInput->actorBallGague[i], 1); + battleInput->spriteBallGauge[i] = SpriteSystem_NewSprite(spriteSystem, spriteManager, &sBallGaugeTemplate); + Sprite_SetPositionXYWithSubscreenOffset(battleInput->spriteBallGauge[i]->sprite, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetAffineOverwriteMode(battleInput->spriteBallGauge[i], 1); - battleInput->actorBallGagueOpponent[i] = SpriteActor_LoadResources(spriteRenderer, spriteGfxHandler, &sBallGagueOpponentTemplate); - sub_0200D4D0(battleInput->actorBallGagueOpponent[i]->unk_00, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); + battleInput->spriteBallGaugeOpponent[i] = SpriteSystem_NewSprite(spriteSystem, spriteManager, &sBallGagueOpponentTemplate); + Sprite_SetPositionXYWithSubscreenOffset(battleInput->spriteBallGaugeOpponent[i]->sprite, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT)); } BattleInput_DisableBallGauge(battleInput); @@ -1321,41 +1314,41 @@ void BattleInput_CreateBallGagueObjects(NARC *narc, BattleInput *battleInput) battleInput->unk_08 = SysTask_Start(Task_AnimateBallGauge, battleInput, 1300); PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - BattleCursor_LoadResources(spriteRenderer, spriteGfxHandler, palette, 5, 20411, 20035, 20405, 20394); - battleInput->cursor = BattleCursor_New(spriteRenderer, spriteGfxHandler, 5, 20411, 20035, 20405, 20394, 5, 0); + BattleCursor_LoadResources(spriteSystem, spriteManager, palette, 5, 20411, 20035, 20405, 20394); + battleInput->cursor = BattleCursor_New(spriteSystem, spriteManager, 5, 20411, 20035, 20405, 20394, 5, 0); } static void BattleInput_FreeBallGagueObjects(BattleInput *battleInput) { int i; - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *spriteGfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; - GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); + GF_ASSERT(battleInput->spriteBallGauge[0] != NULL && battleInput->spriteBallGaugeOpponent[0] != NULL); - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - spriteGfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); - SpriteGfxHandler_UnloadCharObjById(spriteGfxHandler, 20023); - SpriteGfxHandler_UnloadCellObjById(spriteGfxHandler, 20015); - SpriteGfxHandler_UnloadAnimObjById(spriteGfxHandler, 20015); - SpriteGfxHandler_UnloadCharObjById(spriteGfxHandler, 20024); - SpriteGfxHandler_UnloadCellObjById(spriteGfxHandler, 20016); - SpriteGfxHandler_UnloadAnimObjById(spriteGfxHandler, 20016); - SpriteGfxHandler_UnloadPlttObjById(spriteGfxHandler, 20023); + SpriteManager_UnloadCharObjById(spriteManager, 20023); + SpriteManager_UnloadCellObjById(spriteManager, 20015); + SpriteManager_UnloadAnimObjById(spriteManager, 20015); + SpriteManager_UnloadCharObjById(spriteManager, 20024); + SpriteManager_UnloadCellObjById(spriteManager, 20016); + SpriteManager_UnloadAnimObjById(spriteManager, 20016); + SpriteManager_UnloadPlttObjById(spriteManager, 20023); for (i = 0; i < 6; i++) { - sub_0200D0F4(battleInput->actorBallGague[i]); - battleInput->actorBallGague[i] = NULL; + Sprite_DeleteAndFreeResources(battleInput->spriteBallGauge[i]); + battleInput->spriteBallGauge[i] = NULL; - sub_0200D0F4(battleInput->actorBallGagueOpponent[i]); - battleInput->actorBallGagueOpponent[i] = NULL; + Sprite_DeleteAndFreeResources(battleInput->spriteBallGaugeOpponent[i]); + battleInput->spriteBallGaugeOpponent[i] = NULL; } SysTask_Done(battleInput->unk_08); battleInput->unk_08 = NULL; - BattleCursor_FreeResources(spriteGfxHandler, 20411, 20035, 20405, 20394); + BattleCursor_FreeResources(spriteManager, 20411, 20035, 20405, 20394); BattleCursor_Free(battleInput->cursor); } @@ -1371,7 +1364,7 @@ static void Task_AnimateBallGauge(SysTask *task, void *data) switch (ballAnim->state) { case 0: default: - if (sub_0200D400(battleInput->actorBallGague[i]->unk_00) == 0) { + if (Sprite_GetDrawFlag2(battleInput->spriteBallGauge[i]->sprite) == 0) { break; } @@ -1396,10 +1389,10 @@ static void Task_AnimateBallGauge(SysTask *task, void *data) break; case 2: case 4: - sub_0200D7C0(battleInput->actorBallGague[i], 0x800); + ManagedSprite_OffsetAffineZRotation(battleInput->spriteBallGauge[i], 0x800); ballAnim->dx += 0x180; - sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetPositionXYWithSubscreenOffset(battleInput->spriteBallGauge[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); ballAnim->unk_06++; if (ballAnim->unk_06 >= ballAnim->unk_07) { @@ -1408,8 +1401,8 @@ static void Task_AnimateBallGauge(SysTask *task, void *data) if (ballAnim->state == 2) { ballAnim->state++; } else { - sub_0200D79C(battleInput->actorBallGague[i], 0); - sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetAffineZRotation(battleInput->spriteBallGauge[i], 0); + ManagedSprite_SetPositionXYWithSubscreenOffset(battleInput->spriteBallGauge[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT)); ballAnim->dx = 0; @@ -1430,10 +1423,10 @@ static void Task_AnimateBallGauge(SysTask *task, void *data) break; case 3: - sub_0200D7C0(battleInput->actorBallGague[i], -0x800); + ManagedSprite_OffsetAffineZRotation(battleInput->spriteBallGauge[i], -0x800); ballAnim->dx -= 0x180; - sub_0200D500(battleInput->actorBallGague[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetPositionXYWithSubscreenOffset(battleInput->spriteBallGauge[i], 12 + 19 * i + ballAnim->dx / 0x100, 13, ((192 + 80) << FX32_SHIFT)); ballAnim->unk_06++; if (ballAnim->unk_06 >= ballAnim->unk_07 * 2) { @@ -1459,13 +1452,13 @@ void ov16_02269168(BattleInput *battleInput, u8 param1[], u8 param2[]) for (i = 0; i < 6; i++) { anim = ov16_0226A934(param1[i]); - CellActor_SetAnim(battleInput->actorBallGague[i]->unk_00, anim); - SpriteActor_UpdateObject(battleInput->actorBallGague[i]->unk_00); + Sprite_SetAnim(battleInput->spriteBallGauge[i]->sprite, anim); + Sprite_TickFrame(battleInput->spriteBallGauge[i]->sprite); anim = ov16_0226A934(param2[i]); - CellActor_SetAnim(battleInput->actorBallGagueOpponent[i]->unk_00, anim); - SpriteActor_UpdateObject(battleInput->actorBallGagueOpponent[i]->unk_00); + Sprite_SetAnim(battleInput->spriteBallGaugeOpponent[i]->sprite, anim); + Sprite_TickFrame(battleInput->spriteBallGaugeOpponent[i]->sprite); } } @@ -1473,15 +1466,15 @@ void BattleInput_EnableBallGauge(BattleInput *battleInput) { int i; - GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); + GF_ASSERT(battleInput->spriteBallGauge[0] != NULL && battleInput->spriteBallGaugeOpponent[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->actorBallGague[i]->unk_00, 1); + Sprite_SetDrawFlag2(battleInput->spriteBallGauge[i]->sprite, 1); } if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_TRAINER) { for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->actorBallGagueOpponent[i]->unk_00, 1); + Sprite_SetDrawFlag2(battleInput->spriteBallGaugeOpponent[i]->sprite, 1); } } } @@ -1490,11 +1483,11 @@ void BattleInput_DisableBallGauge(BattleInput *battleInput) { int i; - GF_ASSERT(battleInput->actorBallGague[0] != NULL && battleInput->actorBallGagueOpponent[0] != NULL); + GF_ASSERT(battleInput->spriteBallGauge[0] != NULL && battleInput->spriteBallGaugeOpponent[0] != NULL); for (i = 0; i < 6; i++) { - SpriteActor_DrawSprite(battleInput->actorBallGague[i]->unk_00, 0); - SpriteActor_DrawSprite(battleInput->actorBallGagueOpponent[i]->unk_00, 0); + Sprite_SetDrawFlag2(battleInput->spriteBallGauge[i]->sprite, 0); + Sprite_SetDrawFlag2(battleInput->spriteBallGaugeOpponent[i]->sprite, 0); } } @@ -1509,7 +1502,7 @@ int BattleInput_CheckTouch(BattleInput *battleInput) menuTemplate = &sBattleMenuTemplates[battleInput->curMenuId]; if ((menuTemplate->touchscreenRect == NULL) || (battleInput->touchDisabled == TRUE)) { - return 0xffffffff; + return TOUCHSCREEN_INPUT_NONE; } GF_ASSERT(menuTemplate->unk_18 != NULL); @@ -1517,16 +1510,16 @@ int BattleInput_CheckTouch(BattleInput *battleInput) if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_CATCH_TUTORIAL) { rectHit = BattleInput_CatchingTutorialMain(battleInput); } else { - rectHit = sub_02022664(menuTemplate->touchscreenRect); + rectHit = TouchScreen_CheckRectanglePressed(menuTemplate->touchscreenRect); - if (rectHit == 0xffffffff) { + if (rectHit == TOUCHSCREEN_INPUT_NONE) { rectHit = ov16_0226BE48(battleInput); v5++; } } - if (rectHit == 0xffffffff) { - ret = 0xffffffff; + if (rectHit == TOUCHSCREEN_INPUT_NONE) { + ret = TOUCHSCREEN_INPUT_NONE; paletteId = 0xff; } else { ret = menuTemplate->unk_18[rectHit]; @@ -1536,7 +1529,7 @@ int BattleInput_CheckTouch(BattleInput *battleInput) if (menuTemplate->unk_2C != NULL) { ret = menuTemplate->unk_2C(battleInput, ret, paletteId); - if (ret != 0xffffffff) { + if (ret != TOUCHSCREEN_INPUT_NONE) { if (menuTemplate->funcSaveCursorPos != NULL) { menuTemplate->funcSaveCursorPos(battleInput, rectHit); } @@ -1738,13 +1731,13 @@ static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int Strbuf_Free(strRun); if ((BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_NO_MOVES) == 0) { - Pokemon *v7; - CellActorData *v8; + Pokemon *pokemon; + ManagedSprite *v8; int v9, v10; - v7 = BattleSystem_PartyPokemon(battleInput->battleSystem, v6->unk_01, v6->unk_02); + pokemon = BattleSystem_PartyPokemon(battleInput->battleSystem, v6->unk_01, v6->unk_02); ov16_0226A698(battleInput); - v8 = ov16_0226A7A4(battleInput, v7, v5, v6->unk_04, v6->unk_06, v6->unk_03); + v8 = ov16_0226A7A4(battleInput, pokemon, v5, v6->unk_04, v6->unk_06, v6->unk_03); sub_020129A4(battleInput->textObj[0].fontOAM, &v9, &v10); @@ -1754,7 +1747,7 @@ static void BattleInput_CreateCommandSelectObjects(BattleInput *battleInput, int v9 -= 32 / 2; } - sub_0200D500(v8, v9, v10 - (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT), ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetPositionXYWithSubscreenOffset(v8, v9, v10 - (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT), ((192 + 80) << FX32_SHIFT)); } } @@ -1862,9 +1855,7 @@ static void BattleInput_CreateMoveObjects(BattleInput *battleInput, int param1, } { - BgConfig *v7; - - v7 = BattleSystem_GetBgConfig(battleInput->battleSystem); + BgConfig *bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); if (moveMenu->unk_00[0] == 0) { FontOAM_SetDrawFlag(battleInput->textObj[0].fontOAM, 0); @@ -2052,7 +2043,7 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) u8 v3[4]; Strbuf *v4, *genderMarker; Pokemon *pokemon; - BoxPokemon *v7; + BoxPokemon *boxMon; StringTemplate *stringTemplate; TextColor v9; u8 v10[6]; @@ -2088,9 +2079,9 @@ static void ov16_0226A12C(BattleInput *battleInput, int param1, int param2) } pokemon = BattleSystem_PartyPokemon(battleInput->battleSystem, v12, pokemonMenu->unk_00[v12].unk_00); - v7 = Pokemon_GetBoxPokemon(pokemon); + boxMon = Pokemon_GetBoxPokemon(pokemon); - StringTemplate_SetNickname(stringTemplate, 0, v7); + StringTemplate_SetNickname(stringTemplate, 0, boxMon); StringTemplate_Format(stringTemplate, v4, genderMarker); if (i & 1) { @@ -2357,30 +2348,30 @@ static int ov16_0226A634(BattleInput *battleInput, int param1, int param2) static void ov16_0226A698(BattleInput *battleInput) { - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; int v2, v3, v4; PaletteData *palette; - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); palette = BattleSystem_GetPaletteData(battleInput->battleSystem); - sub_0200CD7C(palette, 3, spriteRenderer, gfxHandler, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); - sub_0200CE0C(spriteRenderer, gfxHandler, 19, PokeIcon32KCellsFileIndex(), 0, 20021); - sub_0200CE3C(spriteRenderer, gfxHandler, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); + SpriteSystem_LoadPaletteBuffer(palette, 3, spriteSystem, spriteManager, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 20022); + SpriteSystem_LoadCellResObj(spriteSystem, spriteManager, 19, PokeIcon32KCellsFileIndex(), 0, 20021); + SpriteSystem_LoadAnimResObj(spriteSystem, spriteManager, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); } static void ov16_0226A718(BattleInput *battleInput) { - SpriteGfxHandler *gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); - - SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20036); - SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20037); - SpriteGfxHandler_UnloadCharObjById(gfxHandler, 20038); - SpriteGfxHandler_UnloadCellObjById(gfxHandler, 20021); - SpriteGfxHandler_UnloadAnimObjById(gfxHandler, 20021); - SpriteGfxHandler_UnloadPlttObjById(gfxHandler, 20022); + SpriteManager *spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); + + SpriteManager_UnloadCharObjById(spriteManager, 20036); + SpriteManager_UnloadCharObjById(spriteManager, 20037); + SpriteManager_UnloadCharObjById(spriteManager, 20038); + SpriteManager_UnloadCellObjById(spriteManager, 20021); + SpriteManager_UnloadAnimObjById(spriteManager, 20021); + SpriteManager_UnloadPlttObjById(spriteManager, 20022); } static void ov16_0226A768(BattleInput *battleInput) @@ -2389,7 +2380,7 @@ static void ov16_0226A768(BattleInput *battleInput) for (i = 0; i < 4; i++) { if (battleInput->unk_60C[i] != NULL) { - sub_0200D0F4(battleInput->unk_60C[i]); + Sprite_DeleteAndFreeResources(battleInput->unk_60C[i]); battleInput->unk_60C[i] = NULL; } @@ -2400,13 +2391,13 @@ static void ov16_0226A768(BattleInput *battleInput) } } -static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *pokemon, int battlerType, int hp, int maxHp, int status) +static ManagedSprite *ov16_0226A7A4(BattleInput *battleInput, Pokemon *pokemon, int battlerType, int hp, int maxHp, int status) { - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *spriteSystem; + SpriteManager *spriteManager; u32 v2; SpriteTemplate spriteTemplate; - CellActorData *v4; + ManagedSprite *sprite; int battler; if (battlerType >= 2) { @@ -2435,19 +2426,19 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *pokemon, return NULL; } - spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); - sub_0200CBDC(spriteRenderer, gfxHandler, 19, Pokemon_IconSpriteIndex(pokemon), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); + SpriteSystem_LoadCharResObj(spriteSystem, spriteManager, 19, Pokemon_IconSpriteIndex(pokemon), 0, NNS_G2D_VRAM_TYPE_2DSUB, v2); spriteTemplate = Unk_ov16_022704B0; spriteTemplate.resources[0] = v2; spriteTemplate.x = Unk_ov16_02270304[battler][0]; spriteTemplate.y = Unk_ov16_02270304[battler][1]; - v4 = SpriteActor_LoadResources(spriteRenderer, gfxHandler, &spriteTemplate); + sprite = SpriteSystem_NewSprite(spriteSystem, spriteManager, &spriteTemplate); - sub_0200D500(v4, spriteTemplate.x, spriteTemplate.y, ((192 + 80) << FX32_SHIFT)); - CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(pokemon)); + ManagedSprite_SetPositionXYWithSubscreenOffset(sprite, spriteTemplate.x, spriteTemplate.y, ((192 + 80) << FX32_SHIFT)); + Sprite_SetExplicitPaletteOffsetAutoAdjust(sprite->sprite, Pokemon_IconPaletteIndex(pokemon)); { int v6 = 0; @@ -2472,22 +2463,22 @@ static CellActorData *ov16_0226A7A4(BattleInput *battleInput, Pokemon *pokemon, break; } - sub_0200D364(v4, v6); + ManagedSprite_SetAnim(sprite, v6); } } - sub_0200D330(v4); + ManagedSprite_TickFrame(sprite); - battleInput->unk_60C[battler] = v4; - battleInput->unk_61C[battler] = SysTask_Start(ov16_0226A928, v4, 1300); + battleInput->unk_60C[battler] = sprite; + battleInput->unk_61C[battler] = SysTask_Start(Task_SpriteTickFrame, sprite, 1300); - return v4; + return sprite; } -static void ov16_0226A928(SysTask *task, void *data) +static void Task_SpriteTickFrame(SysTask *task, void *data) { - CellActorData *actor = data; - sub_0200D330(actor); + ManagedSprite *sprite = data; + ManagedSprite_TickFrame(sprite); } static int ov16_0226A934(u8 task) @@ -2532,16 +2523,16 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe { FontOAMInitData fontInit; Window window; - SpriteManagerAllocation spriteManAlloc; - int v3; + CharTransferAllocation charTransferAlloc; + int size; FontOAM *fontOAM; BgConfig *bgConfig; - SpriteGfxHandler *gfxHandler; + SpriteManager *spriteManager; int v7, v8; GF_ASSERT(textObj->fontOAM == NULL); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); bgConfig = BattleSystem_GetBgConfig(battleInput->battleSystem); if (param10 == NULL) { @@ -2559,8 +2550,8 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe window = param10->unk_00; } - v3 = sub_02012898(&window, NNS_G2D_VRAM_TYPE_2DSUB, 5); - sub_0201ED94(v3, 1, NNS_G2D_VRAM_TYPE_2DSUB, &spriteManAlloc); + size = sub_02012898(&window, NNS_G2D_VRAM_TYPE_2DSUB, 5); + CharTransfer_AllocRange(size, 1, NNS_G2D_VRAM_TYPE_2DSUB, &charTransferAlloc); if (param9 == 1) { x -= v7 / 2; @@ -2570,10 +2561,10 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe fontInit.unk_00 = battleInput->unk_4C8; fontInit.unk_04 = &window; - fontInit.unk_08 = sub_0200D9B0(gfxHandler); - fontInit.unk_0C = sub_0200D04C(gfxHandler, param6); + fontInit.unk_08 = SpriteManager_GetSpriteList(spriteManager); + fontInit.unk_0C = SpriteManager_FindPlttResourceProxy(spriteManager, param6); fontInit.unk_10 = NULL; - fontInit.unk_14 = spriteManAlloc.unk_04; + fontInit.unk_14 = charTransferAlloc.offset; fontInit.unk_18 = x; fontInit.unk_1C = y; fontInit.unk_20 = 0; @@ -2591,7 +2582,7 @@ static void BattleInput_CreateTextObject(BattleInput *battleInput, BattleInputTe } textObj->fontOAM = fontOAM; - textObj->spriteManAlloc = spriteManAlloc; + textObj->charTransferAlloc = charTransferAlloc; textObj->unk_10 = v7; } @@ -2600,7 +2591,7 @@ static void BattleInput_DestroyTextObjects(BattleInput *battleInput) for (int i = 0; i < 13; i++) { if (battleInput->textObj[i].fontOAM != NULL) { sub_02012870(battleInput->textObj[i].fontOAM); - sub_0201EE28(&battleInput->textObj[i].spriteManAlloc); + CharTransfer_ClearRange(&battleInput->textObj[i].charTransferAlloc); battleInput->textObj[i].fontOAM = NULL; } } @@ -2780,8 +2771,8 @@ static void ov16_0226AEA0(BattleInput *battleInput, const Strbuf *param1, enum F static void BattleInput_CreateTypeIcons(BattleInput *battleInput) { int i; - SpriteRenderer *renderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *renderer; + SpriteManager *spriteManager; SpriteTemplate typeIconTemplate; BattleInputMoveMenu *moveMenu; int type; @@ -2789,13 +2780,13 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) MoveDisplayObject *moveDisplayObj; moveMenu = &battleInput->menu.moveMenu; - renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + renderer = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); moveDisplayObj = BattleInput_GetBattlerMoveDisplayObject(battleInput, battleInput->unk_66A); typeIconTemplate = sTypeIconSpriteTemplate; for (i = 0; i < LEARNED_MOVES_MAX; i++) { - GF_ASSERT(battleInput->actorTypeIcons[i] == NULL); + GF_ASSERT(battleInput->spriteTypeIcons[i] == NULL); if (moveMenu->unk_00[i] != 0) { type = MoveTable_LoadParam(moveMenu->unk_00[i], MOVEATTRIBUTE_TYPE); @@ -2803,17 +2794,17 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) typeIconTemplate.x = sTypeIconPositions[i][0]; typeIconTemplate.y = sTypeIconPositions[i][1]; - battleInput->actorTypeIcons[i] = sub_0207CA58(renderer, gfxHandler, type, &typeIconTemplate); + battleInput->spriteTypeIcons[i] = sub_0207CA58(renderer, spriteManager, type, &typeIconTemplate); - sub_0200D500(battleInput->actorTypeIcons[i], typeIconTemplate.x, typeIconTemplate.y, ((192 + 80) << FX32_SHIFT)); + ManagedSprite_SetPositionXYWithSubscreenOffset(battleInput->spriteTypeIcons[i], typeIconTemplate.x, typeIconTemplate.y, ((192 + 80) << FX32_SHIFT)); void *v8; - NNSG2dImageProxy *v9; + NNSG2dImageProxy *proxy; v8 = G2S_GetOBJCharPtr(); - v9 = SpriteActor_ImageProxy(battleInput->actorTypeIcons[i]->unk_00); + proxy = Sprite_GetImageProxy(battleInput->spriteTypeIcons[i]->sprite); - MI_CpuCopy16(moveDisplayObj->typeIcon[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); + MI_CpuCopy16(moveDisplayObj->typeIcon[i], (void *)((u32)v8 + proxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6)); } } } @@ -2821,16 +2812,16 @@ static void BattleInput_CreateTypeIcons(BattleInput *battleInput) static void BattleInput_DestroyTypeIcons(BattleInput *battleInput) { int i; - SpriteRenderer *renderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *renderer; + SpriteManager *spriteManager; - renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + renderer = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); for (i = 0; i < 4; i++) { - if (battleInput->actorTypeIcons[i] != NULL) { - sub_0207CA88(battleInput->actorTypeIcons[i]); - battleInput->actorTypeIcons[i] = NULL; + if (battleInput->spriteTypeIcons[i] != NULL) { + sub_0207CA88(battleInput->spriteTypeIcons[i]); + battleInput->spriteTypeIcons[i] = NULL; } } } @@ -2838,16 +2829,16 @@ static void BattleInput_DestroyTypeIcons(BattleInput *battleInput) static void ov16_0226B028(BattleInput *battleInput) { int i; - SpriteRenderer *renderer; - SpriteGfxHandler *gfxHandler; + SpriteSystem *renderer; + SpriteManager *spriteManager; - renderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + renderer = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); for (i = 0; i < 4; i++) { if (battleInput->unk_5FC[i] != NULL) { sub_0207CB00(battleInput->unk_5FC[i]); - sub_0207CAF8(gfxHandler, 20029 + i); + sub_0207CAF8(spriteManager, 20029 + i); battleInput->unk_5FC[i] = NULL; } } @@ -3137,7 +3128,7 @@ static void EffectTask_ButtonDown(SysTask *task, void *data) sub_020128C4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, x, y + -2); if ((battleInput->effect.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, -2); + ManagedSprite_OffsetPositionXY(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, -2); } battleInput->effect.state++; @@ -3157,7 +3148,7 @@ static void EffectTask_ButtonDown(SysTask *task, void *data) sub_020128C4(battleInput->textObj[battleInput->effect.unk_04_val3.unk_0D].fontOAM, x, y + 1); if ((battleInput->effect.unk_04_val3.unk_0E != 0xff) && (battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E] != NULL)) { - sub_0200D5DC(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, 1); + ManagedSprite_OffsetPositionXY(battleInput->unk_60C[battleInput->effect.unk_04_val3.unk_0E], 0, 1); } battleInput->effect.state++; @@ -3243,10 +3234,10 @@ static void EffectTask_MoveButtonDown(SysTask *task, void *data) sub_020128C4(battleInput->textObj[v6].fontOAM, x, y + -2); if (moveNo != 0) { - sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, -2); + Sprite_OffsetPositionXY(battleInput->spriteTypeIcons[v7]->sprite, 0, -2); if (battleInput->unk_5FC[v7] != NULL) { - sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, -2); + Sprite_OffsetPositionXY(battleInput->unk_5FC[v7]->sprite, 0, -2); } } } else { @@ -3277,10 +3268,10 @@ static void EffectTask_MoveButtonDown(SysTask *task, void *data) sub_020128C4(battleInput->textObj[v6].fontOAM, x, y + 1); if (moveNo != 0) { - sub_0200D5AC(battleInput->actorTypeIcons[v7]->unk_00, 0, 1); + Sprite_OffsetPositionXY(battleInput->spriteTypeIcons[v7]->sprite, 0, 1); if (battleInput->unk_5FC[v7] != NULL) { - sub_0200D5AC(battleInput->unk_5FC[v7]->unk_00, 0, 1); + Sprite_OffsetPositionXY(battleInput->unk_5FC[v7]->sprite, 0, 1); } } } else { @@ -3325,7 +3316,7 @@ static void EffectTask_PokemonButtonDown(SysTask *task, void *data) } if (battleInput->unk_60C[i] != NULL) { - sub_0200D5DC(battleInput->unk_60C[i], 0, -2); + ManagedSprite_OffsetPositionXY(battleInput->unk_60C[i], 0, -2); } } } @@ -3354,7 +3345,7 @@ static void EffectTask_PokemonButtonDown(SysTask *task, void *data) } if (battleInput->unk_60C[i] != NULL) { - sub_0200D5DC(battleInput->unk_60C[i], 0, 1); + ManagedSprite_OffsetPositionXY(battleInput->unk_60C[i], 0, 1); } } } @@ -3655,7 +3646,7 @@ static void ov16_0226BD74(SysTask *task, void *data) v2 = PaletteData_GetFadedBuffer(palette, 1); v3 = (16 - 8) * 2; - if (gCoreSys.touchHeld && ((v4 == 1) || (v5 == 1))) { + if (gSystem.touchHeld && ((v4 == 1) || (v5 == 1))) { if (memcmp(&v2[8], &battleInput->unk_5C[8], v3) == 0) { if (BattleSystem_GetBattleType(battleInput->battleSystem) & BATTLE_TYPE_FRONTIER) { MI_CpuCopy16(&battleInput->unk_60[0], &v2[0], 0x20); @@ -3689,7 +3680,7 @@ static int ov16_0226BE48(BattleInput *battleInput) } if (cursorMove->unk_00 == 0) { - if ((battleInput->keyPressed == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { + if ((battleInput->keyPressed == 1) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) { if (battleInput->keyPressed == 0) { Sound_PlayEffect(1500); } @@ -3734,18 +3725,18 @@ static int ov16_0226BEC0(BattleInput *battleInput, int param1) default: v4 = Unk_ov16_022701EC[cursorMove->y][cursorMove->x]; - if ((v4 == 3) && (gCoreSys.pressedKeys & PAD_KEY_UP)) { + if ((v4 == 3) && (gSystem.pressedKeys & PAD_KEY_UP)) { (void)0; } else { key = CursorMove_CheckKeyPress(cursorMove, 3, 2, Unk_ov16_022701EC[0]); if ((key == 0) && (v4 == 0)) { - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { cursorMove->x = 0; cursorMove->y = 1; Sound_PlayEffect(1500); key = PAD_KEY_LEFT; - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { cursorMove->x = 2; cursorMove->y = 1; Sound_PlayEffect(1500); @@ -4256,7 +4247,7 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int x = cursorMove->x; y = cursorMove->y; - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { cursorMove->y--; if (cursorMove->y < 0) { @@ -4275,7 +4266,7 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int } key = PAD_KEY_UP; - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { cursorMove->y++; if (cursorMove->y >= yMax) { @@ -4294,7 +4285,7 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int } key = PAD_KEY_DOWN; - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { cursorMove->x--; if (cursorMove->x < 0) { @@ -4313,7 +4304,7 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int } key = PAD_KEY_LEFT; - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { cursorMove->x++; if (cursorMove->x >= xMax) { @@ -4332,9 +4323,9 @@ static u32 CursorMove_CheckKeyPress(BattleCursorMove *cursorMove, int xMax, int } key = PAD_KEY_RIGHT; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { key = PAD_BUTTON_A; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { key = PAD_BUTTON_B; } else { return 0; @@ -4378,8 +4369,8 @@ static int (*const sCatchingTutorialStateFuncs[])(BattleInput *) = { static int BattleInput_CatchingTutorialMain(BattleInput *battleInput) { - SpriteRenderer *spriteRenderer = BattleSystem_GetSpriteRenderer(battleInput->battleSystem); - SpriteGfxHandler *gfxHandler = BattleSystem_GetSpriteGfxHandler(battleInput->battleSystem); + SpriteSystem *spriteSystem = BattleSystem_GetSpriteSystem(battleInput->battleSystem); + SpriteManager *spriteManager = BattleSystem_GetSpriteManager(battleInput->battleSystem); PaletteData *palette = BattleSystem_GetPaletteData(battleInput->battleSystem); int ret = 0xffffffff; diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 20f18fe311..b69b8bfd98 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -699,8 +699,8 @@ void ov16_02267258(Healthbar *param0) const SpriteTemplate *v2; v2 = Healthbar_SpriteTemplate(param0->type); - v0 = BattleSystem_GetSpriteRenderer(param0->battleSys); - v1 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); + v0 = BattleSystem_GetSpriteSystem(param0->battleSys); + v1 = BattleSystem_GetSpriteManager(param0->battleSys); SpriteManager_UnloadCharObjById(v1, v2->resources[0]); SpriteManager_UnloadCellObjById(v1, v2->resources[2]); @@ -719,8 +719,8 @@ static void ov16_0226728C(Healthbar *param0) return; } - v0 = BattleSystem_GetSpriteRenderer(param0->battleSys); - v1 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); + v0 = BattleSystem_GetSpriteSystem(param0->battleSys); + v1 = BattleSystem_GetSpriteManager(param0->battleSys); SpriteManager_UnloadCharObjById(v1, v2->resources[0]); SpriteManager_UnloadCellObjById(v1, v2->resources[2]); @@ -736,8 +736,8 @@ void ov16_022672C4(Healthbar *param0) NARC *v4; v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v1 = BattleSystem_GetSpriteRenderer(param0->battleSys); - v2 = BattleSystem_GetSpriteGfxHandler(param0->battleSys); + v1 = BattleSystem_GetSpriteSystem(param0->battleSys); + v2 = BattleSystem_GetSpriteManager(param0->battleSys); v3 = BattleSystem_GetPaletteData(param0->battleSys); v0 = Healthbar_SpriteTemplate(param0->type); @@ -1768,7 +1768,7 @@ static void ov16_02268380(SysTask *param0, void *param1) int v2; PaletteData *v3; - v1 = BattleSystem_GetSpriteGfxHandler(v0->unk_00->battleSys); + v1 = BattleSystem_GetSpriteManager(v0->unk_00->battleSys); v3 = BattleSystem_GetPaletteData(v0->unk_00->battleSys); switch (v0->unk_08) { diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index df828fbb6e..835b2060e6 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -4182,8 +4182,8 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par v2->unk_00 = param1; v2->unk_04 = param2; - v2->unk_08.unk_00 = BattleSystem_GetSpriteRenderer(param0); - v2->unk_08.unk_04 = BattleSystem_GetSpriteGfxHandler(param0); + v2->unk_08.unk_00 = BattleSystem_GetSpriteSystem(param0); + v2->unk_08.unk_04 = BattleSystem_GetSpriteManager(param0); v2->unk_08.unk_08 = BattleSystem_GetPaletteData(param0); { diff --git a/tools/cw/lmgr8c/lmgr8c.c b/tools/cw/lmgr8c/lmgr8c.c index 409a3c66d9..51a0786326 100644 --- a/tools/cw/lmgr8c/lmgr8c.c +++ b/tools/cw/lmgr8c/lmgr8c.c @@ -1,3 +1,10 @@ -int lp_checkout() { return 0; } -void lp_checkin() {} -void lp_errstring() {} +int lp_checkout() +{ + return 0; +} +void lp_checkin() +{ +} +void lp_errstring() +{ +}