summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-01-20 20:16:22 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2022-01-20 20:16:22 -0500
commit20dc31115e0234eb3819ce5b0d5dcfa7c009f8ea (patch)
tree37d90669d4af8f9aebd94aa1d6775e61ab1764cb
parent597701f168e69a316f18951e3002c322e23cf3ea (diff)
Use `VRAM_End` in place of `sScratch`
-rw-r--r--engine/debug/color_picker.asm12
-rw-r--r--engine/movie/trade_animation.asm6
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm
index 75f5a22ae..6afe827f8 100644
--- a/engine/debug/color_picker.asm
+++ b/engine/debug/color_picker.asm
@@ -127,17 +127,17 @@ endr
ret
DebugColor_InitVRAM:
- ld a, BANK(vTiles3)
+ ld a, $1
ldh [rVBK], a
- ld hl, vTiles3
- ld bc, sScratch - vTiles3
+ ld hl, VRAM_Begin
+ ld bc, VRAM_End - VRAM_Begin
xor a
call ByteFill
- ld a, BANK(vTiles0)
+ ld a, $0
ldh [rVBK], a
- ld hl, vTiles0
- ld bc, sScratch - vTiles0
+ ld hl, VRAM_Begin
+ ld bc, VRAM_End - VRAM_Begin
xor a
call ByteFill
diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm
index 2a48dbd40..d68096668 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -168,7 +168,7 @@ RunTradeAnimScript:
ld a, $1
ldh [rVBK], a
ld hl, vTiles0
- ld bc, sScratch - vTiles0
+ ld bc, VRAM_End - VRAM_Begin
xor a
call ByteFill
ld a, $0
@@ -176,7 +176,7 @@ RunTradeAnimScript:
.NotCGB:
hlbgcoord 0, 0
- ld bc, sScratch - vBGMap0
+ ld bc, VRAM_End - vBGMap0
ld a, " "
call ByteFill
ld hl, TradeGameBoyLZ
@@ -470,7 +470,7 @@ TradeAnim_TubeToPlayer8:
call DisableLCD
callfar ClearSpriteAnims
hlbgcoord 0, 0
- ld bc, sScratch - vBGMap0
+ ld bc, VRAM_End - vBGMap0
ld a, " "
call ByteFill
xor a