Group miscellaneous graphics from main.asm into their own object file

4 files changed, 84 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index 198de6cc..994d1c88 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ data/pokemon/egg_moves.o \
 data/pokemon/evos_attacks.o \
 engine/movie/credits.o \
 engine/overworld/events.o \
+gfx/misc.o \
 gfx/sprites.o \
 gfx/tilesets.o
 
diff --git a/gfx/misc.asm b/gfx/misc.asm
new file mode 100644
index 00000000..877336a0
--- /dev/null
+++ b/gfx/misc.asm
@@ -0,0 +1,71 @@
+SECTION "Egg Pic", ROMX
+
+EggPic::
+INCBIN "gfx/pokemon/egg/front.2bpp.lz"
+
+
+SECTION "Title Screen", ROMX
+
+IF DEF(_GOLD)
+TitleScreenGFX1::
+INCBIN "gfx/title/logo_bottom_gold.2bpp.lz"
+TitleScreenGFX2::
+INCBIN "gfx/title/logo_top_gold.2bpp.lz"
+
+ELIF DEF(_SILVER)
+TitleScreenGFX1::
+INCBIN "gfx/title/logo_bottom_silver.2bpp.lz"
+TitleScreenGFX2::
+INCBIN "gfx/title/logo_top_silver.2bpp.lz"
+ENDC
+
+TitleScreenTilemap::
+INCBIN "gfx/title/logo.tilemap"
+
+
+SECTION "The End", ROMX
+
+TheEndGFX::
+INCBIN "gfx/credits/theend.2bpp"
+
+
+SECTION "Font Inversed", ROMX
+
+FontInversed::
+INCBIN "gfx/font/font_inversed.1bpp"
+
+
+SECTION "Copyright", ROMX
+
+CopyrightGFX::
+INCBIN "gfx/splash/copyright.2bpp"
+
+
+SECTION "Title Screen 2", ROMX
+
+IF DEF(_GOLD)
+TitleScreenGFX3::
+INCBIN "gfx/title/title_trail_gold.2bpp"
+TitleScreenGFX4::
+INCBIN "gfx/title/hooh_gold.2bpp.lz"
+
+ELIF DEF(_SILVER)
+TitleScreenGFX3::
+INCBIN "gfx/title/title_trail_silver.2bpp"
+TitleScreenGFX4::
+INCBIN "gfx/title/lugia_silver.2bpp.lz"
+ENDC
+
+
+SECTION "Shrink Pics", ROMX
+
+Shrink1Pic::
+INCBIN "gfx/new_game/shrink1.2bpp.lz"
+Shrink2Pic::
+INCBIN "gfx/new_game/shrink2.2bpp.lz"
+
+
+SECTION "Pokégear GFX", ROMX
+
+PokegearGFX::
+INCBIN "gfx/pokegear/pokegear.2bpp.lz"
diff --git a/layout.link b/layout.link
index d444c59e..43a5d3b9 100644
--- a/layout.link
+++ b/layout.link
@@ -75,6 +75,7 @@ ROMX $12
 	"Pics 1"
 ROMX $14
 	"bank14"
+	"Egg Pic"
 ROMX $15
 	"Pics 2"
 ROMX $16
@@ -113,7 +114,7 @@ ROMX $25
 	"Maps"
 	"Events"
 ROMX $26
-	"bank26"
+	"Title Screen"
 ROMX $2a
 	"Map Blocks 1"
 ROMX $2b
@@ -130,6 +131,7 @@ ROMX $31
 	"bank31_2"
 ROMX $32
 	"bank32"
+	"The End"
 ROMX $33
 	"Move Animations"
 	"Extra Songs 2"
@@ -141,6 +143,8 @@ ROMX $37
 ROMX $38
 	"bank38"
 ROMX $39
+	"Copyright"
+	"Title Screen 2"
 	"bank39"
 ROMX $3a
 	"Audio"
@@ -155,6 +159,8 @@ ROMX $3d
 	"Songs 4"
 ROMX $3e
 	"bank3E"
+	"Shrink Pics"
+	"bank3E_2"
 ROMX $3f
 	"bank3F"
 ROMX $40
@@ -249,6 +255,8 @@ ROMX $70
 	"bank70"
 	"Tileset Data 6"
 	"bank70_2"
