Extract common exterior tileset graphics

5 files changed, 9 insertions, 4 deletions

diff --git a/gfx.asm b/gfx.asm
index 4266270..bdd8201 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -156,6 +156,10 @@ SECTION "gfx.asm@Bank C Tilesets 0c", ROMX
 Tileset_0c_GFX:
 INCBIN "gfx/tilesets/tileset_0c.2bpp"
 
+SECTION "gfx.asm@Bank C Tilesets Common", ROMX
+CommonExteriorTilesGFX:
+INCBIN "gfx/tilesets/tileset_common.2bpp"
+
 SECTION "gfx.asm@PokeBalls GFX", ROMX
 
 PokeBallsGFX::                   INCBIN "gfx/misc/poke_balls.2bpp" ; 0x038494--0x0384d4
diff --git a/gfx/tilesets/tileset_common.png b/gfx/tilesets/tileset_common.png
new file mode 100644
index 0000000..452f1f6
--- /dev/null
+++ b/gfx/tilesets/tileset_common.png
diff --git a/home/tileset.asm b/home/tileset.asm
index 4bf6a98..d96018f 100644
--- a/home/tileset.asm
+++ b/home/tileset.asm
@@ -27,9 +27,9 @@ LoadTilesetGFX:: ; 2d26
 	ret
 
 .exterior
-	ld de, CommonExteriorTiles ; TODO: maybe find a better name
+	ld de, CommonExteriorTilesGFX ; TODO: maybe find a better name
 	ld hl, vTileset
-	lb bc, BANK(CommonExteriorTiles), $20
+	lb bc, BANK(CommonExteriorTilesGFX), $20
 	call Get2bpp
 
 	ld a, [wTilesetTilesAddress]
diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link
index 8a8514b..919bb40 100644
--- a/pokegold-spaceworld.link
+++ b/pokegold-spaceworld.link
@@ -260,6 +260,9 @@ ROMX $0c
 	org $7100
 	"gfx.asm@Bank C Tilesets 0c"
 	; $7700
+	org $7c00
+	"gfx.asm@Bank C Tilesets Common"
+	; $7e00
 ROMX $0d
 	org $4000
 	; $4000
diff --git a/shim.sym b/shim.sym
index bde0b65..3b2e0da 100755
--- a/shim.sym
+++ b/shim.sym
@@ -93,8 +93,6 @@
 
 0B:5663 Function2d663
 
-0C:7C00 CommonExteriorTiles
-
 0E:4B78 LoadTrainerClassName
 0E:4BA0 LoadTrainerClassName.got_name
 0E:4BA9 LoadTrainerClass