Extracted corrupted gfx

6 files changed, 18 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 505bd83..e1bfd9e 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,9 @@ $(BUILD)/%.o: %.asm | $$(dir $$@)
 $(BUILD)/gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/sgb/sgb_border_gold.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/sgb/sgb_border_silver.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/sgb/corrupted_9e1c.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/sgb/corrupted_a66c.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/sgb/sgb_border_silver.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/pokegear/town_map.2bpp: tools/gfx += --trim-trailing
 $(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace
diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm
index e1d463f..76b3835 100755
--- a/engine/dumps/bank02.asm
+++ b/engine/dumps/bank02.asm
@@ -2778,22 +2778,23 @@ Function96eb: ; 02:56eb
 	ret
 
 Function9704: ; 02:5704
-	call .sub_9710
+	call Function9710
 	push de
 	call Function980a
 	pop hl
 	call Function97be
 	ret
-.sub_9710
+
+Function9710: ; 02:5710
 	ld a, [wce5f]
 	bit 3, a
 	jr nz, .sub_971e
 	ld hl, UnusedSGBBorderGFX
-	ld de, $5e1c
+	ld de, Corrupted9e1cGFX
 	ret
 .sub_971e
 	ld hl, SGBBorderGFX
-	ld de, $666c
+	ld de, Corrupteda66cGFX
 	ret
 
 Function9725: ; 02:5725
diff --git a/gfx.asm b/gfx.asm
index 4c2c306..f064506 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -26,15 +26,20 @@ SECTION "gfx.asm@Title Screen BG Decoration Border", ROMX
 TitleBGDecorationBorder::
 INCBIN "gfx/title/titlebgdecoration.2bpp"
 
-SECTION "gfx.asm@Super Palettes", ROMX
+SECTION "gfx.asm@SGB GFX", ROMX
+
 INCLUDE "data/pokemon/palettes.inc"
 INCLUDE "data/super_palettes.inc"
 
-SECTION "gfx.asm@Unused SGB Border GFX", ROMX
+Corrupted9e1cGFX:
+INCBIN "gfx/sgb/corrupted_9e1c.2bpp"
+
 UnusedSGBBorderGFX::
 INCBIN "gfx/sgb/sgb_border_alt.2bpp"
 
-SECTION "gfx.asm@SGB Border GFX", ROMX
+Corrupteda66cGFX:
+INCBIN "gfx/sgb/corrupted_a66c.2bpp"
+
 SGBBorderGFX::
 if def(GOLD)
 INCBIN "gfx/sgb/sgb_border_gold.2bpp"
diff --git a/gfx/sgb/corrupted_9e1c.png b/gfx/sgb/corrupted_9e1c.png
new file mode 100755
index 0000000..f124031
--- /dev/null
+++ b/gfx/sgb/corrupted_9e1c.png
diff --git a/gfx/sgb/corrupted_a66c.png b/gfx/sgb/corrupted_a66c.png
new file mode 100755
index 0000000..a8bab25
--- /dev/null
+++ b/gfx/sgb/corrupted_a66c.png
diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link
index bc33c4a..0930781 100644
--- a/pokegold-spaceworld.link
+++ b/pokegold-spaceworld.link
@@ -138,13 +138,8 @@ ROMX $02
 	"engine/dumps/bank02.asm@Text91c2"
 	"gfx.asm@Title Screen BG Decoration Border"
 	"engine/dumps/bank02.asm@Function928b"
-	"gfx.asm@Super Palettes"
-	; $5e1c
-	org $62cc
-	"gfx.asm@Unused SGB Border GFX"
-	; $666c
-	org $6b1c
-	"gfx.asm@SGB Border GFX"
+	"gfx.asm@SGB GFX"
+	; 6ebc
 ROMX $03
 	org $4000
 	"engine/overworld/player_movement.asm@Player Movement"