+	"Pokégear GFX"
+	"Credits Strings"
 ROMX $7f
 	org $7df8
 	"Stadium 2 Checksums"
diff --git a/main.asm b/main.asm
index 2b9dc4f3..c96b66aa 100644
--- a/main.asm
+++ b/main.asm
@@ -214,9 +214,6 @@ INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/unused_pic_banks.asm"
 
-EggPic::
-INCBIN "gfx/pokemon/egg/front.2bpp.lz"
-
 
 SECTION "bank21", ROMX
 
@@ -251,25 +248,6 @@ INCLUDE "engine/events/fish.asm"
 INCLUDE "engine/games/slot_machine.asm"
 
 
-SECTION "bank26", ROMX
-
-IF DEF(_GOLD)
-TitleScreenGFX1:
-INCBIN "gfx/title/logo_bottom_gold.2bpp.lz"
-TitleScreenGFX2:
-INCBIN "gfx/title/logo_top_gold.2bpp.lz"
-
-ELIF DEF(_SILVER)
-TitleScreenGFX1:
-INCBIN "gfx/title/logo_bottom_silver.2bpp.lz"
-TitleScreenGFX2:
-INCBIN "gfx/title/logo_top_silver.2bpp.lz"
-ENDC
-
-TitleScreenTilemap:
-INCBIN "gfx/title/logo.tilemap"
-
-
 SECTION "bank2E_2", ROMX
 
 INCLUDE "engine/events/checkforhiddenitems.asm"
@@ -291,9 +269,6 @@ INCLUDE "engine/battle_anims/bg_effects.asm"
 INCLUDE "data/moves/animations.asm"
 INCLUDE "engine/events/poisonstep_pals.asm"
 
-TheEndGFX::
-INCBIN "gfx/credits/theend.2bpp"
-
 
 SECTION "Move Animations", ROMX
 
@@ -304,12 +279,6 @@ INCLUDE "engine/battle_anims/functions.asm"
 INCLUDE "engine/battle_anims/helpers.asm"
 
 
-SECTION "Font Inversed", ROMX
-
-FontInversed:
-INCBIN "gfx/font/font_inversed.1bpp"
-
-
 SECTION "bank38", ROMX
 
 INCLUDE "engine/events/diploma.asm"
@@ -322,22 +291,6 @@ INCLUDE "engine/pokemon/bills_pc.asm"
 
 SECTION "bank39", ROMX
 
-CopyrightGFX::
-INCBIN "gfx/splash/copyright.2bpp"
-
-IF DEF(_GOLD)
-TitleScreenGFX3:
-INCBIN "gfx/title/title_trail_gold.2bpp"
-TitleScreenGFX4:
-INCBIN "gfx/title/hooh_gold.2bpp.lz"
-
-ELIF DEF(_SILVER)
-TitleScreenGFX3:
-INCBIN "gfx/title/title_trail_silver.2bpp"
-TitleScreenGFX4:
-INCBIN "gfx/title/lugia_silver.2bpp.lz"
-ENDC
-
 INCLUDE "engine/menus/options_menu.asm"
 INCLUDE "engine/movie/splash.asm"
 INCLUDE "engine/movie/intro.asm"
@@ -348,11 +301,8 @@ SECTION "bank3E", ROMX
 INCLUDE "engine/gfx/load_font.asm"
 INCLUDE "data/collision/collision_permissions.asm"
 
-Shrink1Pic:
-INCBIN "gfx/new_game/shrink1.2bpp.lz"
 
-Shrink2Pic:
-INCBIN "gfx/new_game/shrink2.2bpp.lz"
+SECTION "bank3E_2", ROMX
 
 INCLUDE "engine/link/time_capsule.asm"
 INCLUDE "engine/events/name_rater.asm"
@@ -429,8 +379,8 @@ INCLUDE "engine/pokedex/pokedex_3.asm"
 INCLUDE "engine/events/catch_tutorial_input.asm"
 INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm"
 
-PokegearGFX:
-INCBIN "gfx/pokegear/pokegear.2bpp.lz"
+
+SECTION "Credits Strings", ROMX
 
 INCLUDE "data/credits_strings.asm"