int -> s32

adrienntindall · Jun 5, 2023 · eda37c4 · eda37c4
1 parent c5e7412
commit eda37c4
Show file tree

Hide file tree

Showing 8 changed files with 557 additions and 557 deletions.
diff --git a/include/battle_command.h b/include/battle_command.h
@@ -75,7 +75,7 @@ BOOL BtlCmd_64(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_65(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_SetHealthbarStatus(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_PrintTrainerMessage(BattleSystem *bsys, BATTLECONTEXT *ctx);
-u32 CalcPrizeMoney(BattleSystem *bsys, BATTLECONTEXT *ctx, int trainerIndex);
+u32 CalcPrizeMoney(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 trainerIndex);
 BOOL BtlCmd_CalcPrizeMoney(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_SetStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_CopyStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx);
@@ -233,10 +233,10 @@ BOOL BtlCmd_RefreshMonData(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_222(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_223(BattleSystem *bsys, BATTLECONTEXT *ctx);
 BOOL BtlCmd_EndScript(BattleSystem *bsys, BATTLECONTEXT *ctx);
-int BattleScriptReadWord(BATTLECONTEXT *ctx);
+s32 BattleScriptReadWord(BATTLECONTEXT *ctx);
 void InitBattleMsgData(BATTLECONTEXT *ctx, BATTLEMSGDATA *msgdata);
 void InitBattleMsg(BattleSystem *bsys, BATTLECONTEXT *ctx, BATTLEMSGDATA *msgdata, BATTLEMSG *msg);
-void UpdateFrienshipFainted(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-int GetMoveMessageNo(BATTLECONTEXT *ctx, int move);
+void UpdateFrienshipFainted(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+s32 GetMoveMessageNo(BATTLECONTEXT *ctx, s32 move);
 
 #endif
diff --git a/include/battle_controller.h b/include/battle_controller.h
@@ -4,62 +4,62 @@
 #include "battle.h"
 
 void BattleController_EmitPlayEncounterAnimation(BattleSystem *bsys, BOOL a1);
-void BattleController_EmitPokemonEncounter(BattleSystem *bsys, int battlerId);
-void BattleController_EmitPokemonSlideIn(BattleSystem *bsys, int battlerId);
-void BattleController_EmitPokemonSendOut(BattleSystem *bsys, int battlerId, int a2, int a3);
-void BattleController_EmitRecallPokemon(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleController_EmitDeletePokemon(BattleSystem *bsys, int battlerId);
-void BattleController_EmitTrainerEncounter(BattleSystem *bsys, int battlerId);
-void BattleController_EmitThrowPokeball(BattleSystem *bsys, int battlerId, u32 a2);
-void BattleController_EmitTrainerSlideOut(BattleSystem *bsys, int battlerId);
-void BattleController_EmitTrainerSlideIn(BattleSystem *bsys, int battlerId, u32 a2);
-void BattleController_EmitBackgroundSlideIn(BattleSystem *bsys, int battlerId);
-void BattleController_EmitHealthbarSlideIn(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, u32 delay);
-void BattleController_EmitHealthbarSlideOut(BattleSystem *bsys, int battlerId);
-void BattleController_EmitShowMonList(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, u32 a3, u32 a4, u32 a5);
-void BattleController_EmitDrawYesNoBox(BattleSystem *bsys, BATTLECONTEXT *ctx, int a2, int a3, int a4, int a5, int a6);
-void BattleController_EmitShowWaitMessage(BattleSystem *bsys, int battlerId);
+void BattleController_EmitPokemonEncounter(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitPokemonSlideIn(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitPokemonSendOut(BattleSystem *bsys, s32 battlerId, s32 a2, s32 a3);
+void BattleController_EmitRecallPokemon(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleController_EmitDeletePokemon(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitTrainerEncounter(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitThrowPokeball(BattleSystem *bsys, s32 battlerId, u32 a2);
+void BattleController_EmitTrainerSlideOut(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitTrainerSlideIn(BattleSystem *bsys, s32 battlerId, u32 a2);
+void BattleController_EmitBackgroundSlideIn(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitHealthbarSlideIn(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, u32 delay);
+void BattleController_EmitHealthbarSlideOut(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitShowMonList(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, u32 a3, u32 a4, u32 a5);
+void BattleController_EmitDrawYesNoBox(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6);
+void BattleController_EmitShowWaitMessage(BattleSystem *bsys, s32 battlerId);
 void BattleController_EmitPrintAttackMessage(BattleSystem *bsys, BATTLECONTEXT *ctx);
 void BattleController_EmitPrintMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, BATTLEMSG *msg);
 void BattleController_SetMoveEffect(BattleSystem *bsys, BATTLECONTEXT *ctx, u16 move);
-void ov12_0226343C(BattleSystem *bsys, BATTLECONTEXT *ctx, u16 move, int attacker, int target);
-void BattleController_EmitMonFlicker(BattleSystem *bsys, int side, int a2);
-void BattleController_EmitHealthbarUpdate(BattleSystem *bsys, BATTLECONTEXT *ctx, int side);
-void BattleController_EmitPlayFaintAnimation(BattleSystem *bsys, BATTLECONTEXT *ctx, int batlterId);
-void BattleController_EmitPlaySE(BattleSystem *bsys, BATTLECONTEXT *ctx, u32 sndSeqNo, int battlerId);
+void ov12_0226343C(BattleSystem *bsys, BATTLECONTEXT *ctx, u16 move, s32 attacker, s32 target);
+void BattleController_EmitMonFlicker(BattleSystem *bsys, s32 side, s32 a2);
+void BattleController_EmitHealthbarUpdate(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 side);
+void BattleController_EmitPlayFaintAnimation(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 batlterId);
+void BattleController_EmitPlaySE(BattleSystem *bsys, BATTLECONTEXT *ctx, u32 sndSeqNo, s32 battlerId);
 void BattleController_EmitFadeOutBattle(BattleSystem *bsys, BATTLECONTEXT *ctx);
-void BattleController_EmitToggleVanish(BattleSystem *bsys, int battlerId, int a2);
-void BattleController_EmitHealthbarStatus(BattleSystem *bsys, int battlerId, int status);
-void BattleController_EmitPrintTrainerMessage(BattleSystem *bsys, int battlerId, int msg);
-void BattleController_EmitSetStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, int status);
-void BattleController_EmitCopyStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerIdA, int battlerIdB, int status);
-void BattleController_EmitPrintReturnMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, int a3);
-void BattleController_EmitPrintSendOutMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, int a3);
-void BattleController_EmitPrintEncounterMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleController_EmitPrintFirstSendOutMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleController_EmitBattleMonToPartyMonCopy(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleControl_EmitPartyStatusHeal(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, int moveNo);
+void BattleController_EmitToggleVanish(BattleSystem *bsys, s32 battlerId, s32 a2);
+void BattleController_EmitHealthbarStatus(BattleSystem *bsys, s32 battlerId, s32 status);
+void BattleController_EmitPrintTrainerMessage(BattleSystem *bsys, s32 battlerId, s32 msg);
+void BattleController_EmitSetStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, s32 status);
+void BattleController_EmitCopyStatus2Effect(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerIdA, s32 battlerIdB, s32 status);
+void BattleController_EmitPrintReturnMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, s32 a3);
+void BattleController_EmitPrintSendOutMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, s32 a3);
+void BattleController_EmitPrintEncounterMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleController_EmitPrintFirstSendOutMessage(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleController_EmitBattleMonToPartyMonCopy(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleControl_EmitPartyStatusHeal(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, s32 moveNo);
 void BattleController_EmitSetBattleResults(BattleSystem *bsys);
-void BattleController_EmitPlayMosaicAnimation(BattleSystem *bsys, int battlerId, int a2, int delay);
-void BattleController_EmitChangeForme(BattleSystem *bsys, int battlerId);
-void BattleController_EmitSetBattleBackground(BattleSystem *bsys, int a1);
-void BattleController_EmitInitStartBallGauge(BattleSystem *bsys, int battlerId);
-void BattleController_EmitDeleteStartBallGauge(BattleSystem *bsys, int battlerId);
-void BattleController_EmitInitBallGauge(BattleSystem *bsys, int battlerId);
-void BattleController_EmitDeleteBallGauge(BattleSystem *bsys, int battlerId);
+void BattleController_EmitPlayMosaicAnimation(BattleSystem *bsys, s32 battlerId, s32 a2, s32 delay);
+void BattleController_EmitChangeForme(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitSetBattleBackground(BattleSystem *bsys, s32 a1);
+void BattleController_EmitInitStartBallGauge(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitDeleteStartBallGauge(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitInitBallGauge(BattleSystem *bsys, s32 battlerId);
+void BattleController_EmitDeleteBallGauge(BattleSystem *bsys, s32 battlerId);
 void BattleController_EmitLoadBallGfx(BattleSystem *bsys);
 void BattleController_EmitDeleteBallGfx(BattleSystem *bsys);
-void BattleController_EmitIncrementGameStat(BattleSystem *bsys, int battlerId, int flag, int id);
-void ov12_02263F8C(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void ov12_02264038(BattleSystem *bsys, int battlerId);
-void ov12_02264054(BattleSystem *bsys, int battlerId);
+void BattleController_EmitIncrementGameStat(BattleSystem *bsys, s32 battlerId, s32 flag, s32 id);
+void ov12_02263F8C(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void ov12_02264038(BattleSystem *bsys, s32 battlerId);
+void ov12_02264054(BattleSystem *bsys, s32 battlerId);
 void BattleController_EmitPrintResultMessage(BattleSystem *bsys);
 void BattleController_EmitRunAwayMessage(BattleSystem *bsys, BATTLECONTEXT *ctx);
 void BattleController_EmitForefitMessage(BattleSystem *bsys);
-void BattleController_EmitSwapToSubstituteSprite(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleController_EmitPlayMoveSE(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
-void BattleController_EmitPlaySong(BattleSystem *bsys, int battlerId, int song);
-void BattleController_EmitRefreshMonData(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId, int monIndex);
+void BattleController_EmitSwapToSubstituteSprite(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleController_EmitPlayMoveSE(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId);
+void BattleController_EmitPlaySong(BattleSystem *bsys, s32 battlerId, s32 song);
+void BattleController_EmitRefreshMonData(BattleSystem *bsys, BATTLECONTEXT *ctx, s32 battlerId, s32 monIndex);
 
 void ov12_022645C8(BattleSystem *bsys, BATTLECONTEXT *ctx, u8 a2);
 

diff --git a/include/battle_cursor.h b/include/battle_cursor.h
@@ -13,11 +13,11 @@ void BattleCursor_LoadResources(void *a0, void *a1, void *a3, HeapID heapId, u32
 void BattleCursor_FreeResources(void *a0, u32 character, u32 pal, u32 cell, u32 animation);
 BattleCursor *BattleCursor_New(void *a0, void *a1, HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
 void BattleCursor_Delete(BattleCursor *cursor);
-void ov12_0226BA4C(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, fx32 a9);
-void ov12_0226BAD4(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-void ov12_0226BAFC(BattleCursor *cursor, int left, int right, int top, int bottom);
-void ov12_0226BB1C(BattleCursor *cursor, int left, int right, int top, int bottom, fx32 a5);
-void ov12_0226BB40(BattleCursor *cursor, int x, int y, int a3, fx32 a4);
+void ov12_0226BA4C(BattleCursor *cursor, s32 x0, s32 y0, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, s32 y3, fx32 a9);
+void ov12_0226BAD4(BattleCursor *cursor, s32 x0, s32 y0, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, s32 y3);
+void ov12_0226BAFC(BattleCursor *cursor, s32 left, s32 right, s32 top, s32 bottom);
+void ov12_0226BB1C(BattleCursor *cursor, s32 left, s32 right, s32 top, s32 bottom, fx32 a5);
+void ov12_0226BB40(BattleCursor *cursor, s32 x, s32 y, s32 a3, fx32 a4);
 void BattleCursor_Disable(BattleCursor *cursor);
 void ov12_0226BB84(BattleCursor *cursor);
 

diff --git a/include/battle_finger.h b/include/battle_finger.h
@@ -9,9 +9,9 @@
 typedef struct BattleFinger {
     void *unk0;
     SysTask *task;
-    int x;
-    int y;
-    int angle;
+    s32 x;
+    s32 y;
+    s32 angle;
     fx32 unk14;
     s16 delay;
     u8 touchRequest;
@@ -25,10 +25,10 @@ void BattleFinger_LoadResources(void *a0, void *a1, HeapID heapId, void *a3, u32
 void BattleFinger_FreeResources(void *a0, u32 character, u32 pal, u32 cell, u32 animation);
 BattleFinger *BattleFinger_New(void *a0, void *a1, HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
 void BattleFinger_Delete(BattleFinger *finger);
-void ov12_0226BCFC(BattleFinger *finger, int x, int y, fx32 a3);
-void ov12_0226BD2C(BattleFinger *finger, int x, int y);
+void ov12_0226BCFC(BattleFinger *finger, s32 x, s32 y, fx32 a3);
+void ov12_0226BD2C(BattleFinger *finger, s32 x, s32 y);
 void BattleFinger_Disable(BattleFinger *finger);
-void ov12_0226BD4C(BattleFinger *finger, int delay);
+void ov12_0226BD4C(BattleFinger *finger, s32 delay);
 BOOL ov12_0226BD50(BattleFinger *finger);
 
 #endif