diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:59:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:59:28 +0800 |
| commit | 26a71921863214c4eb0af3f8320c321b51d0102e (patch) | |
| tree | c39d533ff9ac7af61b69507577493316f3ffc4ea /data/graphics.s | |
| parent | 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c (diff) | |
| parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/graphics.s')
| -rw-r--r-- | data/graphics.s | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/data/graphics.s b/data/graphics.s index 034db89da..fee86e011 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16355,38 +16355,39 @@ gUnknown_8EAAB98:: @ 8EAAB98 gUnknown_8EAB30C:: @ 8EAB30C .incbin "baserom.gba", 0xEAB30C, 0x3B8 -gUnknown_8EAB6C4:: @ 8EAB6C4 - .incbin "baserom.gba", 0xEAB6C4, 0x200 @UNKNOWN + @ title_screen +gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 + .incbin "graphics/title_screen/unk_8eab6c4.gbapal" -gUnknown_8EAB8C4:: @ 8EAB8C4 - .incbin "baserom.gba", 0xEAB8C4, 0x1ACC +gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 + .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz" -gUnknown_8EAD390:: @ 8EAD390 - .incbin "baserom.gba", 0xEAD390, 0x258 +gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 + .incbin "graphics/title_screen/unk_8ead390.bin.lz" -gUnknown_8EAD5E8:: @ 8EAD5E8 - .incbin "baserom.gba", 0xEAD5E8, 0x20 @UNKNOWN +gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 + .incbin "graphics/title_screen/unk_8ead5e8.gbapal" -gUnknown_8EAD608:: @ 8EAD608 - .incbin "baserom.gba", 0xEAD608, 0x8DC +gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 + .incbin "graphics/title_screen/unk_8ead608.4bpp.lz" -gUnknown_8EADEE4:: @ 8EADEE4 - .incbin "baserom.gba", 0xEADEE4, 0x1B0 +gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 + .incbin "graphics/title_screen/unk_8eadee4.bin.lz" -gUnknown_8EAE094:: @ 8EAE094 - .incbin "baserom.gba", 0xEAE094, 0x20 @UNKNOWN +gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 + .incbin "graphics/title_screen/unk_8eae094.gbapal" -gUnknown_8EAE0B4:: @ 8EAE0B4 - .incbin "baserom.gba", 0xEAE0B4, 0x2C0 +gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 + .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" -gUnknown_8EAE374:: @ 8EAE374 - .incbin "baserom.gba", 0xEAE374, 0x114 +gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374 + .incbin "graphics/title_screen/unk_8eae374.bin.lz" -gUnknown_8EAE488:: @ 8EAE488 - .incbin "baserom.gba", 0xEAE488, 0x20 @UNKNOWN +gGraphics_TitleScreen_FirePals:: @ 8EAE488 + .incbin "graphics/title_screen/unk_8eae488.gbapal" -gUnknown_8EAE4A8:: @ 8EAE4A8 - .incbin "baserom.gba", 0xEAE4A8, 0x80 +gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8 + .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" gUnknown_8EAE528:: @ 8EAE528 .incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN |