Get rid of the gActiveBattler variable (#3262)

rh-hideout · Sep 4, 2023 · b907029 · b907029
2 parents 1513443 + d967776
commit b907029
Show file tree

Hide file tree

Showing 38 changed files with 3,818 additions and 3,992 deletions.
diff --git a/charmap.txt b/charmap.txt
@@ -367,7 +367,7 @@ B_ATK_PARTNER_NAME = FD 0E
 B_ATK_NAME_WITH_PREFIX = FD 0F
 B_DEF_NAME_WITH_PREFIX = FD 10
 B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBattler
-B_ACTIVE_NAME_WITH_PREFIX = FD 12
+@ FD 12 - preiously gActiveBattler with prefix
 B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13
 B_CURRENT_MOVE = FD 14
 B_LAST_MOVE = FD 15
@@ -409,8 +409,8 @@ B_ATK_TEAM2 = FD 38
 B_DEF_NAME = FD 39
 B_DEF_TEAM1 = FD 3A
 B_DEF_TEAM2 = FD 3B
-B_ACTIVE_NAME = FD 3C
-B_ACTIVE_NAME2 = FD 3D @ no Illusion check
+@ FD 3C - preiously gActiveBattler
+@ FD 3D - preiously gActiveBattler without Illusion Check
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00

diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
@@ -112,6 +112,7 @@ BattleScript_ItemSetFocusEnergy::
     setfocusenergy
     playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
     waitanimation
+	copybyte sBATTLER, gBattlerAttacker
     printstring STRINGID_PKMNUSEDXTOGETPUMPED
     waitmessage B_WAIT_TIME_LONG
     end

diff --git a/include/battle.h b/include/battle.h
@@ -353,6 +353,7 @@ struct BattleResources
     struct BattleHistory *battleHistory;
     u8 bufferA[MAX_BATTLERS_COUNT][0x200];
     u8 bufferB[MAX_BATTLERS_COUNT][0x200];
+    u8 transferBuffer[0x100];
 };
 
 #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai))
@@ -925,7 +926,6 @@ extern u8 gBattleTerrain;
 extern u32 gUnusedFirstBattleVar1;
 extern u8 *gBattleAnimBgTileBuffer;
 extern u8 *gBattleAnimBgTilemapBuffer;
-extern u8 gActiveBattler;
 extern u32 gBattleControllerExecFlags;
 extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];

diff --git a/include/battle_ai_main.h b/include/battle_ai_main.h
@@ -22,7 +22,7 @@
 u8 ComputeBattleAiScores(u8 battler);
 void BattleAI_SetupItems(void);
 void BattleAI_SetupFlags(void);
-void BattleAI_SetupAIData(u8 defaultScoreMoves);
+void BattleAI_SetupAIData(u8 defaultScoreMoves, u32 battler);
 u8 BattleAI_ChooseMoveOrAction(void);
 void Ai_InitPartyStruct(void);
 void Ai_UpdateSwitchInData(u32 battler);

diff --git a/include/battle_ai_switch_items.h b/include/battle_ai_switch_items.h
@@ -2,8 +2,8 @@
 #define GUARD_BATTLE_AI_SWITCH_ITEMS_H
 
 void GetAIPartyIndexes(u32 battlerId, s32 *firstId, s32 *lastId);
-void AI_TrySwitchOrUseItem(void);
-u8 GetMostSuitableMonToSwitchInto(void);
-bool32 ShouldSwitch(void);
+void AI_TrySwitchOrUseItem(u32 battler);
+u8 GetMostSuitableMonToSwitchInto(u32 battler);
+bool32 ShouldSwitch(u32 battler);
 
 #endif // GUARD_BATTLE_AI_SWITCH_ITEMS_H
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
@@ -209,52 +209,52 @@ void SetUpBattleVarsAndBirchZigzagoon(void);
 void InitBattleControllers(void);
 bool32 IsValidForBattle(struct Pokemon *mon);
 void TryReceiveLinkBattleData(void);
-void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
+void PrepareBufferDataTransferLink(u32 battler, u32 bufferId, u16 size, u8 *data);
 
 // emitters
