diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:14 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:14 -0400 |
commit | 77e755033c05a39c18b53e3a74bc777113e0581b (patch) | |
tree | c56f1eae771bc3728710f3014d79ec90add8749f | |
parent | c543e2522581fe81114edb001d3ded7ee17d8797 (diff) |
dump various menu frames and misc gfx
-rw-r--r-- | asm/rom5.s | 22 | ||||
-rw-r--r-- | data/data2.s | 2 | ||||
-rw-r--r-- | data/graphics.s | 48 | ||||
-rwxr-xr-x | graphics/interface/bag_screen.png | bin | 0 -> 1634 bytes | |||
-rwxr-xr-x | graphics/interface/bag_screen_female.pal | 35 | ||||
-rwxr-xr-x | graphics/interface/bag_screen_male.pal | 35 | ||||
-rwxr-xr-x | graphics/interface/mart_frame.bin | bin | 0 -> 2048 bytes | |||
-rwxr-xr-x | graphics/interface/mart_frame.png | bin | 0 -> 300 bytes | |||
-rwxr-xr-x | graphics/interface/pokeblock.bin | bin | 0 -> 2048 bytes | |||
-rwxr-xr-x | graphics/interface/pokeblock_case_frame.pal | 99 | ||||
-rwxr-xr-x | graphics/interface/pokeblock_case_frame.png | bin | 0 -> 720 bytes | |||
-rwxr-xr-x | graphics/interface/status_screen.bin | bin | 0 -> 2048 bytes | |||
-rwxr-xr-x | graphics/interface/status_screen.pal | 83 | ||||
-rwxr-xr-x | graphics/interface/status_screen.png | bin | 0 -> 2011 bytes | |||
-rwxr-xr-x | misc.mk | 3 |
15 files changed, 292 insertions, 35 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 13289f8bd..a45bd5f61 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -71643,7 +71643,7 @@ _0809DF54: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF60: .4byte gUnknown_08E72A78 +_0809DF60: .4byte gStatusScreen_Gfx _0809DF64: ldr r0, _0809DF6C ldr r1, _0809DF70 @@ -71665,7 +71665,7 @@ _0809DF88: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF94: .4byte gUnknown_08E73D08 +_0809DF94: .4byte gStatusScreen_Tilemap _0809DF98: .4byte 0x06004800 _0809DF9C: ldr r0, _0809DFA4 @@ -71692,7 +71692,7 @@ _0809DFC4: bl LoadCompressedPalette b _0809E030 .align 2, 0 -_0809DFD0: .4byte gUnknown_08E73468 +_0809DFD0: .4byte gStatusScreen_Pal _0809DFD4: ldr r0, _0809DFDC bl LoadCompressedObjectPic @@ -82572,7 +82572,7 @@ _080A355C: bl LZDecompressVram b _080A35EA .align 2, 0 -_080A3568: .4byte gUnknown_08E76728 +_080A3568: .4byte gBagScreen_Gfx _080A356C: .4byte 0x06004000 _080A3570: ldr r0, _080A3580 @@ -82602,7 +82602,7 @@ _080A3598: .align 2, 0 _080A35A4: .4byte gSaveBlock2 _080A35A8: .4byte 0x03000701 -_080A35AC: .4byte gUnknown_08E76F94 +_080A35AC: .4byte gBagScreenMale_Pal _080A35B0: ldr r0, _080A35BC movs r1, 0 @@ -82610,7 +82610,7 @@ _080A35B0: bl LoadCompressedPalette b _080A35EA .align 2, 0 -_080A35BC: .4byte gUnknown_08E76FCC +_080A35BC: .4byte gBagScreenFemale_Pal _080A35C0: ldr r0, _080A35D8 ldrb r0, [r0, 0x8] @@ -115013,9 +115013,9 @@ _080B3204: .4byte REG_BG1HOFS _080B3208: .4byte 0x0202f388 _080B320C: .4byte 0x040000d4 _080B3210: .4byte 0x85000100 -_080B3214: .4byte gUnknown_08E77804 +_080B3214: .4byte gMenuMartFrame_Gfx _080B3218: .4byte 0x06007c00 -_080B321C: .4byte gUnknown_08E77928 +_080B321C: .4byte gMenuMartFrame_Tilemap _080B3220: .4byte 0x02018000 _080B3224: .4byte gMenuMoneyPal _080B3228: .4byte gWindowConfig_81E6DFC @@ -298048,7 +298048,7 @@ _0810B9D0: bl LZDecompressVram b _0810BA0E .align 2, 0 -_0810B9DC: .4byte gUnknown_08E77AE4 +_0810B9DC: .4byte gMenuPokeblock_Gfx _0810B9E0: .4byte 0x06008000 _0810B9E4: ldr r0, _0810B9F0 @@ -298056,7 +298056,7 @@ _0810B9E4: bl sub_800D238 b _0810BA0E .align 2, 0 -_0810B9F0: .4byte gUnknown_08E78078 +_0810B9F0: .4byte gMenuPokeblock_Tilemap _0810B9F4: .4byte 0x020221cc _0810B9F8: ldr r0, _0810BA04 @@ -298065,7 +298065,7 @@ _0810B9F8: bl LoadCompressedPalette b _0810BA0E .align 2, 0 -_0810BA04: .4byte gUnknown_08E77D20 +_0810BA04: .4byte gMenuPokeblock_Pal _0810BA08: ldr r0, _0810BA1C bl LoadCompressedObjectPic diff --git a/data/data2.s b/data/data2.s index 207e9840b..e06bfaf69 100644 --- a/data/data2.s +++ b/data/data2.s @@ -10499,7 +10499,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_3 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - + @.4byte unk_20000000 .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000? .align 2 diff --git a/data/graphics.s b/data/graphics.s index 73bee4057..e357c83dc 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3160,6 +3160,7 @@ gMoveTypes_Pal:: @ 8E726E4 gMenuSummaryGfx:: @ 8E7274C .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused. + .align 2 gMenuSummaryPal:: @ 8E72848 .incbin "graphics/interface/summary_frames.gbapal.lz" @@ -3172,19 +3173,20 @@ gStatusPal_Icons:: @ 8E72A50 .incbin "graphics/interface/status_icons.gbapal.lz" .align 2 -gUnknown_08E72A78:: @ 8E72A78 - .incbin "baserom.gba", 0xE72A78, 0x9F0 @ LZ, uncomp. size = 0x1B20 +gStatusScreen_Gfx:: @ 8E72A78 + .incbin "graphics/interface/status_screen.4bpp.lz" .align 2 -gUnknown_08E73468:: @ 8E73468 - .incbin "baserom.gba", 0xE73468, 0xA0 @ LZ, uncomp. size = 0xA0 +gStatusScreen_Pal:: @ 8E73468 + .incbin "graphics/interface/status_screen.gbapal.lz" + .align 2 gUnknown_08E73508:: @ 8E73508 - .incbin "baserom.gba", 0x00e73508, 0x800 + .incbin "baserom.gba", 0xE73508, 0x800 .align 2 -gUnknown_08E73D08:: @ 8E73D08 - .incbin "baserom.gba", 0xE73D08, 0x180 @ LZ, uncomp. size = 0x800 +gStatusScreen_Tilemap:: @ 8E73D08 + .incbin "graphics/interface/status_screen.bin.lz" gUnknown_08E73E88:: @ 8E73E88 .incbin "baserom.gba", 0x00e73e88, 0x800 @@ -3209,43 +3211,43 @@ gBagPalette:: @ 8E76700 .incbin "graphics/misc/bag.gbapal.lz" .align 2 -gUnknown_08E76728:: @ 8E76728 - .incbin "baserom.gba", 0xE76728, 0x86B @ LZ, uncomp. size = 0x2000 +gBagScreen_Gfx:: @ 8E76728 + .incbin "graphics/interface/bag_screen.4bpp.lz" .align 2 -gUnknown_08E76F94:: @ 8E76F94 - .incbin "baserom.gba", 0xE76F94, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenMale_Pal:: @ 8E76F94 + .incbin "graphics/interface/bag_screen_male.gbapal.lz" .align 2 -gUnknown_08E76FCC:: @ 8E76FCC - .incbin "baserom.gba", 0xE76FCC, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenFemale_Pal:: @ 8E76FCC + .incbin "graphics/interface/bag_screen_female.gbapal.lz" gUnknown_08E77004:: @ 8E77004 .incbin "baserom.gba", 0x00e77004, 0x800 .align 2 -gUnknown_08E77804:: @ 8E77804 - .incbin "baserom.gba", 0xE77804, 0xFA @ LZ, uncomp. size = 0x300 +gMenuMartFrame_Gfx:: @ 8E77804 + .incbin "graphics/interface/mart_frame.4bpp.lz" .align 2 gMenuMoneyPal:: @ 8E77900 .incbin "graphics/interface/money.gbapal.lz" .align 2 -gUnknown_08E77928:: @ 8E77928 - .incbin "baserom.gba", 0xE77928, 0x134 @ LZ, uncomp. size = 0x800 +gMenuMartFrame_Tilemap:: @ 8E77928 + .incbin "graphics/interface/mart_frame.bin.lz" .align 2 gMenuMoneyGfx:: @ 8E77A5C .incbin "graphics/interface/money.4bpp.lz" .align 2 -gUnknown_08E77AE4:: @ 8E77AE4 - .incbin "baserom.gba", 0xE77AE4, 0x23A @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Gfx:: @ 8E77AE4 + .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" .align 2 -gUnknown_08E77D20:: @ 8E77D20 - .incbin "baserom.gba", 0xE77D20, 0x6E @ LZ, uncomp. size = 0xC0 +gMenuPokeblock_Pal:: @ 8E77D20 + .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" .align 2 gMenuPokeblockDevice_Gfx:: @ 8E77D90 @@ -3256,8 +3258,8 @@ gMenuPokeblockDevice_Pal:: @ 8E78050 .incbin "graphics/interface/pokeblock_device.gbapal.lz" .align 2 -gUnknown_08E78078:: @ 8E78078 - .incbin "baserom.gba", 0xE78078, 0x150 @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Tilemap:: @ 8E78078 + .incbin "graphics/interface/pokeblock.bin.lz" .align 2 gPokeblock_Gfx:: diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png Binary files differnew file mode 100755 index 000000000..86b824bce --- /dev/null +++ b/graphics/interface/bag_screen.png diff --git a/graphics/interface/bag_screen_female.pal b/graphics/interface/bag_screen_female.pal new file mode 100755 index 000000000..d5d99e115 --- /dev/null +++ b/graphics/interface/bag_screen_female.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +57 49 57 +156 65 106 +98 41 65 +255 230 172 +255 197 90 +255 32 32 +230 123 139 +164 49 115 +189 156 90 +0 0 0 +98 98 115 +255 255 255 +90 0 123 +164 164 164 +123 123 123 +98 98 115 +57 49 57 +156 65 106 +98 41 65 +255 230 172 +255 197 90 +0 0 0 +230 123 139 +164 49 115 +106 180 213 +255 148 180 diff --git a/graphics/interface/bag_screen_male.pal b/graphics/interface/bag_screen_male.pal new file mode 100755 index 000000000..49c4879bd --- /dev/null +++ b/graphics/interface/bag_screen_male.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 230 172 +255 197 90 +255 32 32 +106 180 213 +41 123 164 +189 156 90 +0 0 0 +98 98 115 +255 255 255 +90 0 123 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 230 172 +255 197 90 +0 0 0 +106 180 213 +41 123 164 +255 0 0 +255 148 180 diff --git a/graphics/interface/mart_frame.bin b/graphics/interface/mart_frame.bin Binary files differnew file mode 100755 index 000000000..e9bc3eaa7 --- /dev/null +++ b/graphics/interface/mart_frame.bin diff --git a/graphics/interface/mart_frame.png b/graphics/interface/mart_frame.png Binary files differnew file mode 100755 index 000000000..a776e789a --- /dev/null +++ b/graphics/interface/mart_frame.png diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin Binary files differnew file mode 100755 index 000000000..232df0fdb --- /dev/null +++ b/graphics/interface/pokeblock.bin diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal new file mode 100755 index 000000000..ef58ae778 --- /dev/null +++ b/graphics/interface/pokeblock_case_frame.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +123 205 189 +238 246 255 +213 230 255 +255 0 0 +115 131 238 +90 90 98 +123 180 189 +131 131 164 +0 0 0 +0 0 0 +197 197 197 +205 65 24 +255 123 90 +255 180 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +238 246 255 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +106 139 189 +148 213 255 +180 238 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 238 238 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +205 90 172 +255 156 197 +255 197 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 115 +148 246 98 +205 255 139 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 49 +246 230 49 +255 255 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 139 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png Binary files differnew file mode 100755 index 000000000..646636365 --- /dev/null +++ b/graphics/interface/pokeblock_case_frame.png diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin Binary files differnew file mode 100755 index 000000000..745f3d2de --- /dev/null +++ b/graphics/interface/status_screen.bin diff --git a/graphics/interface/status_screen.pal b/graphics/interface/status_screen.pal new file mode 100755 index 000000000..61cd08f0c --- /dev/null +++ b/graphics/interface/status_screen.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +74 65 57 +255 255 255 +222 230 246 +213 213 189 +246 255 255 +115 106 98 +246 74 16 +222 82 41 +205 90 65 +180 106 90 +164 115 115 +189 172 238 +164 156 189 +148 131 139 +106 90 82 +0 0 0 +74 65 57 +255 255 255 +148 82 65 +197 131 106 +255 246 205 +115 106 98 +65 189 189 +82 164 164 +98 148 139 +123 131 123 +139 115 98 +238 172 131 +213 148 115 +189 123 98 +164 98 82 +0 0 0 +74 65 57 +255 255 255 +172 180 172 +205 205 197 +246 255 238 +115 106 98 +255 189 0 +197 164 24 +148 148 57 +90 131 90 +41 115 123 +123 230 164 +131 189 131 +74 148 115 +41 115 123 +0 0 0 +74 65 57 +255 255 255 +0 0 0 +0 0 0 +246 255 246 +115 106 98 +164 230 41 +148 205 65 +131 180 90 +115 156 115 +98 131 139 +172 222 222 +139 172 213 +106 123 205 +82 82 197 +0 0 0 +74 65 57 +123 131 65 +156 172 82 +213 213 189 +255 255 255 +238 213 65 +197 189 74 +246 246 156 +230 230 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 98 90 diff --git a/graphics/interface/status_screen.png b/graphics/interface/status_screen.png Binary files differnew file mode 100755 index 000000000..3024a035c --- /dev/null +++ b/graphics/interface/status_screen.png @@ -215,3 +215,6 @@ $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal @cat $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal >$@ + +$(MENUGFXDIR)/status_screen.4bpp: $(MENUGFXDIR)/status_screen.png + $(GFX) $< $@ -num_tiles 217
\ No newline at end of file |