diff options
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/sliding_intro.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 40 | ||||
| -rw-r--r-- | engine/battle_anims/functions.asm | 2 | ||||
| -rw-r--r-- | engine/events/magnet_train.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/load_push_oam.asm | 2 | ||||
| -rw-r--r-- | engine/movie/credits.asm | 2 | ||||
| -rw-r--r-- | engine/movie/crystal_intro.asm | 2 | ||||
| -rw-r--r-- | engine/movie/title.asm | 2 | ||||
| -rw-r--r-- | home/lcd.asm | 2 |
10 files changed, 29 insertions, 29 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index af120fdd3..e4c99be6c 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -315,7 +315,7 @@ StartTrainerBattle_SetUpForWavyOutro: call StartTrainerBattle_NextScene - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index e002247a4..bda859cb4 100644 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -4,7 +4,7 @@ BattleIntroSlidingPics: ld a, BANK(wLYOverrides) ldh [rSVBK], a call .subfunction1 - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a call .subfunction2 xor a diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index c3c9ea6a5..04234a020 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -978,7 +978,7 @@ BattleBGEffect_Whirlpool: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCY - $ff00 + ld a, LOW(rSCY) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a @@ -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,7 +1051,7 @@ BattleBGEffect_Psychic: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a @@ -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,7 +1142,7 @@ BattleBGEffect_DoubleTeam: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -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 @@ -1295,7 +1295,7 @@ BattleBGEffect_Withdraw: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCY - $ff00 + ld a, LOW(rSCY) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -1344,7 +1344,7 @@ BattleBGEffect_Dig: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCY - $ff00 + ld a, LOW(rSCY) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -1410,7 +1410,7 @@ BattleBGEffect_Tackle: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -1444,7 +1444,7 @@ BattleBGEffect_25: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms2 ldh a, [hLYOverrideEnd] inc a @@ -1575,7 +1575,7 @@ BattleBGEffect_2d: BGEffect2d_2f_zero: call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -1618,7 +1618,7 @@ BattleBGEffect_26: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -1656,7 +1656,7 @@ BattleBGEffect_2c: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -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,7 +1752,7 @@ BattleBGEffect_BounceDown: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCY - $ff00 + ld a, LOW(rSCY) call BattleBGEffect_SetLCDStatCustoms2 ldh a, [hLYOverrideEnd] inc a @@ -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 @@ -1950,7 +1950,7 @@ BattleBGEffect_1c: call BattleBGEffects_IncrementJumptable ld a, $e4 call BattleBGEffects_SetLYOverrides - ld a, rBGP - $ff00 + ld a, LOW(rBGP) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a @@ -2175,7 +2175,7 @@ BattleBGEffect_VibrateMon: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) call BattleBGEffect_SetLCDStatCustoms1 ldh a, [hLYOverrideEnd] inc a @@ -2220,7 +2220,7 @@ BattleBGEffect_WobbleMon: .zero call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a xor a ldh [hLYOverrideStart], a diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 93d960189..e6e21382d 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -1137,7 +1137,7 @@ BattleAnimFunction_0D: dw .four .zero call BattleAnim_IncAnonJumptableIndex - ld a, rSCY - $ff00 + ld a, LOW(rSCY) ldh [hLCDCPointer], a ld a, $58 ldh [hLYOverrideStart], a diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 1146b73b6..1a037ef41 100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -242,7 +242,7 @@ MagnetTrain_InitLYOverrides: ld bc, wLYOverridesBackupEnd - wLYOverridesBackup ld a, [wMagnetTrainInitPosition] call ByteFill - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a ret diff --git a/engine/gfx/load_push_oam.asm b/engine/gfx/load_push_oam.asm index 0605e5803..8fa69d0de 100644 --- a/engine/gfx/load_push_oam.asm +++ b/engine/gfx/load_push_oam.asm @@ -1,5 +1,5 @@ WriteOAMDMACodeToHRAM:: - ld c, hTransferVirtualOAM - $ff00 + ld c, LOW(hTransferVirtualOAM) ld b, .PushOAMEnd - .PushOAM ld hl, .PushOAM .loop diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 4ea997b9f..462c30523 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -68,7 +68,7 @@ Credits:: xor a call ByteFill - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a call GetCreditsPalette diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index bb9cd6936..8bbfb9be8 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -1994,7 +1994,7 @@ Intro_ResetLYOverrides: pop af ldh [rSVBK], a - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a ret diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 0f5519210..26b30c3ee 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -177,7 +177,7 @@ _TitleScreen: call ByteFill ; Let LCD Stat know we're messing around with SCX - ld a, rSCX - $ff00 + ld a, LOW(rSCX) ldh [hLCDCPointer], a pop af diff --git a/home/lcd.asm b/home/lcd.asm index 7b78e5688..68edf9b0f 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -2,7 +2,7 @@ Unreferenced_Function547:: ldh a, [hLCDCPointer] - cp rSCX - $ff00 + cp LOW(rSCX) ret nz ld c, a ld a, [wLYOverrides] |