From 4f69ff28ca7c3ef6b8890d66edd625de9b062f51 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 18 Feb 2021 21:24:02 +0000 Subject: Standardise title screen gfx labels --- src/engine/bank20.asm | 12 +++++------ src/gfx.asm | 24 ++++++++++----------- src/gfx/titlescreen/japanese_title_screen.png | Bin 0 -> 909 bytes src/gfx/titlescreen/japanese_title_screen_2.png | Bin 0 -> 2572 bytes .../titlescreen/japanese_title_screen_2_cgb.png | Bin 0 -> 3602 bytes src/gfx/titlescreen/japanese_title_screen_cgb.png | Bin 0 -> 950 bytes src/gfx/titlescreen/title_screen.png | Bin 0 -> 2007 bytes src/gfx/titlescreen/title_screen_cgb.png | Bin 0 -> 2005 bytes src/gfx/titlescreen/titlescreen1.png | Bin 909 -> 0 bytes src/gfx/titlescreen/titlescreen2.png | Bin 950 -> 0 bytes src/gfx/titlescreen/titlescreen3.png | Bin 2572 -> 0 bytes src/gfx/titlescreen/titlescreen4.png | Bin 3602 -> 0 bytes src/gfx/titlescreen/titlescreen5.png | Bin 2007 -> 0 bytes src/gfx/titlescreen/titlescreen6.png | Bin 2005 -> 0 bytes 14 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/gfx/titlescreen/japanese_title_screen.png create mode 100644 src/gfx/titlescreen/japanese_title_screen_2.png create mode 100644 src/gfx/titlescreen/japanese_title_screen_2_cgb.png create mode 100644 src/gfx/titlescreen/japanese_title_screen_cgb.png create mode 100644 src/gfx/titlescreen/title_screen.png create mode 100644 src/gfx/titlescreen/title_screen_cgb.png delete mode 100644 src/gfx/titlescreen/titlescreen1.png delete mode 100644 src/gfx/titlescreen/titlescreen2.png delete mode 100644 src/gfx/titlescreen/titlescreen3.png delete mode 100644 src/gfx/titlescreen/titlescreen4.png delete mode 100644 src/gfx/titlescreen/titlescreen5.png delete mode 100644 src/gfx/titlescreen/titlescreen6.png 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/japanese_title_screen.png b/src/gfx/titlescreen/japanese_title_screen.png new file mode 100644 index 0000000..82b39e5 Binary files /dev/null and b/src/gfx/titlescreen/japanese_title_screen.png differ diff --git a/src/gfx/titlescreen/japanese_title_screen_2.png b/src/gfx/titlescreen/japanese_title_screen_2.png new file mode 100644 index 0000000..adddee4 Binary files /dev/null and b/src/gfx/titlescreen/japanese_title_screen_2.png differ diff --git a/src/gfx/titlescreen/japanese_title_screen_2_cgb.png b/src/gfx/titlescreen/japanese_title_screen_2_cgb.png new file mode 100644 index 0000000..1d3cb92 Binary files /dev/null and b/src/gfx/titlescreen/japanese_title_screen_2_cgb.png differ diff --git a/src/gfx/titlescreen/japanese_title_screen_cgb.png b/src/gfx/titlescreen/japanese_title_screen_cgb.png new file mode 100644 index 0000000..f54b7c3 Binary files /dev/null and b/src/gfx/titlescreen/japanese_title_screen_cgb.png differ diff --git a/src/gfx/titlescreen/title_screen.png b/src/gfx/titlescreen/title_screen.png new file mode 100644 index 0000000..3cb6ab3 Binary files /dev/null and b/src/gfx/titlescreen/title_screen.png differ diff --git a/src/gfx/titlescreen/title_screen_cgb.png b/src/gfx/titlescreen/title_screen_cgb.png new file mode 100644 index 0000000..4f0dbe8 Binary files /dev/null and b/src/gfx/titlescreen/title_screen_cgb.png differ diff --git a/src/gfx/titlescreen/titlescreen1.png b/src/gfx/titlescreen/titlescreen1.png deleted file mode 100644 index 82b39e5..0000000 Binary files a/src/gfx/titlescreen/titlescreen1.png and /dev/null differ diff --git a/src/gfx/titlescreen/titlescreen2.png b/src/gfx/titlescreen/titlescreen2.png deleted file mode 100644 index f54b7c3..0000000 Binary files a/src/gfx/titlescreen/titlescreen2.png and /dev/null differ diff --git a/src/gfx/titlescreen/titlescreen3.png b/src/gfx/titlescreen/titlescreen3.png deleted file mode 100644 index adddee4..0000000 Binary files a/src/gfx/titlescreen/titlescreen3.png and /dev/null differ diff --git a/src/gfx/titlescreen/titlescreen4.png b/src/gfx/titlescreen/titlescreen4.png deleted file mode 100644 index 1d3cb92..0000000 Binary files a/src/gfx/titlescreen/titlescreen4.png and /dev/null differ diff --git a/src/gfx/titlescreen/titlescreen5.png b/src/gfx/titlescreen/titlescreen5.png deleted file mode 100644 index 3cb6ab3..0000000 Binary files a/src/gfx/titlescreen/titlescreen5.png and /dev/null differ diff --git a/src/gfx/titlescreen/titlescreen6.png b/src/gfx/titlescreen/titlescreen6.png deleted file mode 100644 index 4f0dbe8..0000000 Binary files a/src/gfx/titlescreen/titlescreen6.png and /dev/null differ -- cgit v1.2.3