You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-12-11 05:02:16 -08:00
Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
@@ -425,14 +425,14 @@ BattleAnimFunction_PokeBallBlocked:
|
||||
|
||||
GetBallAnimPal:
|
||||
ld hl, BallColors
|
||||
ld a, [rSVBK]
|
||||
ldh a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(wCurItem)
|
||||
ld [rSVBK], a
|
||||
ldh [rSVBK], a
|
||||
ld a, [wCurItem]
|
||||
ld e, a
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
ldh [rSVBK], a
|
||||
.IsInArray:
|
||||
ld a, [hli]
|
||||
cp -1
|
||||
@@ -1138,11 +1138,11 @@ BattleAnimFunction_0D:
|
||||
.zero
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, rSCY - $ff00
|
||||
ld [hLCDCPointer], a
|
||||
ldh [hLCDCPointer], a
|
||||
ld a, $58
|
||||
ld [hLYOverrideStart], a
|
||||
ldh [hLYOverrideStart], a
|
||||
ld a, $5e
|
||||
ld [hLYOverrideEnd], a
|
||||
ldh [hLYOverrideEnd], a
|
||||
ret
|
||||
|
||||
.one
|
||||
@@ -1156,7 +1156,7 @@ BattleAnimFunction_0D:
|
||||
jr nc, .asm_cd69b
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
xor a
|
||||
ld [hLYOverrideStart], a
|
||||
ldh [hLYOverrideStart], a
|
||||
ret
|
||||
|
||||
.asm_cd69b
|
||||
@@ -1175,7 +1175,7 @@ BattleAnimFunction_0D:
|
||||
add [hl]
|
||||
sub $10
|
||||
ret c
|
||||
ld [hLYOverrideStart], a
|
||||
ldh [hLYOverrideStart], a
|
||||
ld hl, BATTLEANIMSTRUCT_XOFFSET
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -1196,9 +1196,9 @@ BattleAnimFunction_0D:
|
||||
cp $70
|
||||
jr c, asm_cd6da
|
||||
xor a
|
||||
ld [hLCDCPointer], a
|
||||
ld [hLYOverrideStart], a
|
||||
ld [hLYOverrideEnd], a
|
||||
ldh [hLCDCPointer], a
|
||||
ldh [hLYOverrideStart], a
|
||||
ldh [hLYOverrideEnd], a
|
||||
.four
|
||||
call DeinitBattleAnimation
|
||||
ret
|
||||
@@ -1209,7 +1209,7 @@ asm_cd6da:
|
||||
ld [hl], a
|
||||
sub $10
|
||||
ret c
|
||||
ld [hLYOverrideStart], a
|
||||
ldh [hLYOverrideStart], a
|
||||
ret
|
||||
|
||||
BattleAnimFunction_0E:
|
||||
@@ -2252,7 +2252,7 @@ BattleAnimFunction_21:
|
||||
dw Functioncdced
|
||||
|
||||
Functioncdcca:
|
||||
ld a, [hBattleTurn]
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_cdcd9
|
||||
ld hl, BATTLEANIMSTRUCT_0B
|
||||
@@ -3227,7 +3227,7 @@ BattleAnimFunction_32:
|
||||
|
||||
Functionce260:
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, [hBattleTurn]
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
jr nz, .asm_ce26c
|
||||
ld a, $f0
|
||||
@@ -3280,7 +3280,7 @@ Functionce29f:
|
||||
srl a
|
||||
ld e, a
|
||||
ld d, $0
|
||||
ld a, [hSGB]
|
||||
ldh a, [hSGB]
|
||||
and a
|
||||
jr nz, .asm_ce2b6
|
||||
ld hl, Unknown_ce2c4
|
||||
|
||||
Reference in New Issue
Block a user