Standardise title screen gfx labels

8 files changed, 18 insertions, 18 deletions

diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 8a3260c..8460836 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -1455,16 +1455,16 @@ Tilesets: ; 8100f (20:500f)
 	tileset ScytherIntro2Gfx,               96 ; TILESET_SCYTHER_INTRO_2
 	tileset AerodactylIntro1Gfx,            96 ; TILESET_AERODACTYL_INTRO_1
 	tileset AerodactylIntro2Gfx,            96 ; TILESET_AERODACTYL_INTRO_2
-	tileset Titlescreen1Gfx,                97 ; TILESET_JAPANESE_TITLE_SCREEN
-	tileset Titlescreen2Gfx,                97 ; TILESET_JAPANESE_TITLE_SCREEN_CGB
+	tileset JapaneseTitleScreenGfx,         97 ; TILESET_JAPANESE_TITLE_SCREEN
+	tileset JapaneseTitleScreenCGBGfx,      97 ; TILESET_JAPANESE_TITLE_SCREEN_CGB
 	tileset SolidTiles1,                     4 ; TILESET_SOLID_TILES_1
-	tileset Titlescreen3Gfx,               244 ; TILESET_JAPANESE_TITLE_SCREEN_2
-	tileset Titlescreen4Gfx,                59 ; TILESET_JAPANESE_TITLE_SCREEN_2_CGB
+	tileset JapaneseTitleScreen2Gfx,       244 ; TILESET_JAPANESE_TITLE_SCREEN_2
+	tileset JapaneseTitleScreen2CGBGfx,     59 ; TILESET_JAPANESE_TITLE_SCREEN_2_CGB
 	tileset SolidTiles2,                     4 ; TILESET_SOLID_TILES_2
 	tileset PlayerGfx,                      36 ; TILESET_PLAYER
 	tileset RonaldGfx,                      36 ; TILESET_RONALD
-	tileset Titlescreen5Gfx,               220 ; TILESET_TITLE_SCREEN
-	tileset Titlescreen6Gfx,               212 ; TILESET_TITLE_SCREEN_CGB
+	tileset TitleScreenGfx,                220 ; TILESET_TITLE_SCREEN
+	tileset TitleScreenCGBGfx,             212 ; TILESET_TITLE_SCREEN_CGB
 	tileset CopyrightGfx,                   36 ; TILESET_COPYRIGHT
 	tileset NintendoGfx,                    24 ; TILESET_NINTENDO
 	tileset CompaniesGfx,                   49 ; TILESET_COMPANIES
diff --git a/src/gfx.asm b/src/gfx.asm
index c7fd771..e9016be 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -787,13 +787,13 @@ AerodactylIntro2Gfx:: ; 9696e (25:696e)
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro2.2bpp"
 
-Titlescreen1Gfx:: ; 96f70 (25:6f70)
+JapaneseTitleScreenGfx:: ; 96f70 (25:6f70)
 	dw 97
-	INCBIN "gfx/titlescreen/titlescreen1.2bpp"
+	INCBIN "gfx/titlescreen/japanese_title_screen.2bpp"
 
-Titlescreen2Gfx:: ; 97582 (25:7582)
+JapaneseTitleScreenCGBGfx:: ; 97582 (25:7582)
 	dw 97
-	INCBIN "gfx/titlescreen/titlescreen2.2bpp"
+	INCBIN "gfx/titlescreen/japanese_title_screen_cgb.2bpp"
 
 CompaniesGfx:: ; 97b94 (25:7b94)
 	dw 49
@@ -811,21 +811,21 @@ AnimData5:: ; 97fe8 (25:7fe8)
 
 SECTION "Gfx 8", ROMX
 
-Titlescreen3Gfx:: ; 98000 (26:4000)
+JapaneseTitleScreen2Gfx:: ; 98000 (26:4000)
 	dw 244
-	INCBIN "gfx/titlescreen/titlescreen3.2bpp"
+	INCBIN "gfx/titlescreen/japanese_title_screen_2.2bpp"
 
-Titlescreen4Gfx:: ; 98f42 (26:4f42)
+JapaneseTitleScreen2CGBGfx:: ; 98f42 (26:4f42)
 	dw 315
-	INCBIN "gfx/titlescreen/titlescreen4.2bpp"
+	INCBIN "gfx/titlescreen/japanese_title_screen_2_cgb.2bpp"
 
-Titlescreen5Gfx:: ; 9a2f4 (26:62f4)
+TitleScreenGfx:: ; 9a2f4 (26:62f4)
 	dw 220
-	INCBIN "gfx/titlescreen/titlescreen5.2bpp"
+	INCBIN "gfx/titlescreen/title_screen.2bpp"
 
-Titlescreen6Gfx:: ; 9b0b6 (26:70b6)
+TitleScreenCGBGfx:: ; 9b0b6 (26:70b6)
 	dw 212
-	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
+	INCBIN "gfx/titlescreen/title_screen_cgb.2bpp"
 
 OWDrMasonGfx:: ; 9bdf8 (26:7df8)
 	dw $14
diff --git a/src/gfx/titlescreen/titlescreen1.png b/src/gfx/titlescreen/japanese_title_screen.png
index 82b39e5..82b39e5 100644
--- a/src/gfx/titlescreen/titlescreen1.png
+++ b/src/gfx/titlescreen/japanese_title_screen.png
diff --git a/src/gfx/titlescreen/titlescreen3.png b/src/gfx/titlescreen/japanese_title_screen_2.png
index adddee4..adddee4 100644
--- a/src/gfx/titlescreen/titlescreen3.png
+++ b/src/gfx/titlescreen/japanese_title_screen_2.png
diff --git a/src/gfx/titlescreen/titlescreen4.png b/src/gfx/titlescreen/japanese_title_screen_2_cgb.png
index 1d3cb92..1d3cb92 100644
--- a/src/gfx/titlescreen/titlescreen4.png
+++ b/src/gfx/titlescreen/japanese_title_screen_2_cgb.png
diff --git a/src/gfx/titlescreen/titlescreen2.png b/src/gfx/titlescreen/japanese_title_screen_cgb.png
index f54b7c3..f54b7c3 100644
--- a/src/gfx/titlescreen/titlescreen2.png
+++ b/src/gfx/titlescreen/japanese_title_screen_cgb.png
diff --git a/src/gfx/titlescreen/titlescreen5.png b/src/gfx/titlescreen/title_screen.png
index 3cb6ab3..3cb6ab3 100644
--- a/src/gfx/titlescreen/titlescreen5.png
+++ b/src/gfx/titlescreen/title_screen.png
diff --git a/src/gfx/titlescreen/titlescreen6.png b/src/gfx/titlescreen/title_screen_cgb.png
index 4f0dbe8..4f0dbe8 100644
--- a/src/gfx/titlescreen/titlescreen6.png
+++ b/src/gfx/titlescreen/title_screen_cgb.png