-void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
-void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
-void BtlController_EmitLoadMonSprite(u8 bufferId);
-void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
-void BtlController_EmitReturnMonToBall(u8 bufferId, bool8 skipAnim);
-void BtlController_EmitDrawTrainerPic(u8 bufferId);
-void BtlController_EmitTrainerSlide(u8 bufferId);
-void BtlController_EmitTrainerSlideBack(u8 bufferId);
-void BtlController_EmitFaintAnimation(u8 bufferId);
-void BtlController_EmitBallThrowAnim(u8 bufferId, u8 caseId);
-void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit);
-void BtlController_EmitPrintString(u8 bufferId, u16 stringId);
-void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId);
-void BtlController_EmitChooseAction(u8 bufferId, u8 action, u16 itemId);
-void BtlController_EmitYesNoBox(u8 bufferId);
-void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
-void BtlController_EmitChooseItem(u8 bufferId, u8 *battlePartyOrder);
-void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 slotId, u16 abilityId, u8 *data);
-void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
-void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, s32 expPoints);
-void BtlController_EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
-void BtlController_EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
-void BtlController_EmitDataTransfer(u8 bufferId, u16 size, void *data);
-void BtlController_EmitTwoReturnValues(u8 bufferId, u8 ret8, u32 ret32);
-void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 partyId, u8 *battlePartyOrder);
-void BtlController_EmitOneReturnValue(u8 bufferId, u16 ret);
-void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 ret);
-void BtlController_EmitHitAnimation(u8 bufferId);
-void BtlController_EmitCantSwitch(u8 bufferId);
-void BtlController_EmitPlaySE(u8 bufferId, u16 songId);
-void BtlController_EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
-void BtlController_EmitFaintingCry(u8 bufferId);
-void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId);
-void BtlController_EmitIntroTrainerBallThrow(u8 bufferId);
-void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 flags);
-void BtlController_EmitHidePartyStatusSummary(u8 bufferId);
-void BtlController_EmitEndBounceEffect(u8 bufferId);
-void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
-void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
-void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 mode, bool32 record);
-void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
-void BtlController_EmitEndLinkBattle(u8 bufferId, u8 battleOutcome);
-void BtlController_EmitDebugMenu(u8 bufferId);
+void BtlController_EmitGetMonData(u32 battler, u32 bufferId, u8 requestId, u8 monToCheck);
+void BtlController_EmitSetMonData(u32 battler, u32 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
+void BtlController_EmitLoadMonSprite(u32 battler, u32 bufferId);
+void BtlController_EmitSwitchInAnim(u32 battler, u32 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
+void BtlController_EmitReturnMonToBall(u32 battler, u32 bufferId, bool8 skipAnim);
+void BtlController_EmitDrawTrainerPic(u32 battler, u32 bufferId);
+void BtlController_EmitTrainerSlide(u32 battler, u32 bufferId);
+void BtlController_EmitTrainerSlideBack(u32 battler, u32 bufferId);
+void BtlController_EmitFaintAnimation(u32 battler, u32 bufferId);
+void BtlController_EmitBallThrowAnim(u32 battler, u32 bufferId, u8 caseId);
+void BtlController_EmitMoveAnimation(u32 battler, u32 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit);
+void BtlController_EmitPrintString(u32 battler, u32 bufferId, u16 stringId);
+void BtlController_EmitPrintSelectionString(u32 battler, u32 bufferId, u16 stringId);
+void BtlController_EmitChooseAction(u32 battler, u32 bufferId, u8 action, u16 itemId);
+void BtlController_EmitYesNoBox(u32 battler, u32 bufferId);
+void BtlController_EmitChooseMove(u32 battler, u32 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
+void BtlController_EmitChooseItem(u32 battler, u32 bufferId, u8 *battlePartyOrder);
+void BtlController_EmitChoosePokemon(u32 battler, u32 bufferId, u8 caseId, u8 slotId, u16 abilityId, u8 *data);
+void BtlController_EmitHealthBarUpdate(u32 battler, u32 bufferId, u16 hpValue);
+void BtlController_EmitExpUpdate(u32 battler, u32 bufferId, u8 partyId, s32 expPoints);
+void BtlController_EmitStatusIconUpdate(u32 battler, u32 bufferId, u32 status1, u32 status2);
+void BtlController_EmitStatusAnimation(u32 battler, u32 bufferId, bool8 status2, u32 status);
+void BtlController_EmitDataTransfer(u32 battler, u32 bufferId, u16 size, void *data);
+void BtlController_EmitTwoReturnValues(u32 battler, u32 bufferId, u8 ret8, u32 ret32);
+void BtlController_EmitChosenMonReturnValue(u32 battler, u32 bufferId, u8 partyId, u8 *battlePartyOrder);
+void BtlController_EmitOneReturnValue(u32 battler, u32 bufferId, u16 ret);
+void BtlController_EmitOneReturnValue_Duplicate(u32 battler, u32 bufferId, u16 ret);
+void BtlController_EmitHitAnimation(u32 battler, u32 bufferId);
+void BtlController_EmitCantSwitch(u32 battler, u32 bufferId);
+void BtlController_EmitPlaySE(u32 battler, u32 bufferId, u16 songId);
+void BtlController_EmitPlayFanfareOrBGM(u32 battler, u32 bufferId, u16 songId, bool8 playBGM);
+void BtlController_EmitFaintingCry(u32 battler, u32 bufferId);
+void BtlController_EmitIntroSlide(u32 battler, u32 bufferId, u8 terrainId);
+void BtlController_EmitIntroTrainerBallThrow(u32 battler, u32 bufferId);
+void BtlController_EmitDrawPartyStatusSummary(u32 battler, u32 bufferId, struct HpAndStatus* hpAndStatus, u8 flags);
+void BtlController_EmitHidePartyStatusSummary(u32 battler, u32 bufferId);
+void BtlController_EmitEndBounceEffect(u32 battler, u32 bufferId);
+void BtlController_EmitSpriteInvisibility(u32 battler, u32 bufferId, bool8 isInvisible);
+void BtlController_EmitBattleAnimation(u32 battler, u32 bufferId, u8 animationId, u16 argument);
+void BtlController_EmitLinkStandbyMsg(u32 battler, u32 bufferId, u8 mode, bool32 record);
+void BtlController_EmitResetActionMoveSelection(u32 battler, u32 bufferId, u8 caseId);
+void BtlController_EmitEndLinkBattle(u32 battler, u32 bufferId, u8 battleOutcome);
+void BtlController_EmitDebugMenu(u32 battler, u32 bufferId);
 
 void BattleControllerComplete(u32 battler); // Can be used for all the controllers.
 void BtlController_Empty(u32 battler); // Empty command, does nothing, only completes the execution.

diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h
@@ -3,40 +3,40 @@
 
 void AllocateBattleSpritesData(void);
 void FreeBattleSpritesData(void);
-u16 ChooseMoveAndTargetInBattlePalace(void);
+u16 ChooseMoveAndTargetInBattlePalace(u32 battler);
 void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite);
 void SpriteCB_TrainerSlideIn(struct Sprite *sprite);
-void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status);
+void InitAndLaunchChosenStatusAnimation(u32 battler, bool32 isStatus2, u32 status);
 bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattlerId, u8 attacker, u8 target, u8 tableId, u16 argument);
 void InitAndLaunchSpecialAnimation(u8 activeBattlerId, u8 attacker, u8 target, u8 tableId);
