summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-01-20 20:16:20 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2022-01-20 20:16:20 -0500
commita5d862057a07ba81b363b9099165846f4b88389a (patch)
tree620f5fa95127bffffaddbe2f263acbce8bf81abe
parent6149917db042a7498416c428ff804237ec9b30ca (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 19726e9a..a968bf02 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 ee00cf1d..12d11a81 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -156,7 +156,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
@@ -164,7 +164,7 @@ RunTradeAnimScript:
.NotCGB:
hlbgcoord 0, 0
- ld bc, sScratch - vBGMap0
+ ld bc, VRAM_End - vBGMap0
ld a, " "
call ByteFill
ld hl, TradeGameBoyLZ
@@ -452,7 +452,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