ref: 050a0162b89c645c4a2a3ed311c4da791fb3de6c
parent: 0257d4178e6f3a447376ac89ee76507268f601bd
author: PikalaxALT <[email protected]>
date: Sun Aug 7 14:14:20 EDT 2016
Rename the variable at D264
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -725,7 +725,7 @@
.skiptext
ld a, 1
- ld [wAISwitch], a
+ ld [wBattleHasJustStarted], a
callab NewEnemyMonStatus
callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1
@@ -733,7 +733,7 @@
callba EnemySwitch
callba ResetBattleParticipants
xor a
- ld [wAISwitch], a
+ ld [wBattleHasJustStarted], a
ld a, [wLinkMode]
and a
ret nz
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -7,7 +7,7 @@
ld [wPlayerAction], a
ld [BattleEnded], a
inc a
- ld [wAISwitch], a
+ ld [wBattleHasJustStarted], a
ld hl, OTPartyMon1HP
ld bc, PARTYMON_STRUCT_LENGTH - 1
ld d, BATTLEACTION_SWITCH1 - 1
@@ -167,7 +167,7 @@
xor a
ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a
- ld [wAISwitch], a
+ ld [wBattleHasJustStarted], a
ld [wPlayerJustGotFrozen], a
ld [wEnemyJustGotFrozen], a
ld [CurDamage], a
@@ -3343,14 +3343,14 @@
.not_linked
ld a, [wEnemySwitchMonIndex]
and a
- jr z, .check_wAISwitch
+ jr z, .check_wBattleHasJustStarted
dec a
ld b, a
jr .return_carry
-.check_wAISwitch
- ld a, [wAISwitch]
+.check_wBattleHasJustStarted
+ ld a, [wBattleHasJustStarted]
and a
ld b, $0
jr nz, .return_carry
@@ -3626,7 +3626,7 @@
; 3d714
CheckWhetherToAskSwitch: ; 3d714
- ld a, [wAISwitch]
+ ld a, [wBattleHasJustStarted]
dec a
jp z, .return_nc
ld a, [PartyCount]
@@ -3825,7 +3825,7 @@
or [hl]
ret nz
- ld a, [wAISwitch]
+ ld a, [wBattleHasJustStarted]
and a
jr nz, .finish_fail
ld hl, PartySpecies
@@ -7959,7 +7959,7 @@
ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>"
- ld a, [wAISwitch] ; unless this (unidentified) variable is set
+ ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
and a
jr nz, .skip_to_textbox
--- a/wram.asm
+++ b/wram.asm
@@ -2178,7 +2178,7 @@
wListMoves_MoveIndicesBuffer:: ds NUM_MOVES
wPutativeTMHMMove:: ds 1
wInitListType:: ds 1
-wAISwitch:: ds 1
+wBattleHasJustStarted:: ds 1
wFoundMatchingIDInParty::
wNamedObjectIndexBuffer::
wCurTMHM::