summaryrefslogtreecommitdiff
path: root/engine/battle_anims/bg_effects.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle_anims/bg_effects.asm')
-rw-r--r--engine/battle_anims/bg_effects.asm274
1 files changed, 137 insertions, 137 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index e5e186ab7..04234a020 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -363,14 +363,14 @@ BattleBGEffect_HideMon:
call ClearBox
pop bc
xor a
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.four
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call EndBattleBGEffect
ret
@@ -460,13 +460,13 @@ BattleBGEffect_FeetFollow:
.okay2
call ClearBox
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
pop bc
ret
.five
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call EndBattleBGEffect
ret
@@ -527,13 +527,13 @@ BattleBGEffect_HeadFollow:
.okay2
call ClearBox
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
pop bc
ret
.five
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call EndBattleBGEffect
ret
@@ -615,9 +615,9 @@ BattleBGEffect_27:
jr nz, .row2
.okay2
xor a
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call BattleBGEffects_IncrementJumptable
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@@ -626,7 +626,7 @@ BattleBGEffect_27:
.four
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -736,7 +736,7 @@ BattleBGEffect_RunPicResizeScript:
.skip
call BattleBGEffects_IncrementJumptable
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.clear
@@ -745,7 +745,7 @@ BattleBGEffect_RunPicResizeScript:
.restart
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld [hl], $0
@@ -753,7 +753,7 @@ BattleBGEffect_RunPicResizeScript:
.end
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call EndBattleBGEffect
ret
@@ -915,7 +915,7 @@ BattleBGEffect_Surf:
call InitSurfWaves
.one
- ld a, [hLCDCPointer]
+ ldh a, [hLCDCPointer]
and a
ret z
push bc
@@ -945,7 +945,7 @@ BattleBGEffect_Surf:
ld hl, wSurfWaveBGEffect
ld bc, $0
.loop2
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
cp e
jr nc, .load_zero
push hl
@@ -978,12 +978,12 @@ BattleBGEffect_Whirlpool:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
- ld [hLCDCPointer], a
+ ld a, LOW(rSCY)
+ ldh [hLCDCPointer], a
xor a
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, $5e
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
lb de, 2, 2
call Functionc8f2e
ret
@@ -998,7 +998,7 @@ BattleBGEffect_Whirlpool:
BattleBGEffect_30:
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
call EndBattleBGEffect
ret
@@ -1051,12 +1051,12 @@ BattleBGEffect_Psychic:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
- ld [hLCDCPointer], a
+ ld a, LOW(rSCX)
+ ldh [hLCDCPointer], a
xor a
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, $5f
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
lb de, 6, 5
call Functionc8f2e
ld hl, BG_EFFECT_STRUCT_03
@@ -1088,7 +1088,7 @@ BattleBGEffect_Teleport:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
lb de, 6, 5
call Functionc8f2e
@@ -1112,7 +1112,7 @@ BattleBGEffect_NightShade:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@@ -1142,11 +1142,11 @@ BattleBGEffect_DoubleTeam:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $0
@@ -1201,9 +1201,9 @@ BattleBGEffect_DoubleTeam:
inc a
ld d, a
ld h, HIGH(wLYOverridesBackup)
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
srl a
push af
@@ -1233,7 +1233,7 @@ BattleBGEffect_AcidArmor:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@@ -1241,7 +1241,7 @@ BattleBGEffect_AcidArmor:
ld d, 2
call Functionc8f2e
ld h, HIGH(wLYOverridesBackup)
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
ld l, a
ld [hl], $0
dec l
@@ -1249,7 +1249,7 @@ BattleBGEffect_AcidArmor:
ret
.one
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
ld l, a
ld h, HIGH(wLYOverridesBackup)
ld e, l
@@ -1259,11 +1259,11 @@ BattleBGEffect_AcidArmor:
ld a, [de]
dec de
ld [hld], a
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
cp l
jr nz, .loop
ld [hl], $90
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
ld l, a
ld a, [hl]
cp $1
@@ -1295,11 +1295,11 @@ BattleBGEffect_Withdraw:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -1344,11 +1344,11 @@ BattleBGEffect_Dig:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $2
@@ -1370,9 +1370,9 @@ BattleBGEffect_Dig:
ld [hl], $10
call BattleBGEffects_IncrementJumptable
.two
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
dec a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
@@ -1410,11 +1410,11 @@ BattleBGEffect_Tackle:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1444,11 +1444,11 @@ BattleBGEffect_25:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms2
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1521,16 +1521,16 @@ Functionc88a5:
jp BGEffect_FillLYOverridesBackup
.rollout
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld d, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub d
ld d, a
ld h, HIGH(wLYOverridesBackup)
- ld a, [hSCY]
+ ldh a, [hSCY]
or a
jr nz, .skip1
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
or a
jr z, .skip2
dec a
@@ -1539,14 +1539,14 @@ Functionc88a5:
jr .skip2
.skip1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
dec a
ld l, a
ld [hl], $0
.skip2
- ld a, [hSCY]
+ ldh a, [hSCY]
ld l, a
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
sub l
jr nc, .skip3
xor a
@@ -1575,11 +1575,11 @@ BattleBGEffect_2d:
BGEffect2d_2f_zero:
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1618,11 +1618,11 @@ BattleBGEffect_26:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1656,11 +1656,11 @@ BattleBGEffect_2c:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
xor a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
@@ -1710,7 +1710,7 @@ BattleBGEffect_28:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
ret
@@ -1752,11 +1752,11 @@ BattleBGEffect_BounceDown:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCY - $ff00
+ ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms2
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -1808,14 +1808,14 @@ BattleBGEffect_2a:
call BattleBGEffects_SetLYOverrides
ld a, $47
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
- ld a, [hLYOverrideStart]
+ ldh [hLYOverrideEnd], a
+ ldh a, [hLYOverrideStart]
ld l, a
ld h, HIGH(wLYOverridesBackup)
.loop
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
cp l
jr z, .done
xor a
@@ -1840,9 +1840,9 @@ BattleBGEffect_2a:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
inc a
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
call BattleBGEffects_IncrementJumptable
ret
@@ -1850,7 +1850,7 @@ BattleBGEffect_2a:
call .GetLYOverride
jr nc, .finish
call .SetLYOverridesBackup
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
dec a
ld l, a
ld [hl], e
@@ -1862,9 +1862,9 @@ BattleBGEffect_2a:
.SetLYOverridesBackup:
ld e, a
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
srl a
ld h, HIGH(wLYOverridesBackup)
@@ -1909,7 +1909,7 @@ BattleBGEffect_2b:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
@@ -1937,7 +1937,7 @@ BattleBGEffect_2b:
ret
BattleBGEffect_1c:
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .cgb
call BattleBGEffects_AnonJumptable
@@ -1950,12 +1950,12 @@ BattleBGEffect_1c:
call BattleBGEffects_IncrementJumptable
ld a, $e4
call BattleBGEffects_SetLYOverrides
- ld a, rBGP - $ff00
- ld [hLCDCPointer], a
+ ld a, LOW(rBGP)
+ ldh [hLCDCPointer], a
xor a
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, $60
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ret
.one
@@ -2175,11 +2175,11 @@ BattleBGEffect_VibrateMon:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
+ ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -2220,12 +2220,12 @@ BattleBGEffect_WobbleMon:
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
- ld a, rSCX - $ff00
- ld [hLCDCPointer], a
+ ld a, LOW(rSCX)
+ ldh [hLCDCPointer], a
xor a
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, $37
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -2262,7 +2262,7 @@ BattleBGEffect_2e:
push af
call DelayFrame
pop af
- ld [hSCY], a
+ ldh [hSCY], a
xor $ff
inc a
ld [wAnimObject01YOffset], a
@@ -2273,7 +2273,7 @@ BattleBGEffect_1f:
jr nc, .skip
xor a
.skip
- ld [hSCX], a
+ ldh [hSCX], a
ret
BattleBGEffect_20:
@@ -2281,7 +2281,7 @@ BattleBGEffect_20:
jr nc, .skip
xor a
.skip
- ld [hSCY], a
+ ldh [hSCY], a
ret
Functionc8d0b:
@@ -2330,7 +2330,7 @@ BattleBGEffect_35:
jr nc, .finish
ld d, $6
call BattleBGEffects_Sine
- ld [hSCX], a
+ ldh [hSCX], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2340,7 +2340,7 @@ BattleBGEffect_35:
.finish
xor a
- ld [hSCX], a
+ ldh [hSCX], a
ret
BattleBGEffect_GetNthDMGPal:
@@ -2367,7 +2367,7 @@ BattleBGEffect_GetNthDMGPal:
ret
BGEffect_RapidCyclePals:
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .cgb
push de
@@ -2387,9 +2387,9 @@ BGEffect_RapidCyclePals:
call BattleBGEffects_SetLYOverrides
ld a, $47
call BattleBGEffect_SetLCDStatCustoms1
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
inc a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2427,7 +2427,7 @@ BGEffect_RapidCyclePals:
.two_dmg
call BattleBGEffects_ResetVideoHRAM
ld a, %11100100
- ld [rBGP], a
+ ldh [rBGP], a
call EndBattleBGEffect
ret
@@ -2525,10 +2525,10 @@ BGEffect_RapidCyclePals:
BGEffects_LoadBGPal0_OBPal1:
ld h, a
- ld a, [rSVBK]
+ ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
- ld [rSVBK], a
+ ldh [rSVBK], a
ld a, h
push bc
push af
@@ -2545,17 +2545,17 @@ BGEffects_LoadBGPal0_OBPal1:
call CopyPals
pop bc
pop af
- ld [rSVBK], a
+ ldh [rSVBK], a
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
ret
BGEffects_LoadBGPal1_OBPal0:
ld h, a
- ld a, [rSVBK]
+ ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
- ld [rSVBK], a
+ ldh [rSVBK], a
ld a, h
push bc
push af
@@ -2572,9 +2572,9 @@ BGEffects_LoadBGPal1_OBPal0:
call CopyPals
pop bc
pop af
- ld [rSVBK], a
+ ldh [rSVBK], a
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
ret
BattleBGEffect_GetFirstDMGPal:
@@ -2621,7 +2621,7 @@ BattleBGEffects_SetLYOverrides:
ret
BattleBGEffect_SetLCDStatCustoms1:
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
call BGEffect_CheckBattleTurn
jr nz, .player_turn
lb de, $00, $36
@@ -2631,13 +2631,13 @@ BattleBGEffect_SetLCDStatCustoms1:
lb de, $2f, $5e
.okay
ld a, d
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, e
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ret
BattleBGEffect_SetLCDStatCustoms2:
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
call BGEffect_CheckBattleTurn
jr nz, .player_turn
lb de, $00, $36
@@ -2647,30 +2647,30 @@ BattleBGEffect_SetLCDStatCustoms2:
lb de, $2d, $5e
.okay
ld a, d
- ld [hLYOverrideStart], a
+ ldh [hLYOverrideStart], a
ld a, e
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideEnd], a
ret
BattleAnim_ResetLCDStatCustom:
xor a
- ld [hLYOverrideStart], a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideStart], a
+ ldh [hLYOverrideEnd], a
call BattleBGEffects_ClearLYOverrides
xor a
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
call EndBattleBGEffect
ret
BattleBGEffects_ResetVideoHRAM:
xor a
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
ld a, %11100100
- ld [rBGP], a
+ ldh [rBGP], a
ld [wBGP], a
ld [wOBP1], a
- ld [hLYOverrideStart], a
- ld [hLYOverrideEnd], a
+ ldh [hLYOverrideStart], a
+ ldh [hLYOverrideEnd], a
call BattleBGEffects_ClearLYOverrides
ret
@@ -2686,10 +2686,10 @@ Functionc8f2e:
ld [wBattleAnimTemp3], a
ld bc, wLYOverridesBackup
.loop
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
cp c
jr nc, .next
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
cp c
jr c, .next
ld a, [wBattleAnimTemp2]
@@ -2763,14 +2763,14 @@ Functionc8f9a:
call BattleBGEffects_Sine
ld e, a
pop hl
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
cp c
jr c, .skip1
ld a, e
ld [bc], a
inc bc
.skip1
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
cp l
jr nc, .skip2
ld [hl], e
@@ -2788,7 +2788,7 @@ Functionc8f9a:
ret
.GetLYOverrideBackupAddrOffset:
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld e, a
ld a, [wBattleAnimTemp0]
add e
@@ -2798,13 +2798,13 @@ Functionc8f9a:
BattleBGEffect_WavyScreenFX:
push bc
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
inc a
ld e, a
ld h, HIGH(wLYOverridesBackup)
ld d, h
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
and a
jr z, .done
@@ -2826,9 +2826,9 @@ BattleBGEffect_WavyScreenFX:
BGEffect_FillLYOverridesBackup:
push af
ld h, HIGH(wLYOverridesBackup)
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
ld d, a
pop af
@@ -2842,14 +2842,14 @@ BGEffect_DisplaceLYOverridesBackup:
; e = a; d = [hLYOverrideEnd] - [hLYOverrideStart] - a
push af
ld e, a
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
- ld a, [hLYOverrideEnd]
+ ldh a, [hLYOverrideEnd]
sub l
sub e
ld d, a
ld h, HIGH(wLYOverridesBackup)
- ld a, [hLYOverrideStart]
+ ldh a, [hLYOverrideStart]
ld l, a
ld a, $90
.loop
@@ -2867,7 +2867,7 @@ BGEffect_DisplaceLYOverridesBackup:
BGEffect_CheckBattleTurn:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and $1
xor [hl]
ret
@@ -2875,7 +2875,7 @@ BGEffect_CheckBattleTurn:
BGEffect_CheckFlyDigStatus:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and $1
xor [hl]
jr nz, .player
@@ -2889,7 +2889,7 @@ BGEffect_CheckFlyDigStatus:
ret
BattleBGEffects_CheckSGB:
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
ret