diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 21:31:19 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 21:31:19 -0400 |
| commit | fe2897c8a49579e6aac147d5d365b7fa6c6cdb72 (patch) | |
| tree | 0154143abc4812cb2797077501bd889988b265db /src/battle_script_commands.c | |
| parent | 7929bdf80b174f31c512970b2fa64652f222a09b (diff) | |
Define BSTRUCT_OFF for gBattleStruct macro hacks
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 270151d17..a41c7678e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10303,7 +10303,7 @@ static bool8 sub_80264C0(void) { if (gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level) { - ewram16064arr(gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; + BATTLE_PARTY_ID(gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; } else { @@ -10313,7 +10313,7 @@ static bool8 sub_80264C0(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); return 0; } - ewram16064arr(gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; + BATTLE_PARTY_ID(gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; } gBattlescriptCurrInstr = BattleScript_SuccessForceOut; return 1; @@ -13122,7 +13122,7 @@ static void atkE2_switchoutabilities(void) { case ABILITY_NATURAL_CURE: gBattleMons[gActiveBattler].status1 = 0; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[BATTLE_PARTY_ID(gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); break; } |