Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-10-02 14:00:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unused variables, pass battler to function instead of gActiveBattler

Browse Source
This commit is contained in:
cawtds
2024-05-03 21:24:13 +02:00
parent 4887646e6e
commit b332fecc43
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@@ -994,8 +994,6 @@ extern u8 *gBattleAnimBgTileBuffer;
extern u8 *gBattleAnimBgTilemapBuffer;
extern void (*gBattleMainFunc)(void);
extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
extern u32 gUnusedFirstBattleVar1;
extern u8 gUnusedFirstBattleVar2;
extern u8 gBattlerAttacker;
extern u8 gEffectBattler;
extern u8 gMultiHitCounter;

2
include/battle_ai_script_commands.h
View File

@@ -9,7 +9,7 @@
#define AI_CHOICE_WATCH 5
void BattleAI_HandleItemUseBeforeAISetup(void);
void BattleAI_SetupAIData(void);
void BattleAI_SetupAIData(u32 battler);
u8 BattleAI_ChooseMoveOrAction(void);
void ClearBankMoveHistory(u8 bank);
void RecordAbilityBattle(u32 bank, u32 abilityId);

10
src/battle_ai_script_commands.c
View File

@@ -317,10 +317,12 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
}
}
BattleAI_SetupAIData();
// TODO: check if always calling with 0 or 2 is fine
// always called with 0 if first battle of this load or if for any further battle
BattleAI_SetupAIData(gActiveBattler);
}
void BattleAI_SetupAIData(void)
void BattleAI_SetupAIData(u32 battler)
{
s32 i;
u8 *data = (u8 *)AI_THINKING_STRUCT;
@@ -333,7 +335,7 @@ void BattleAI_SetupAIData(void)
for (i = 0; i < MAX_MON_MOVES; i++)
AI_THINKING_STRUCT->score[i] = 100;
moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
moveLimitations = CheckMoveLimitations(battler, 0, 0xFF);
// Ignore moves that aren't possible to use.
for (i = 0; i < MAX_MON_MOVES; i++)
@@ -345,7 +347,7 @@ void BattleAI_SetupAIData(void)
}
gBattleResources->AI_ScriptsStack->size = 0;
gBattlerAttacker = gActiveBattler;
gBattlerAttacker = battler;
// Decide a random target battlerId in doubles.
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)

2
src/battle_controller_opponent.c
View File

@@ -1355,7 +1355,7 @@ static void OpponentHandleChooseMove(u32 battler)
if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER))
{
BattleAI_SetupAIData();
BattleAI_SetupAIData(gActiveBattler);
chosenMoveId = BattleAI_ChooseMoveOrAction();
switch (chosenMoveId)

4
src/battle_controllers.c
View File

@@ -57,10 +57,6 @@ void SetUpBattleVars(void)
ClearBattleAnimationVars();
ClearBattleMonForms();
BattleAI_HandleItemUseBeforeAISetup();
// Below are never read
gUnusedFirstBattleVar1 = 0;
gUnusedFirstBattleVar2 = 0;
}
void InitBattleControllers(void)

2
src/battle_main.c
View File

@@ -131,7 +131,6 @@ EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0};
static EWRAM_DATA u32 sFlickerArray[25] = {0};
EWRAM_DATA u32 gBattleTypeFlags = 0;
EWRAM_DATA u8 gBattleTerrain = 0;
EWRAM_DATA u32 gUnusedFirstBattleVar1 = 0;
EWRAM_DATA struct MultiBattlePokemonTx gMultiPartnerParty[3] = {0};
EWRAM_DATA u8 *gBattleAnimBgTileBuffer = NULL;
EWRAM_DATA u8 *gBattleAnimBgTilemapBuffer = NULL;
@@ -183,7 +182,6 @@ EWRAM_DATA u8 gMoveResultFlags = 0;
EWRAM_DATA u32 gHitMarker = 0;
static EWRAM_DATA u8 sUnusedBattlersArray[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u8 gUnusedFirstBattleVar2 = 0;
EWRAM_DATA u32 gSideStatuses[NUM_BATTLE_SIDES] = {0};
EWRAM_DATA struct SideTimer gSideTimers[2] = {0};
EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0};