-bool8 IsBattleSEPlaying(u8 battlerId);
-void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battlerId);
+bool8 IsBattleSEPlaying(u8 battler);
+void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battler);
 void BattleGfxSfxDummy2(u16 species);
-void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId);
-void DecompressTrainerBackPic(u16 backPicId, u8 battlerId);
+void DecompressTrainerFrontPic(u16 frontPicId, u8 battler);
+void DecompressTrainerBackPic(u16 backPicId, u8 battler);
 void FreeTrainerFrontPicPalette(u16 frontPicId);
 bool8 BattleLoadAllHealthBoxesGfx(u8 state);
 void LoadBattleBarGfx(u8 unused);
-bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId);
+bool8 BattleInitAllSprites(u8 *state1, u8 *battler);
 void ClearSpritesHealthboxAnimData(void);
 void CopyAllBattleSpritesInvisibilities(void);
-void CopyBattleSpriteInvisibility(u8 battlerId);
+void CopyBattleSpriteInvisibility(u8 battler);
 void HandleSpeciesGfxDataChange(u8 attacker, u8 target, bool32 megaEvo, bool8 trackEnemyPersonality);
-void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite);
-void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId);
-void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move);
-void ClearBehindSubstituteBit(u8 battlerId);
-void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId);
+void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite);
+void LoadBattleMonGfxAndAnimate(u8 battler, bool8 loadMonSprite, u8 spriteId);
+void TrySetBehindSubstituteSpriteBit(u8 battler, u16 move);
+void ClearBehindSubstituteBit(u8 battler);
+void HandleLowHpMusicChange(struct Pokemon *mon, u8 battler);
 void BattleStopLowHpSound(void);
 u8 GetMonHPBarLevel(struct Pokemon *mon);
 void HandleBattleLowHpMusicChange(void);
 void SetBattlerSpriteAffineMode(u8 affineMode);
 void LoadAndCreateEnemyShadowSprites(void);
 void SpriteCB_SetInvisible(struct Sprite *sprite);
