From bb7984e70b880e292d7963a55ab25ff1f752584e Mon Sep 17 00:00:00 2001
From: Rangi <sylvie.oukaour+rangi42@gmail.com>
Date: Sun, 19 Oct 2025 14:27:32 -0400
Subject: [PATCH] Separate surfing Pikachu graphics from audio engine code

Fixes #137
---
 Makefile                | 1 +
 audio.asm               | 1 -
 gfx/surfing_pikachu.asm | 2 ++
 layout.link             | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 40eaf406..b7557279 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ rom_obj := \
 	gfx/pics.o \
 	gfx/pikachu.o \
 	gfx/sprites.o \
+	gfx/surfing_pikachu.o \
 	gfx/tilesets.o
 
 pokeyellow_obj       := $(rom_obj)
diff --git a/audio.asm b/audio.asm
index f3e999fc..dbeecbee 100644
--- a/audio.asm
+++ b/audio.asm
@@ -453,7 +453,6 @@ INCLUDE "audio/engine_3.asm"
 
 SECTION "Audio Engine 4", ROMX
 
-INCLUDE "gfx/surfing_pikachu.asm"
 INCLUDE "audio/engine_4.asm"
 
 
diff --git a/gfx/surfing_pikachu.asm b/gfx/surfing_pikachu.asm
index 51884db2..65323391 100644
--- a/gfx/surfing_pikachu.asm
+++ b/gfx/surfing_pikachu.asm
@@ -1,3 +1,5 @@
+SECTION "Surfing Pikachu Graphics", ROMX
+
 SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1a.2bpp"
 SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1b.2bpp"
 SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1c.2bpp"
diff --git a/layout.link b/layout.link
index e9d737fa..cbef589b 100644
--- a/layout.link
+++ b/layout.link
@@ -151,6 +151,7 @@ ROMX $20
 	"Sound Effect Headers 4"
 	"Music Headers 4"
 	"Sound Effects 4"
+	"Surfing Pikachu Graphics"
 	"Audio Engine 4"
 	"Music 4"
 ROMX $21