diff options
| -rw-r--r-- | asm/title_screen.s | 10 | ||||
| -rw-r--r-- | data/field_screen.s | 3 | ||||
| -rw-r--r-- | data/graphics.s | 20 | ||||
| -rw-r--r-- | data/title_screen.s | 146 | ||||
| -rw-r--r-- | graphics/title_screen/emerald_version.pal | 19 | ||||
| -rw-r--r-- | graphics/title_screen/emerald_version.png | bin | 0 -> 1138 bytes | |||
| -rw-r--r-- | graphics/title_screen/logo_shine.png | bin | 0 -> 172 bytes | |||
| -rw-r--r-- | graphics/title_screen/press_start.pal | 19 | ||||
| -rw-r--r-- | graphics/title_screen/press_start.png | bin | 0 -> 473 bytes | |||
| -rw-r--r-- | graphics/title_screen/rayquaza.bin | bin | 0 -> 2048 bytes |
10 files changed, 191 insertions, 26 deletions
diff --git a/asm/title_screen.s b/asm/title_screen.s index 15037e80d..b2c0a4995 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -590,7 +590,7 @@ _080AA7E0: b _080AAB1E .pool _080AA8C4: - ldr r0, =gTitleScreenPokemonLogoTiles + ldr r0, =gTitleScreenPokemonLogoGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram @@ -602,13 +602,13 @@ _080AA8C4: lsls r2, 1 movs r1, 0 bl LoadPalette - ldr r0, =gTitleScreenRayquazaTiles + ldr r0, =gTitleScreenRayquazaGfx ldr r1, =0x06008000 bl LZ77UnCompVram - ldr r0, =gUnknown_0853F83C + ldr r0, =gTitleScreenRayquazaTilemap ldr r1, =0x0600d000 bl LZ77UnCompVram - ldr r0, =gTitleScreenCloudsTiles + ldr r0, =gTitleScreenCloudsGfx ldr r1, =0x0600c000 bl LZ77UnCompVram ldr r0, =gUnknown_08DDE458 @@ -627,7 +627,7 @@ _080AA8C4: bl LoadCompressedObjectPic ldr r0, =gUnknown_0854013C bl LoadCompressedObjectPic - ldr r0, =gUnknown_08DDE438 + ldr r0, =gTitleScreenEmeraldVersionPal movs r1, 0x80 lsls r1, 1 movs r2, 0x20 diff --git a/data/field_screen.s b/data/field_screen.s index 63d4f942c..fd1b1f466 100644 --- a/data/field_screen.s +++ b/data/field_screen.s @@ -4,6 +4,9 @@ .section .rodata .align 2, 0 +gUnknown_0854014C:: @ 854014C + .incbin "baserom.gba", 0x54014c, 0xc000 + gUnknown_0854C14C:: @ 854C14C .incbin "baserom.gba", 0x54c14c, 0x4 diff --git a/data/graphics.s b/data/graphics.s index a06c05217..9c3034c91 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1199,19 +1199,29 @@ gTitleScreenBgPalettes:: @ 8DDE258 .incbin "graphics/title_screen/rayquaza_and_clouds.gbapal" .align 2 -gUnknown_08DDE438:: @ 8DDE438 - .incbin "baserom.gba", 0xdde438, 0x20 +gTitleScreenEmeraldVersionPal:: @ 8DDE438 + .incbin "graphics/title_screen/emerald_version.gbapal" + .align 2 gUnknown_08DDE458:: @ 8DDE458 .incbin "baserom.gba", 0xdde458, 0x238 -gTitleScreenPokemonLogoTiles:: @ 8DDE690 +gTitleScreenPokemonLogoGfx:: @ 8DDE690 .incbin "graphics/title_screen/pokemon_logo.8bpp.lz" .align 2 -@ 8DDFD94 - .incbin "baserom.gba", 0xddfd94, 0x8b0 +gTitleScreenEmeraldVersionGfx:: @ 8DDFD94 + .incbin "graphics/title_screen/emerald_version.8bpp.lz" + + .align 2 +gTitleScreenPressStartPal:: @ 8DE03C8 + .incbin "graphics/title_screen/press_start.gbapal" + .align 2 +gTitleScreenPressStartGfx:: @ 8DE03E8 + .incbin "graphics/title_screen/press_start.4bpp.lz" + + .align 2 gUnknown_08DE0644:: @ 8DE0644 .incbin "baserom.gba", 0xde0644, 0x184 diff --git a/data/title_screen.s b/data/title_screen.s index 281afe51f..525790271 100644 --- a/data/title_screen.s +++ b/data/title_screen.s @@ -4,43 +4,157 @@ .section .rodata .align 2, 0 -gTitleScreenRayquazaTiles:: @ 853F058 +gTitleScreenRayquazaGfx:: @ 853F058 .incbin "graphics/title_screen/rayquaza.4bpp.lz" .align 2 -gUnknown_0853F83C:: @ 853F83C - .incbin "baserom.gba", 0x53f83c, 0x450 +gTitleScreenRayquazaTilemap:: @ 853F83C + .incbin "graphics/title_screen/rayquaza.bin.lz" -gTitleScreenCloudsTiles:: @ 853FC8C + .align 2 +gTitleScreenLogoShineGfx:: @ 853FB3C + .incbin "graphics/title_screen/logo_shine.4bpp.lz" + + .align 2 +gTitleScreenCloudsGfx:: @ 853FC8C .incbin "graphics/title_screen/clouds.4bpp.lz" .align 2 gUnknown_0853FF70:: @ 853FF70 - .incbin "baserom.gba", 0x53ff70, 0xa8 + .2byte 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710 + .2byte 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10 + .2byte 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008 + .2byte 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000 + .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000 + .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000 + .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000 + .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000 + + .align 2 +gUnknown_0853FFF0:: @ 853FFF0 + .byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0853FFF8:: @ 853FFF8 + .byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + .align 2 +gUnknown_08540000:: @ 8540000 + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_08540008:: @ 8540008 + .2byte 0x0040, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_08540010:: @ 8540010 + .4byte gUnknown_08540000 + + .align 2 +gUnknown_08540014:: @ 8540014 + .4byte gUnknown_08540008 + + .align 2 gUnknown_08540018:: @ 8540018 - .incbin "baserom.gba", 0x540018, 0x18 + spr_template 0x03e8, 0x03e8, gUnknown_0853FFF0, gUnknown_08540010, NULL, gDummySpriteAffineAnimTable, sub_80AA40C + .align 2 gUnknown_08540030:: @ 8540030 - .incbin "baserom.gba", 0x540030, 0x18 + spr_template 0x03e8, 0x03e8, gUnknown_0853FFF8, gUnknown_08540014, NULL, gDummySpriteAffineAnimTable, sub_80AA474 + .align 2 gUnknown_08540048:: @ 8540048 - .incbin "baserom.gba", 0x540048, 0x90 + obj_tiles gTitleScreenEmeraldVersionGfx, 0x1000, 0x03e8 + null_obj_tiles + + .align 2 +gUnknown_08540058:: @ 8540058 + .byte 0xa0, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_08540060:: @ 8540060 + .2byte 0x0001, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540068:: @ 8540068 + .2byte 0x0005, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540070:: @ 8540070 + .2byte 0x0009, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540078:: @ 8540078 + .2byte 0x000d, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540080:: @ 8540080 + .2byte 0x0011, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540088:: @ 8540088 + .2byte 0x0015, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540090:: @ 8540090 + .2byte 0x0019, 0x0004, 0xffff, 0x0000 + .align 2 +gUnknown_08540098:: @ 8540098 + .2byte 0x001d, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085400A0:: @ 85400A0 + .2byte 0x0021, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085400A8:: @ 85400A8 + .2byte 0x0025, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085400B0:: @ 85400B0 + .4byte gUnknown_08540060 + .4byte gUnknown_08540068 + .4byte gUnknown_08540070 + .4byte gUnknown_08540078 + .4byte gUnknown_08540080 + .4byte gUnknown_08540088 + .4byte gUnknown_08540090 + .4byte gUnknown_08540098 + .4byte gUnknown_085400A0 + .4byte gUnknown_085400A8 + + .align 2 gUnknown_085400D8:: @ 85400D8 - .incbin "baserom.gba", 0x5400d8, 0x18 + spr_template 0x03e9, 0x03e9, gUnknown_08540058, gUnknown_085400B0, NULL, gDummySpriteAffineAnimTable, sub_80AA4B4 + .align 2 gUnknown_085400F0:: @ 85400F0 - .incbin "baserom.gba", 0x5400f0, 0x10 + obj_tiles gTitleScreenPressStartGfx, 0x0520, 0x03e9 + null_obj_tiles + .align 2 gUnknown_08540100:: @ 8540100 - .incbin "baserom.gba", 0x540100, 0x24 + obj_pal gTitleScreenPressStartPal, 0x03e9 + null_obj_pal + .align 2 +gUnknown_08540110:: @ 8540110 + .byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_08540118:: @ 8540118 + .2byte 0x0000, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_08540120:: @ 8540120 + .4byte gUnknown_08540118 + + .align 2 gUnknown_08540124:: @ 8540124 - .incbin "baserom.gba", 0x540124, 0x18 + spr_template 0x03ea, 0x03e9, gUnknown_08540110, gUnknown_08540120, NULL, gDummySpriteAffineAnimTable, title_screen_logo_shine_obj_callback_type1 + .align 2 gUnknown_0854013C:: @ 854013C - .incbin "baserom.gba", 0x54013c, 0x10 - -gUnknown_0854014C:: @ 854014C - .incbin "baserom.gba", 0x54014c, 0xc000 + obj_tiles gTitleScreenLogoShineGfx, 0x0800, 0x03ea + null_obj_tiles diff --git a/graphics/title_screen/emerald_version.pal b/graphics/title_screen/emerald_version.pal new file mode 100644 index 000000000..c5ed9a582 --- /dev/null +++ b/graphics/title_screen/emerald_version.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 74 238 +156 156 156 +90 90 90 +222 222 222 +24 16 24 +74 74 74 +238 238 238 +41 41 41 +172 172 172 +106 106 106 +189 189 189 +139 139 139 +205 205 205 +123 123 123 +65 57 57 +255 255 255 diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png Binary files differnew file mode 100644 index 000000000..2e8b32da9 --- /dev/null +++ b/graphics/title_screen/emerald_version.png diff --git a/graphics/title_screen/logo_shine.png b/graphics/title_screen/logo_shine.png Binary files differnew file mode 100644 index 000000000..4e17d2877 --- /dev/null +++ b/graphics/title_screen/logo_shine.png diff --git a/graphics/title_screen/press_start.pal b/graphics/title_screen/press_start.pal new file mode 100644 index 000000000..561ab8f8f --- /dev/null +++ b/graphics/title_screen/press_start.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 156 98 +0 0 0 +148 156 164 +180 189 189 +222 222 238 +255 255 255 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png Binary files differnew file mode 100644 index 000000000..63a5c23d0 --- /dev/null +++ b/graphics/title_screen/press_start.png diff --git a/graphics/title_screen/rayquaza.bin b/graphics/title_screen/rayquaza.bin Binary files differnew file mode 100644 index 000000000..b112237a3 --- /dev/null +++ b/graphics/title_screen/rayquaza.bin |