-void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species);
-void HideBattlerShadowSprite(u8 battlerId);
+void SetBattlerShadowSpriteCallback(u8 battler, u16 species);
+void HideBattlerShadowSprite(u8 battler);
 void FillAroundBattleWindows(void);
-void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
+void ClearTemporarySpeciesSpriteData(u8 battler, bool8 dontClearSubstitute);
 void AllocateMonSpritesGfx(void);
 void FreeMonSpritesGfx(void);
 bool32 ShouldPlayNormalMonCry(struct Pokemon *mon);

diff --git a/include/battle_main.h b/include/battle_main.h
@@ -53,10 +53,10 @@ void SpriteCB_TrainerThrowObject(struct Sprite *sprite);
 void AnimSetCenterToCornerVecX(struct Sprite *sprite);
 void BeginBattleIntroDummy(void);
 void BeginBattleIntro(void);
-void SwitchInClearSetData(void);
-void FaintClearSetData(void);
+void SwitchInClearSetData(u32 battler);
+void FaintClearSetData(u32 battler);
 void BattleTurnPassed(void);
-u8 IsRunningFromBattleImpossible(void);
+u8 IsRunningFromBattleImpossible(u32 battler);
 void SwitchPartyOrder(u8 battlerId);
 void SwapTurnOrder(u8 id1, u8 id2);
 u32 GetBattlerTotalSpeedStat(u8 battlerId);

diff --git a/include/battle_message.h b/include/battle_message.h
@@ -27,7 +27,7 @@
 #define B_TXT_ATK_NAME_WITH_PREFIX 0xF
 #define B_TXT_DEF_NAME_WITH_PREFIX 0x10
 #define B_TXT_EFF_NAME_WITH_PREFIX 0x11 // EFF = short for gEffectBank
-#define B_TXT_ACTIVE_NAME_WITH_PREFIX 0x12
+// #define B_TXT_ACTIVE_NAME_WITH_PREFIX 0x12 - removed
 #define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX 0x13
 #define B_TXT_CURRENT_MOVE 0x14
 #define B_TXT_LAST_MOVE 0x15
@@ -69,8 +69,8 @@
 #define B_TXT_DEF_NAME 0x39
 #define B_TXT_DEF_TEAM1 0x3A // Your/The opposing
 #define B_TXT_DEF_TEAM2 0x3B // your/the opposing
-#define B_TXT_ACTIVE_NAME 0x3C
-#define B_TXT_ACTIVE_NAME2 0x3D // no Illusion check
+// #define B_TXT_SELECTION_NAME 0x3C - removed
+// #define B_TXT_SELECTION_NAME2 0x3D no Illusion check - removed
 
 // for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
 
@@ -240,13 +240,13 @@ enum
     TRAINER_SLIDE_BEFORE_FIRST_TURN,
 };
 
-void BufferStringBattle(u16 stringID);
+void BufferStringBattle(u16 stringID, u32 battler);
 u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src);
 u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst);
 void BattlePutTextOnWindow(const u8 *text, u8 windowId);
-void SetPpNumbersPaletteInMoveSelection(void);
+void SetPpNumbersPaletteInMoveSelection(u32 battler);
 u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
-u32 ShouldDoTrainerSlide(u32 battlerId, u32 which); // return 1 for TrainerA, 2 forTrainerB
+u32 ShouldDoTrainerSlide(u32 battler, u32 which); // return 1 for TrainerA, 2 forTrainerB
 void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst);
 
 extern struct BattleMsgData *gBattleMsgDataPtr;