pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the variable at D264

Browse Source
This commit is contained in:
PikalaxALT 2016-08-07 18:14:20 -04:00
parent 0257d4178e
commit 050a0162b8
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
battle/ai/items.asm
View File

@ -725,7 +725,7 @@ AI_Switch: ; 3846c
.skiptext .skiptext
ld a, 1 ld a, 1
ld [wAISwitch], a ld [wBattleHasJustStarted], a
callab NewEnemyMonStatus callab NewEnemyMonStatus
callab ResetEnemyStatLevels callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
@ -733,7 +733,7 @@ AI_Switch: ; 3846c
callba EnemySwitch callba EnemySwitch
callba ResetBattleParticipants callba ResetBattleParticipants
xor a xor a
ld [wAISwitch], a ld [wBattleHasJustStarted], a
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
ret nz ret nz

16
battle/core.asm
View File

@ -7,7 +7,7 @@ DoBattle: ; 3c000
ld [wPlayerAction], a ld [wPlayerAction], a
ld [BattleEnded], a ld [BattleEnded], a
inc a inc a
ld [wAISwitch], a ld [wBattleHasJustStarted], a
ld hl, OTPartyMon1HP ld hl, OTPartyMon1HP
ld bc, PARTYMON_STRUCT_LENGTH - 1 ld bc, PARTYMON_STRUCT_LENGTH - 1
ld d, BATTLEACTION_SWITCH1 - 1 ld d, BATTLEACTION_SWITCH1 - 1
@ -167,7 +167,7 @@ BattleTurn: ; 3c12f
xor a xor a
ld [wPlayerIsSwitching], a ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
ld [wAISwitch], a ld [wBattleHasJustStarted], a
ld [wPlayerJustGotFrozen], a ld [wPlayerJustGotFrozen], a
ld [wEnemyJustGotFrozen], a ld [wEnemyJustGotFrozen], a
ld [CurDamage], a ld [CurDamage], a
@ -3343,14 +3343,14 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533
.not_linked .not_linked
ld a, [wEnemySwitchMonIndex] ld a, [wEnemySwitchMonIndex]
and a and a
jr z, .check_wAISwitch jr z, .check_wBattleHasJustStarted
dec a dec a
ld b, a ld b, a
jr .return_carry jr .return_carry
.check_wAISwitch .check_wBattleHasJustStarted
ld a, [wAISwitch] ld a, [wBattleHasJustStarted]
and a and a
ld b, $0 ld b, $0
jr nz, .return_carry jr nz, .return_carry
@ -3626,7 +3626,7 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca
; 3d714 ; 3d714
CheckWhetherToAskSwitch: ; 3d714 CheckWhetherToAskSwitch: ; 3d714
ld a, [wAISwitch] ld a, [wBattleHasJustStarted]
dec a dec a
jp z, .return_nc jp z, .return_nc
ld a, [PartyCount] ld a, [PartyCount]
@ -3825,7 +3825,7 @@ CheckIfCurPartyMonIsFitToFight: ; 3d887
or [hl] or [hl]
ret nz ret nz
ld a, [wAISwitch] ld a, [wBattleHasJustStarted]
and a and a
jr nz, .finish_fail jr nz, .finish_fail
ld hl, PartySpecies ld hl, PartySpecies
@ -7959,7 +7959,7 @@ SendOutPkmnText: ; 3f26d
ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>" 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 and a
jr nz, .skip_to_textbox jr nz, .skip_to_textbox

2
wram.asm
View File

@ -2178,7 +2178,7 @@ wWaterEncounterRate:: ds 1 ; d25d
wListMoves_MoveIndicesBuffer:: ds NUM_MOVES wListMoves_MoveIndicesBuffer:: ds NUM_MOVES
wPutativeTMHMMove:: ds 1 wPutativeTMHMMove:: ds 1
wInitListType:: ds 1 wInitListType:: ds 1
wAISwitch:: ds 1 wBattleHasJustStarted:: ds 1
wFoundMatchingIDInParty:: wFoundMatchingIDInParty::
wNamedObjectIndexBuffer:: wNamedObjectIndexBuffer::
wCurTMHM:: wCurTMHM::