Clean up Yellow's WRAM

Ohgrimm · May 31, 2021 · 1caab64 · 1caab64
1 parent d892958
commit 1caab64
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 140 deletions.
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm
@@ -487,8 +487,8 @@ Func_f8324:
 	xor a
 	ldh [hLCDCPointer], a
 	ld [wSurfingMinigameSCX], a
-	ld [wSurfingMinigameSCX + 1], a
-	ld [wSurfingMinigameSCX + 2], a
+	ld [wSurfingMinigameSCX2], a
+	ld [wSurfingMinigameSCXHi], a
 	ret
 
 Func_f835c:
@@ -1879,13 +1879,13 @@ SurfingMinigame_ScrollAndGenerateBGMap:
 	ld a, h
 	ldh [hSCX], a
 SurfingMinigame_GenerateBGMap:
-	ld hl, wSurfingMinigameSCX + 1
+	ld hl, wSurfingMinigameSCX2
 	ldh a, [hSCX]
 	cp [hl]
 	ret z
 	ld [hl], a
 	and $f0
-	ld hl, wSurfingMinigameSCX + 2
+	ld hl, wSurfingMinigameSCXHi
 	cp [hl]
 	ret z
 	ld [hl], a

diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm
@@ -57,7 +57,7 @@ PlayPikachuSoundClip::
 	call PlayPikachuPCM
 	xor a
 	ld [wc0f3], a
-	ld [wc0f4], a
+	ld [wc0f3 + 1], a
 	ld a, $80
 	ldh [rNR52], a
 	xor a

diff --git a/home/init.asm b/home/init.asm
@@ -71,7 +71,7 @@ rLCDC_DEFAULT EQU %11100011
 	ldh [hSCY], a
 	ldh [rIF], a
 	ld [wc0f3], a
-	ld [wc0f4], a
+	ld [wc0f3 + 1], a
 	ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL
 	ldh [rIE], a
 

diff --git a/layout.link b/layout.link
@@ -240,6 +240,7 @@ WRAMX $1
 	"Party Data"
 	"Main Data"
 	"Current Box Data"
+	"GBC Palette Data"
 	org $df15
 	"Stack"
 VRAM $0