Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

battle_input.c #347

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

battle_input.c #347

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28e8e81
rename battle_input.c
adrienntindall Jan 20, 2025
c93a3db
Add msg consts to battle_input.c
adrienntindall Jan 21, 2025
0ee0e35
Begin documenting battle menu templates
adrienntindall Jan 27, 2025
459f3a8
Deanonymize some variables
adrienntindall Jan 29, 2025
d297701
Rename some functions
adrienntindall Feb 8, 2025
b756262
Merge remote-tracking branch 'upstream/main' into main-adrienntindall
adrienntindall Feb 17, 2025
667b1b8
Merge remote-tracking branch 'upstream/main' into main-adrienntindall
adrienntindall Feb 17, 2025
4df8633
Merge 2
adrienntindall Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/battle/battle_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
37 changes: 37 additions & 0 deletions include/battle/battle_input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 BattleInput_PrintRecordingStopMessage(BattleInput *input, int param1);
u8 ov16_0226D088(BattleInput *input);

#endif // POKEPLATINUM_OV16_0226871C_H
8 changes: 4 additions & 4 deletions include/battle/ov16_0223DF00.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
37 changes: 0 additions & 37 deletions include/battle/ov16_0226871C.h
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions include/battle/ov16_0226DB7C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
void BattleCursor_Free(BattleCursor *param0);
void BattleCursor_Free(BattleCursor *battleCursor);

etc.

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
18 changes: 9 additions & 9 deletions include/battle/ov16_0226DE44.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225BFFC_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_02268A14_decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polish: Pull this (and other such structs named in this PR) out into the corresponding header, if possible.

Copy link
Collaborator Author

@adrienntindall adrienntindall Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one specifically is defined in the c file, I can default to just putting it in battle_input.h for now


#endif // POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H
10 changes: 5 additions & 5 deletions include/battle/struct_ov16_0226C378.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0226DC24_decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0226DEEC_decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions include/overlay013/ov13_02228A38.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *param1);
void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *battleCursor);

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);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay013/struct_ov13_02227244.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion include/struct_defs/battle_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/unk_0207C908.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion platinum.us/main.lsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions src/battle/battle_controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polish: GMM constant

msg.tags = TAG_NONE;
BattleIO_SetAlertMessage(battleSys, i, msg);
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -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) {
Expand Down
Loading
Loading