hLabel - $ff00 -> LOW(hLabel)

This commit is contained in:
Rangi 2018-08-25 14:34:25 -04:00
parent eb1e3636bb
commit 1c0fff7668
10 changed files with 29 additions and 29 deletions

View File

@ -315,7 +315,7 @@ StartTrainerBattle_SetUpForWavyOutro:
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
xor a xor a
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a

View File

@ -4,7 +4,7 @@ BattleIntroSlidingPics:
ld a, BANK(wLYOverrides) ld a, BANK(wLYOverrides)
ldh [rSVBK], a ldh [rSVBK], a
call .subfunction1 call .subfunction1
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
call .subfunction2 call .subfunction2
xor a xor a

View File

@ -978,7 +978,7 @@ BattleBGEffect_Whirlpool:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
xor a xor a
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a
@ -998,7 +998,7 @@ BattleBGEffect_Whirlpool:
BattleBGEffect_30: BattleBGEffect_30:
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
call EndBattleBGEffect call EndBattleBGEffect
ret ret
@ -1051,7 +1051,7 @@ BattleBGEffect_Psychic:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
xor a xor a
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a
@ -1088,7 +1088,7 @@ BattleBGEffect_Teleport:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
lb de, 6, 5 lb de, 6, 5
call Functionc8f2e call Functionc8f2e
@ -1112,7 +1112,7 @@ BattleBGEffect_NightShade:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
@ -1142,7 +1142,7 @@ BattleBGEffect_DoubleTeam:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1233,7 +1233,7 @@ BattleBGEffect_AcidArmor:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
@ -1295,7 +1295,7 @@ BattleBGEffect_Withdraw:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1344,7 +1344,7 @@ BattleBGEffect_Dig:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1410,7 +1410,7 @@ BattleBGEffect_Tackle:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1444,7 +1444,7 @@ BattleBGEffect_25:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms2 call BattleBGEffect_SetLCDStatCustoms2
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1575,7 +1575,7 @@ BattleBGEffect_2d:
BGEffect2d_2f_zero: BGEffect2d_2f_zero:
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1618,7 +1618,7 @@ BattleBGEffect_26:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1656,7 +1656,7 @@ BattleBGEffect_2c:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1710,7 +1710,7 @@ BattleBGEffect_28:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ret ret
@ -1752,7 +1752,7 @@ BattleBGEffect_BounceDown:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00 ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms2 call BattleBGEffect_SetLCDStatCustoms2
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -1909,7 +1909,7 @@ BattleBGEffect_2b:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc add hl, bc
@ -1950,7 +1950,7 @@ BattleBGEffect_1c:
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld a, $e4 ld a, $e4
call BattleBGEffects_SetLYOverrides call BattleBGEffects_SetLYOverrides
ld a, rBGP - $ff00 ld a, LOW(rBGP)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
xor a xor a
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a
@ -2175,7 +2175,7 @@ BattleBGEffect_VibrateMon:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1 call BattleBGEffect_SetLCDStatCustoms1
ldh a, [hLYOverrideEnd] ldh a, [hLYOverrideEnd]
inc a inc a
@ -2220,7 +2220,7 @@ BattleBGEffect_WobbleMon:
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
xor a xor a
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a

View File

@ -1137,7 +1137,7 @@ BattleAnimFunction_0D:
dw .four dw .four
.zero .zero
call BattleAnim_IncAnonJumptableIndex call BattleAnim_IncAnonJumptableIndex
ld a, rSCY - $ff00 ld a, LOW(rSCY)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
ld a, $58 ld a, $58
ldh [hLYOverrideStart], a ldh [hLYOverrideStart], a

View File

@ -242,7 +242,7 @@ MagnetTrain_InitLYOverrides:
ld bc, wLYOverridesBackupEnd - wLYOverridesBackup ld bc, wLYOverridesBackupEnd - wLYOverridesBackup
ld a, [wMagnetTrainInitPosition] ld a, [wMagnetTrainInitPosition]
call ByteFill call ByteFill
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
ret ret

View File

@ -1,5 +1,5 @@
WriteOAMDMACodeToHRAM:: WriteOAMDMACodeToHRAM::
ld c, hTransferVirtualOAM - $ff00 ld c, LOW(hTransferVirtualOAM)
ld b, .PushOAMEnd - .PushOAM ld b, .PushOAMEnd - .PushOAM
ld hl, .PushOAM ld hl, .PushOAM
.loop .loop

View File

@ -68,7 +68,7 @@ Credits::
xor a xor a
call ByteFill call ByteFill
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
call GetCreditsPalette call GetCreditsPalette

View File

@ -1994,7 +1994,7 @@ Intro_ResetLYOverrides:
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
ret ret

View File

@ -177,7 +177,7 @@ _TitleScreen:
call ByteFill call ByteFill
; Let LCD Stat know we're messing around with SCX ; Let LCD Stat know we're messing around with SCX
ld a, rSCX - $ff00 ld a, LOW(rSCX)
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
pop af pop af

View File

@ -2,7 +2,7 @@
Unreferenced_Function547:: Unreferenced_Function547::
ldh a, [hLCDCPointer] ldh a, [hLCDCPointer]
cp rSCX - $ff00 cp LOW(rSCX)
ret nz ret nz
ld c, a ld c, a
ld a, [wLYOverrides] ld a, [wLYOverrides]