Condense some menu symbols gfx

8 files changed, 40 insertions, 34 deletions

diff --git a/gfx/stage/menu_symbols.png b/gfx/stage/menu_symbols.png
index 823d2f9..f46c05f 100644
--- a/gfx/stage/menu_symbols.png
+++ b/gfx/stage/menu_symbols.png
diff --git a/gfx/unknown/d6400.png b/gfx/unknown/d6400.png
deleted file mode 100644
index a7b1bbe..0000000
--- a/gfx/unknown/d6400.png
+++ /dev/null
diff --git a/gfx/unknown/d6410.png b/gfx/unknown/d6410.png
deleted file mode 100644
index e09c4ea..0000000
--- a/gfx/unknown/d6410.png
+++ /dev/null
diff --git a/gfx/unknown/d6430.png b/gfx/unknown/d6430.png
deleted file mode 100644
index 5ff8267..0000000
--- a/gfx/unknown/d6430.png
+++ /dev/null
diff --git a/gfx/unknown/d6440.png b/gfx/unknown/d6440.png
deleted file mode 100644
index ee265f8..0000000
--- a/gfx/unknown/d6440.png
+++ /dev/null
diff --git a/gfx/unknown/d6480.png b/gfx/unknown/d6480.png
deleted file mode 100644
index 17c173a..0000000
--- a/gfx/unknown/d6480.png
+++ /dev/null
diff --git a/home/text.asm b/home/text.asm
index c7ee25d..e0bc060 100755
--- a/home/text.asm
+++ b/home/text.asm
@@ -216,28 +216,42 @@ Func_31e1: ; 0x31e1
 	ret
 
 Data_320e:
-macro_320e: MACRO
-	dw vTilesSH tile \1
-	dba \2
-	ENDM
-	macro_320e 3, GFX_d6440
-	macro_320e 4, GFX_d6430
-	macro_320e 5, GFX_d61d0
-	macro_320e 3, GFX_d61c0
-	macro_320e 7, GFX_d6480
-	macro_320e 5, GFX_d61a0
-	macro_320e 5, GFX_d6410
-	macro_320e 6, GFX_d61b0
-	macro_320e 3, GFX_d61e0
-	macro_320e 3, GFX_d6440
-	macro_320e 4, GFX_d6430
-	macro_320e 5, GFX_d63d0
-	macro_320e 3, GFX_d63c0
-	macro_320e 7, GFX_d6480
-	macro_320e 5, GFX_d63a0
-	macro_320e 5, GFX_d6410
-	macro_320e 6, GFX_d63b0
-	macro_320e 3, GFX_d63e0
+	dw vTilesSH tile 3
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40
+	dw vTilesSH tile 4
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $30
+	dw vTilesSH tile 5
+	dbw Bank(GFX_d61d0), GFX_d61d0
+	dw vTilesSH tile 3
+	dbw Bank(GFX_d61c0), GFX_d61c0
+	dw vTilesSH tile 7
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $80
+	dw vTilesSH tile 5
+	dbw Bank(GFX_d61a0), GFX_d61a0
+	dw vTilesSH tile 5
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $10
+	dw vTilesSH tile 6
+	dbw Bank(GFX_d61b0), GFX_d61b0
+	dw vTilesSH tile 3
+	dbw Bank(GFX_d61e0), GFX_d61e0
+	dw vTilesSH tile 3
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $40
+	dw vTilesSH tile 4
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $30
+	dw vTilesSH tile 5
+	dbw Bank(GFX_d63d0), GFX_d63d0
+	dw vTilesSH tile 3
+	dbw Bank(GFX_d63c0), GFX_d63c0
+	dw vTilesSH tile 7
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $80
+	dw vTilesSH tile 5
+	dbw Bank(GFX_d63a0), GFX_d63a0
+	dw vTilesSH tile 5
+	dbw Bank(InGameMenuSymbolsGfx), InGameMenuSymbolsGfx + $10
+	dw vTilesSH tile 6
+	dbw Bank(GFX_d63b0), GFX_d63b0
+	dw vTilesSH tile 3
+	dbw Bank(GFX_d63e0), GFX_d63e0
 
 Func_3268: ; 0x3268
 	ld a, [hli]
diff --git a/main.asm b/main.asm
index c1130d6..e6c93f8 100755
--- a/main.asm
+++ b/main.asm
@@ -610,7 +610,7 @@ HandleInGameMenu: ; 0x86d7
 	ld hl, CancelText
 	call Func_8797
 	ld a, Bank(InGameMenuSymbolsGfx)
-	ld hl, InGameMenuSymbolsGfx
+	ld hl, InGameMenuSymbolsGfx + $50
 	ld de, vTilesSH + $60
 	ld bc, $0010
 	call LoadVRAMData
@@ -7476,7 +7476,7 @@ Func_10b59: ; 0x10b59
 	ld hl, wPartyMons
 	call Func_10b8e
 	ld a, BANK(InGameMenuSymbolsGfx)
-	ld hl, InGameMenuSymbolsGfx
+	ld hl, InGameMenuSymbolsGfx + $50
 	ld de, vTilesSH tile $08
 	ld bc, $0030
 	call LoadVRAMData
@@ -49678,18 +49678,10 @@ GFX_d63c0: INCBIN "gfx/stage/e_acute_color.2bpp"
 GFX_d63d0: INCBIN "gfx/unknown/d63d0.2bpp"
 GFX_d63e0: INCBIN "gfx/unknown/d63e0.2bpp"
 
-	dr $d63f0, $d6410
-
-GFX_d6410: INCBIN "gfx/unknown/d6410.2bpp"
-
-	dr $d6420, $d6430
-
-GFX_d6430: INCBIN "gfx/unknown/d6430.2bpp"
-GFX_d6440: INCBIN "gfx/unknown/d6440.2bpp"
+	ds $10 ; free space
 
-InGameMenuSymbolsGfx: ; 0xd6450
+InGameMenuSymbolsGfx: ; 0xd6400
 	INCBIN "gfx/stage/menu_symbols.2bpp"
-GFX_d6480: INCBIN "gfx/unknown/d6480.2bpp"
 
 	ds $170 ; free space