diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 06:56:24 +0100 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 06:56:24 +0100 |
commit | 0ef010cb4bff33232b2a444cd03cbc334688ecd9 (patch) | |
tree | 36970e8243ec3d195c9185dd3cc9f95161cc614d | |
parent | 724a95924c3d636f11c9ec59f944e8697aa82edb (diff) |
dump text window frames and misc gfx
50 files changed, 630 insertions, 166 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 11afc0a3f..ec0f6571f 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -59324,13 +59324,13 @@ sub_8097E70: @ 8097E70 pop {r0} bx r0 .align 2, 0 -_08097F2C: .4byte gPCMenuHeader_Gfx +_08097F2C: .4byte gPSSMenuHeader_Gfx _08097F30: .4byte 0x06005000 -_08097F34: .4byte gPCMenuHeader_Tilemap +_08097F34: .4byte gPSSMenuHeader_Tilemap _08097F38: .4byte 0x02039760 _08097F3C: .4byte 0x06007800 -_08097F40: .4byte gPCMenu1_Pal -_08097F44: .4byte gPCMenu2_Pal +_08097F40: .4byte gPSSMenu1_Pal +_08097F44: .4byte gPSSMenu2_Pal _08097F48: .4byte gUnknown_083B6D74 _08097F4C: .4byte gUnknown_083B6D94 _08097F50: .4byte gUnknownPalette_81E6692+0x2 @@ -59972,12 +59972,12 @@ sub_8098400: @ 8098400 .align 2, 0 _0809847C: .4byte REG_BG1CNT _08098480: .4byte 0x00000f01 -_08098484: .4byte gPCMenuMisc_Gfx +_08098484: .4byte gPSSMenuMisc_Gfx _08098488: .4byte 0x06006800 -_0809848C: .4byte gPCMenuMisc_Tilemap +_0809848C: .4byte gPSSMenuMisc_Tilemap _08098490: .4byte 0x020000a8 -_08098494: .4byte gPCMenu3_Pal -_08098498: .4byte gPCMenu4_Pal +_08098494: .4byte gPSSMenu3_Pal +_08098498: .4byte gPSSMenu4_Pal _0809849C: .4byte 0x06007800 _080984A0: .4byte 0x040000d4 _080984A4: .4byte 0x81000400 @@ -226243,7 +226243,7 @@ _080E8F34: .4byte 0x00000d09 _080E8F38: .4byte gUnknown_08E945D0 _080E8F3C: .4byte gUnknown_083DB694 _080E8F40: .4byte gUnknown_08E953D0 -_080E8F44: .4byte gUnknown_08E8EE18 +_080E8F44: .4byte gMenuWordGroupFrame_Gfx _080E8F48: .4byte 0x06008000 _080E8F4C: .4byte 0x06006800 _080E8F50: .4byte gUnknown_08E8F178 @@ -286892,7 +286892,7 @@ sub_81063C0: @ 81063C0 pop {r0} bx r0 .align 2, 0 -_081063F0: .4byte gUnknown_08E99848 +_081063F0: .4byte gSlotMachineReelTimeLights_Gfx _081063F4: .4byte 0x02010000 _081063F8: .4byte gUnknown_083EDE8C _081063FC: .4byte gUnknown_083EDC2C @@ -286980,7 +286980,7 @@ _08106468: pop {r0} bx r0 .align 2, 0 -_081064A0: .4byte gUnknown_08E8F844 +_081064A0: .4byte gSlotMachine_Gfx _081064A4: .4byte 0x02010000 _081064A8: .4byte 0x040000d4 _081064AC: .4byte 0x80000800 @@ -295790,9 +295790,9 @@ _0810A77C: .align 2, 0 _0810A7F8: .4byte 0x040000d4 _0810A7FC: .4byte 0x81000800 -_0810A800: .4byte gUnknown_08E8F1B8 +_0810A800: .4byte gMiscClock_Gfx _0810A804: .4byte 0x0202e8cc -_0810A808: .4byte gUnknown_08E8F804 +_0810A808: .4byte gMiscClockMale_Pal _0810A80C: ldr r0, _0810A850 movs r1, 0 @@ -295819,7 +295819,7 @@ _0810A816: pop {r0} bx r0 .align 2, 0 -_0810A850: .4byte gUnknown_08E8F824 +_0810A850: .4byte gMiscClockFemale_Pal _0810A854: .4byte gUnknown_083F7A90 _0810A858: .4byte gUnknown_083F7AA0 _0810A85C: .4byte gWindowConfig_81E6C3C @@ -411575,7 +411575,7 @@ _0814350A: pop {r0} bx r0 .align 2, 0 -_0814354C: .4byte gUnknown_08E8E8B0 +_0814354C: .4byte gPSSHallOfFameHeader_Gfx _08143550: .4byte 0x040000d4 _08143554: .4byte 0x81000800 _08143558: .4byte 0x06003800 @@ -411583,7 +411583,7 @@ _0814355C: .4byte 0x02000000 _08143560: .4byte 0x06003b80 _08143564: .4byte 0x06003000 _08143568: .4byte 0x000003ff -_0814356C: .4byte gUnknown_08E8EA78 +_0814356C: .4byte gPSSHallOfFameHeader_Pal thumb_func_end sub_81433E0 thumb_func_start sub_8143570 diff --git a/data/data2.s b/data/data2.s index e2b486164..08ff6c152 100644 --- a/data/data2.s +++ b/data/data2.s @@ -7858,46 +7858,26 @@ gUnknown_083761EC:: @ 83761EC .align 2 gUnknown_083761F0:: @ 83761F0 - .4byte gUnknown_08E9ADDC - .4byte gUnknown_08E9AEFC - .4byte gUnknown_08E9AF1C - .4byte gUnknown_08E9B03C - .4byte gUnknown_08E9B05C - .4byte gUnknown_08E9B17C - .4byte gUnknown_08E9B19C - .4byte gUnknown_08E9B2BC - .4byte gUnknown_08E9B2DC - .4byte gUnknown_08E9B3FC - .4byte gUnknown_08E9B41C - .4byte gUnknown_08E9B53C - .4byte gUnknown_08E9B55C - .4byte gUnknown_08E9B67C - .4byte gUnknown_08E9B69C - .4byte gUnknown_08E9B7BC - .4byte gUnknown_08E9B7DC - .4byte gUnknown_08E9B8FC - .4byte gUnknown_08E9B91C - .4byte gUnknown_08E9BA3C - .4byte gUnknown_08E9BA5C - .4byte gUnknown_08E9BB7C - .4byte gUnknown_08E9BB9C - .4byte gUnknown_08E9BCBC - .4byte gUnknown_08E9BCDC - .4byte gUnknown_08E9BDFC - .4byte gUnknown_08E9BE1C - .4byte gUnknown_08E9BF3C - .4byte gUnknown_08E9BF5C - .4byte gUnknown_08E9C07C - .4byte gUnknown_08E9C09C - .4byte gUnknown_08E9C1BC - .4byte gUnknown_08E9C1DC - .4byte gUnknown_08E9C2FC - .4byte gUnknown_08E9C31C - .4byte gUnknown_08E9C43C - .4byte gUnknown_08E9C45C - .4byte gUnknown_08E9C57C - .4byte gUnknown_08E9C59C - .4byte gUnknown_08E9C6BC + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal gUnknown_08376290:: @ 8376290 .incbin "baserom.gba", 0x00376290, 0x48 @@ -24888,8 +24868,8 @@ gUnknown_083F7A90:: @ 83F7A90 .space 8 gUnknown_083F7AA0:: @ 83F7AA0 - obj_pal gUnknown_08E8F804, 0x1000 - obj_pal gUnknown_08E8F824, 0x1001 + obj_pal gMiscClockMale_Pal, 0x1000 + obj_pal gMiscClockFemale_Pal, 0x1001 .space 8 .align 2 diff --git a/data/graphics.s b/data/graphics.s index 1f6d541a8..e02888ce4 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3813,52 +3813,52 @@ gUnknown_08E8D9C0:: @ 8E8D9C0 .incbin "baserom.gba", 0x00e8d9c0, 0x500 .align 2 -gPCMenuHeader_Gfx:: @ 8E8DEC0 +gPSSMenuHeader_Gfx:: @ 8E8DEC0 .incbin "graphics/pokemon_storage/header.4bpp.lz" .align 2 -gPCMenu1_Pal:: @ 8E8E0E8 +gPSSMenu1_Pal:: @ 8E8E0E8 .incbin "graphics/pokemon_storage/menu1.gbapal" .align 2 -gPCMenu2_Pal:: @ 8E8E108 +gPSSMenu2_Pal:: @ 8E8E108 .incbin "graphics/pokemon_storage/menu2.bin" .align 2 -gPCMenuHeader_Tilemap:: @ 8E8E128 +gPSSMenuHeader_Tilemap:: @ 8E8E128 .incbin "graphics/pokemon_storage/header.bin.lz" .align 2 -gPCMenuMisc_Gfx:: @ 8E8E244 +gPSSMenuMisc_Gfx:: @ 8E8E244 .incbin "graphics/pokemon_storage/misc1.4bpp.lz" .align 2 -gPCMenu3_Pal:: @ 8E8E6A8 +gPSSMenu3_Pal:: @ 8E8E6A8 .incbin "graphics/pokemon_storage/menu3.gbapal" .align 2 -gPCMenu4_Pal:: @ 8E8E6C8 +gPSSMenu4_Pal:: @ 8E8E6C8 .incbin "graphics/pokemon_storage/menu4.gbapal" .align 2 -gPCMenuMisc_Tilemap:: @ 8E8E6E8 +gPSSMenuMisc_Tilemap:: @ 8E8E6E8 .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 -gUnknown_08E8E8B0:: @ 8E8E8B0 - .incbin "baserom.gba", 0xE8E8B0, 0x1C7 @ LZ, uncomp. size = 0x4A0 +gPSSHallOfFameHeader_Gfx:: @ 8E8E8B0 + .incbin "graphics/pokemon_storage/hof_header.4bpp.lz" .align 2 -gUnknown_08E8EA78:: @ 8E8EA78 - .incbin "baserom.gba", 0x00e8ea78, 0x20 +gPSSHallOfFameHeader_Pal:: @ 8E8EA78 + .incbin "graphics/pokemon_storage/hof_header.gbapal" .align 2 gMenuWordGroup_Gfx:: @ 8E8EA98 .incbin "graphics/interface/wordgroup.4bpp.lz" .align 2 -gUnknown_08E8EE18:: @ 8E8EE18 - .incbin "baserom.gba", 0xE8EE18, 0x33D @ LZ, uncomp. size = 0x820 +gMenuWordGroupFrame_Gfx:: @ 8E8EE18 + .incbin "graphics/interface/wordgroup_frame.4bpp.lz" .align 2 gMenuWordGroup_Pal:: @ 8E8F158 @@ -3874,23 +3874,27 @@ gUnknown_08E8F1A0:: @ 8E8F1A0 .incbin "baserom.gba", 0x00e8f1a0, 0x18 .align 2 -gUnknown_08E8F1B8:: @ 8E8F1B8 - .incbin "baserom.gba", 0xE8F1B8, 0x649 @ LZ, uncomp. size = 0x1000 +gMiscClock_Gfx:: @ 8E8F1B8 + .incbin "graphics/misc/clock.4bpp.lz" .align 2 -gUnknown_08E8F804:: @ 8E8F804 - .incbin "graphics/misc/clock1.gbapal" +gMiscClockMale_Pal:: @ 8E8F804 + .incbin "graphics/misc/clock1.gbapal" @ male -gUnknown_08E8F824:: @ 8E8F824 - .incbin "graphics/misc/clock2.gbapal" + .align 2 +gMiscClockFemale_Pal:: @ 8E8F824 + .incbin "graphics/misc/clock2.gbapal" @ female .align 2 -gUnknown_08E8F844:: @ 8E8F844 - .incbin "baserom.gba", 0xE8F844, 0xBB3 @ LZ, uncomp. size = 0x1E00 +gSlotMachine_Gfx:: @ 8E8F844 + .incbin "graphics/slot_machine/slots.4bpp.lz" .align 2 gUnknown_08E903F8:: @ 8E903F8 - .incbin "baserom.gba", 0x00e903f8, 0x220 + .incbin "baserom.gba", 0x00e903f8, 0x20 + + @ unused + .incbin "baserom.gba", 0x00e90418, 0x200 .align 2 gBerryBlenderMarubatsuTiles:: @ 8E90618 @@ -3910,13 +3914,15 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18 gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" - .incbin "baserom.gba", 0x00e91418, 0x200 + .incbin "baserom.gba", 0x00e91418, 0x20 + + .space 0x1E0 .align 2 gBerryBlenderArrowTiles:: @ 8E91618 .incbin "graphics/berry_blender/arrow.4bpp" - .incbin "baserom.gba", 0x00e91e18, 0x2c0 + .space 0x2C0 .align 2 gBerryBlenderMiscPalette:: @ 8E920D8 @@ -4067,39 +4073,71 @@ gSlotMachineSpritePalette5:: @ 8E97768 gSlotMachineSpritePalette6:: @ 8E97788 .incbin "graphics/slot_machine/spr6.gbapal" + .align 2 gSlotMachineReelSymbol1Tiles:: .incbin "graphics/slot_machine/reel_symbols/1.4bpp" + + .align 2 gSlotMachineReelSymbol2Tiles:: .incbin "graphics/slot_machine/reel_symbols/2.4bpp" + + .align 2 gSlotMachineReelSymbol3Tiles:: .incbin "graphics/slot_machine/reel_symbols/3.4bpp" + + .align 2 gSlotMachineReelSymbol4Tiles:: .incbin "graphics/slot_machine/reel_symbols/4.4bpp" + + .align 2 gSlotMachineReelSymbol5Tiles:: .incbin "graphics/slot_machine/reel_symbols/5.4bpp" + + .align 2 gSlotMachineReelSymbol6Tiles:: .incbin "graphics/slot_machine/reel_symbols/6.4bpp" + + .align 2 gSlotMachineReelSymbol7Tiles:: .incbin "graphics/slot_machine/reel_symbols/7.4bpp" + .align 2 gSlotMachineNumber0Tiles:: .incbin "graphics/slot_machine/numbers/0.4bpp" + + .align 2 gSlotMachineNumber1Tiles:: .incbin "graphics/slot_machine/numbers/1.4bpp" + + .align 2 gSlotMachineNumber2Tiles:: .incbin "graphics/slot_machine/numbers/2.4bpp" + + .align 2 gSlotMachineNumber3Tiles:: .incbin "graphics/slot_machine/numbers/3.4bpp" + + .align 2 gSlotMachineNumber4Tiles:: .incbin "graphics/slot_machine/numbers/4.4bpp" + + .align 2 gSlotMachineNumber5Tiles:: .incbin "graphics/slot_machine/numbers/5.4bpp" + + .align 2 gSlotMachineNumber6Tiles:: .incbin "graphics/slot_machine/numbers/6.4bpp" + + .align 2 gSlotMachineNumber7Tiles:: .incbin "graphics/slot_machine/numbers/7.4bpp" + + .align 2 gSlotMachineNumber8Tiles:: .incbin "graphics/slot_machine/numbers/8.4bpp" + + .align 2 gSlotMachineNumber9Tiles:: .incbin "graphics/slot_machine/numbers/9.4bpp" @@ -4172,8 +4210,8 @@ gSpriteImage_8E99808:: @ 8E99808 .incbin "graphics/unknown_sprites/8E99808.4bpp" .align 2 -gUnknown_08E99848:: @ 8E99848 - .incbin "baserom.gba", 0xE99848, 0x766 @ LZ, uncomp. size = 0x3200 +gSlotMachineReelTimeLights_Gfx:: @ 8E99848 + .incbin "graphics/slot_machine/reel_time_lights.4bpp.lz" .align 2 gUnknown_08E99FB0:: @ 8E99FB0 @@ -4207,126 +4245,167 @@ gUnknown_08E9AC2C:: @ 8E9AC2C gUnknown_08E9AC4C:: @ 8E9AC4C .incbin "baserom.gba", 0xE9AC4C, 0x18F @ LZ, uncomp. size = 0x500 +@ text window frames + .align 2 -gUnknown_08E9ADDC:: - .incbin "baserom.gba", 0x00e9addc, 0x120 +gTextWindowFrame1_Gfx:: + .incbin "graphics/text_window/1.4bpp" -gUnknown_08E9AEFC:: - .incbin "baserom.gba", 0x00e9aefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: + .incbin "graphics/text_window/1.gbapal" -gUnknown_08E9AF1C:: - .incbin "baserom.gba", 0x00e9af1c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: + .incbin "graphics/text_window/2.4bpp" -gUnknown_08E9B03C:: - .incbin "baserom.gba", 0x00e9b03c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: + .incbin "graphics/text_window/2.gbapal" -gUnknown_08E9B05C:: - .incbin "baserom.gba", 0x00e9b05c, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: + .incbin "graphics/text_window/3.4bpp" -gUnknown_08E9B17C:: - .incbin "baserom.gba", 0x00e9b17c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: + .incbin "graphics/text_window/3.gbapal" -gUnknown_08E9B19C:: - .incbin "baserom.gba", 0x00e9b19c, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: + .incbin "graphics/text_window/4.4bpp" -gUnknown_08E9B2BC:: - .incbin "baserom.gba", 0x00e9b2bc, 0x20 + .align 2 +gTextWindowFrame4_Pal:: + .incbin "graphics/text_window/4.gbapal" -gUnknown_08E9B2DC:: - .incbin "baserom.gba", 0x00e9b2dc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: + .incbin "graphics/text_window/5.4bpp" -gUnknown_08E9B3FC:: - .incbin "baserom.gba", 0x00e9b3fc, 0x20 + .align 2 +gTextWindowFrame5_Pal:: + .incbin "graphics/text_window/5.gbapal" -gUnknown_08E9B41C:: - .incbin "baserom.gba", 0x00e9b41c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: + .incbin "graphics/text_window/6.4bpp" -gUnknown_08E9B53C:: - .incbin "baserom.gba", 0x00e9b53c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: + .incbin "graphics/text_window/6.gbapal" -gUnknown_08E9B55C:: - .incbin "baserom.gba", 0x00e9b55c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: + .incbin "graphics/text_window/7.4bpp" -gUnknown_08E9B67C:: - .incbin "baserom.gba", 0x00e9b67c, 0x20 + .align 2 +gTextWindowFrame7_Pal:: + .incbin "graphics/text_window/7.gbapal" -gUnknown_08E9B69C:: - .incbin "baserom.gba", 0x00e9b69c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: + .incbin "graphics/text_window/8.4bpp" -gUnknown_08E9B7BC:: - .incbin "baserom.gba", 0x00e9b7bc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: + .incbin "graphics/text_window/8.gbapal" -gUnknown_08E9B7DC:: - .incbin "baserom.gba", 0x00e9b7dc, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: + .incbin "graphics/text_window/9.4bpp" -gUnknown_08E9B8FC:: - .incbin "baserom.gba", 0x00e9b8fc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: + .incbin "graphics/text_window/9.gbapal" -gUnknown_08E9B91C:: - .incbin "baserom.gba", 0x00e9b91c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: + .incbin "graphics/text_window/10.4bpp" -gUnknown_08E9BA3C:: - .incbin "baserom.gba", 0x00e9ba3c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: + .incbin "graphics/text_window/10.gbapal" -gUnknown_08E9BA5C:: - .incbin "baserom.gba", 0x00e9ba5c, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: + .incbin "graphics/text_window/11.4bpp" -gUnknown_08E9BB7C:: - .incbin "baserom.gba", 0x00e9bb7c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: + .incbin "graphics/text_window/11.gbapal" -gUnknown_08E9BB9C:: - .incbin "baserom.gba", 0x00e9bb9c, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: + .incbin "graphics/text_window/12.4bpp" -gUnknown_08E9BCBC:: - .incbin "baserom.gba", 0x00e9bcbc, 0x20 + .align 2 +gTextWindowFrame12_Pal:: + .incbin "graphics/text_window/12.gbapal" -gUnknown_08E9BCDC:: - .incbin "baserom.gba", 0x00e9bcdc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: + .incbin "graphics/text_window/13.4bpp" -gUnknown_08E9BDFC:: - .incbin "baserom.gba", 0x00e9bdfc, 0x20 + .align 2 +gTextWindowFrame13_Pal:: + .incbin "graphics/text_window/13.gbapal" -gUnknown_08E9BE1C:: - .incbin "baserom.gba", 0x00e9be1c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: + .incbin "graphics/text_window/14.4bpp" -gUnknown_08E9BF3C:: - .incbin "baserom.gba", 0x00e9bf3c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: + .incbin "graphics/text_window/14.gbapal" -gUnknown_08E9BF5C:: - .incbin "baserom.gba", 0x00e9bf5c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: + .incbin "graphics/text_window/15.4bpp" -gUnknown_08E9C07C:: - .incbin "baserom.gba", 0x00e9c07c, 0x20 + .align 2 +gTextWindowFrame15_Pal:: + .incbin "graphics/text_window/15.gbapal" -gUnknown_08E9C09C:: - .incbin "baserom.gba", 0x00e9c09c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: + .incbin "graphics/text_window/16.4bpp" -gUnknown_08E9C1BC:: - .incbin "baserom.gba", 0x00e9c1bc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: + .incbin "graphics/text_window/16.gbapal" -gUnknown_08E9C1DC:: - .incbin "baserom.gba", 0x00e9c1dc, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: + .incbin "graphics/text_window/17.4bpp" -gUnknown_08E9C2FC:: - .incbin "baserom.gba", 0x00e9c2fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: + .incbin "graphics/text_window/17.gbapal" -gUnknown_08E9C31C:: - .incbin "baserom.gba", 0x00e9c31c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: + .incbin "graphics/text_window/18.4bpp" -gUnknown_08E9C43C:: - .incbin "baserom.gba", 0x00e9c43c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: + .incbin "graphics/text_window/18.gbapal" -gUnknown_08E9C45C:: - .incbin "baserom.gba", 0x00e9c45c, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: + .incbin "graphics/text_window/19.4bpp" -gUnknown_08E9C57C:: - .incbin "baserom.gba", 0x00e9c57c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: + .incbin "graphics/text_window/19.gbapal" -gUnknown_08E9C59C:: - .incbin "baserom.gba", 0x00e9c59c, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: + .incbin "graphics/text_window/20.4bpp" -gUnknown_08E9C6BC:: - .incbin "baserom.gba", 0x00e9c6bc, 0x20 + .align 2 +gTextWindowFrame20_Pal:: + .incbin "graphics/text_window/20.gbapal" .align 2 gUnknown_08E9C6DC:: @ 8E9C6DC diff --git a/graphics/interface/wordgroup_frame.png b/graphics/interface/wordgroup_frame.png Binary files differnew file mode 100644 index 000000000..71a26aab4 --- /dev/null +++ b/graphics/interface/wordgroup_frame.png diff --git a/graphics/misc/clock.png b/graphics/misc/clock.png Binary files differnew file mode 100644 index 000000000..28780c1d1 --- /dev/null +++ b/graphics/misc/clock.png diff --git a/graphics/pokemon_storage/hof_header.pal b/graphics/pokemon_storage/hof_header.pal new file mode 100644 index 000000000..b4fffc172 --- /dev/null +++ b/graphics/pokemon_storage/hof_header.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 213 230 +255 32 32 +255 180 230 +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 +65 65 65 +255 255 255 diff --git a/graphics/pokemon_storage/hof_header.png b/graphics/pokemon_storage/hof_header.png Binary files differnew file mode 100644 index 000000000..b60489544 --- /dev/null +++ b/graphics/pokemon_storage/hof_header.png diff --git a/graphics/slot_machine/reel_time_lights.png b/graphics/slot_machine/reel_time_lights.png Binary files differnew file mode 100644 index 000000000..8295aeca2 --- /dev/null +++ b/graphics/slot_machine/reel_time_lights.png diff --git a/graphics/slot_machine/slots.png b/graphics/slot_machine/slots.png Binary files differnew file mode 100644 index 000000000..291f467c3 --- /dev/null +++ b/graphics/slot_machine/slots.png diff --git a/graphics/text_window/1.pal b/graphics/text_window/1.pal new file mode 100644 index 000000000..08c365c84 --- /dev/null +++ b/graphics/text_window/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 98 +41 49 49 +74 74 106 +115 106 131 +98 98 148 +115 115 172 +139 139 205 +172 189 172 +222 213 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png Binary files differnew file mode 100644 index 000000000..5d8020eff --- /dev/null +++ b/graphics/text_window/1.png diff --git a/graphics/text_window/10.pal b/graphics/text_window/10.pal new file mode 100644 index 000000000..7ba0c53b6 --- /dev/null +++ b/graphics/text_window/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +255 180 131 +255 49 0 +255 131 82 +205 115 0 +164 123 49 +131 98 24 +172 139 65 +255 164 8 +189 180 123 +222 213 156 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png Binary files differnew file mode 100644 index 000000000..4295c681c --- /dev/null +++ b/graphics/text_window/10.png diff --git a/graphics/text_window/11.pal b/graphics/text_window/11.pal new file mode 100644 index 000000000..449263e0f --- /dev/null +++ b/graphics/text_window/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +106 115 115 +32 57 205 +82 131 230 +131 156 222 +164 180 230 +189 205 238 +222 230 246 +0 0 0 +180 106 189 +213 148 238 +222 180 238 +238 213 246 +255 255 255 +74 65 82 diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png Binary files differnew file mode 100644 index 000000000..a0e576fce --- /dev/null +++ b/graphics/text_window/11.png diff --git a/graphics/text_window/12.pal b/graphics/text_window/12.pal new file mode 100644 index 000000000..efb2c1ec3 --- /dev/null +++ b/graphics/text_window/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +74 74 106 +148 90 164 +115 131 65 +156 189 32 +205 246 0 +238 213 74 +255 230 148 +255 148 57 +98 115 123 +123 156 139 +156 205 156 +205 49 57 +255 255 255 +74 65 82 diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png Binary files differnew file mode 100644 index 000000000..c41f18a6d --- /dev/null +++ b/graphics/text_window/12.png diff --git a/graphics/text_window/13.pal b/graphics/text_window/13.pal new file mode 100644 index 000000000..59540758f --- /dev/null +++ b/graphics/text_window/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +180 189 180 +222 213 222 +255 0 255 +255 0 255 +123 115 90 +205 172 115 +238 205 139 +32 74 172 +90 205 213 +74 115 197 +255 0 255 +255 0 255 +255 255 255 +74 65 82 diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png Binary files differnew file mode 100644 index 000000000..d401f030d --- /dev/null +++ b/graphics/text_window/13.png diff --git a/graphics/text_window/14.pal b/graphics/text_window/14.pal new file mode 100644 index 000000000..492f7de72 --- /dev/null +++ b/graphics/text_window/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +106 74 16 +180 189 180 +222 213 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 123 57 +205 172 106 +230 180 115 +230 189 115 +238 205 131 +255 230 164 +255 255 255 +74 65 82 diff --git a/graphics/text_window/14.png b/graphics/text_window/14.png Binary files differnew file mode 100644 index 000000000..8a03bcbf4 --- /dev/null +++ b/graphics/text_window/14.png diff --git a/graphics/text_window/15.pal b/graphics/text_window/15.pal new file mode 100644 index 000000000..8c1141e05 --- /dev/null +++ b/graphics/text_window/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +172 123 156 +106 90 115 +82 98 156 +189 156 213 +205 180 222 +222 205 230 +238 230 238 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +255 255 255 +74 65 82 diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png Binary files differnew file mode 100644 index 000000000..919dcf9da --- /dev/null +++ b/graphics/text_window/15.png diff --git a/graphics/text_window/16.pal b/graphics/text_window/16.pal new file mode 100644 index 000000000..8b827a70f --- /dev/null +++ b/graphics/text_window/16.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 57 197 +32 41 115 +246 246 49 +123 123 49 +255 74 65 +156 41 32 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png Binary files differnew file mode 100644 index 000000000..e2f98ae84 --- /dev/null +++ b/graphics/text_window/16.png diff --git a/graphics/text_window/17.pal b/graphics/text_window/17.pal new file mode 100644 index 000000000..627af66d5 --- /dev/null +++ b/graphics/text_window/17.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +106 115 115 +180 180 180 +82 98 156 +197 180 172 +205 197 189 +222 213 213 +238 230 230 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +255 255 246 +74 65 82 diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png Binary files differnew file mode 100644 index 000000000..382fa11d9 --- /dev/null +++ b/graphics/text_window/17.png diff --git a/graphics/text_window/18.pal b/graphics/text_window/18.pal new file mode 100644 index 000000000..e523123c7 --- /dev/null +++ b/graphics/text_window/18.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 164 +189 148 8 +255 189 0 +255 230 0 +255 255 148 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png Binary files differnew file mode 100644 index 000000000..cd065e426 --- /dev/null +++ b/graphics/text_window/18.png diff --git a/graphics/text_window/19.pal b/graphics/text_window/19.pal new file mode 100644 index 000000000..4615c7881 --- /dev/null +++ b/graphics/text_window/19.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +180 189 180 +222 213 222 +98 131 57 +255 123 82 +222 98 49 +164 49 16 +238 255 164 +238 213 131 +255 0 255 +197 255 123 +164 213 82 +131 189 65 +255 255 255 +74 65 82 diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png Binary files differnew file mode 100644 index 000000000..d33a1b613 --- /dev/null +++ b/graphics/text_window/19.png diff --git a/graphics/text_window/2.pal b/graphics/text_window/2.pal new file mode 100644 index 000000000..ac32c4606 --- /dev/null +++ b/graphics/text_window/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +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 +255 255 255 +74 65 82 diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png Binary files differnew file mode 100644 index 000000000..5e89b4116 --- /dev/null +++ b/graphics/text_window/2.png diff --git a/graphics/text_window/20.pal b/graphics/text_window/20.pal new file mode 100644 index 000000000..a7f9e1fbd --- /dev/null +++ b/graphics/text_window/20.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +255 213 255 +255 180 222 +131 82 24 +255 131 131 +238 65 65 +156 213 156 +106 164 106 +49 106 49 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/20.png b/graphics/text_window/20.png Binary files differnew file mode 100644 index 000000000..662ae45e3 --- /dev/null +++ b/graphics/text_window/20.png diff --git a/graphics/text_window/3.pal b/graphics/text_window/3.pal new file mode 100644 index 000000000..3c5120d11 --- /dev/null +++ b/graphics/text_window/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 246 +255 123 115 +222 74 65 +106 49 41 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png Binary files differnew file mode 100644 index 000000000..b7af18de7 --- /dev/null +++ b/graphics/text_window/3.png diff --git a/graphics/text_window/4.pal b/graphics/text_window/4.pal new file mode 100644 index 000000000..c8e024332 --- /dev/null +++ b/graphics/text_window/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +57 74 74 +106 123 123 +156 172 172 +205 222 222 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/4.png b/graphics/text_window/4.png Binary files differnew file mode 100644 index 000000000..c33ed48af --- /dev/null +++ b/graphics/text_window/4.png diff --git a/graphics/text_window/5.pal b/graphics/text_window/5.pal new file mode 100644 index 000000000..5d81802e2 --- /dev/null +++ b/graphics/text_window/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +222 213 222 +0 222 255 +123 57 0 +230 123 0 +255 255 41 +0 106 0 +0 172 0 +115 255 41 +139 0 0 +205 49 0 +255 189 0 +0 0 180 +0 106 213 +255 255 255 +74 65 82 diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png Binary files differnew file mode 100644 index 000000000..515bb02e2 --- /dev/null +++ b/graphics/text_window/5.png diff --git a/graphics/text_window/6.pal b/graphics/text_window/6.pal new file mode 100644 index 000000000..3bb5b2006 --- /dev/null +++ b/graphics/text_window/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 180 238 +82 115 115 +148 189 156 +0 41 0 +90 115 106 +115 148 131 +98 74 41 +189 205 197 +115 90 57 +65 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/6.png b/graphics/text_window/6.png Binary files differnew file mode 100644 index 000000000..a0be4e49d --- /dev/null +++ b/graphics/text_window/6.png diff --git a/graphics/text_window/7.pal b/graphics/text_window/7.pal new file mode 100644 index 000000000..142d57bc8 --- /dev/null +++ b/graphics/text_window/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +139 49 49 +172 57 57 +205 65 65 +230 74 74 +255 82 82 +189 106 106 +255 131 131 +164 156 156 +213 197 197 +238 230 230 +222 213 213 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png Binary files differnew file mode 100644 index 000000000..fd8df61c1 --- /dev/null +++ b/graphics/text_window/7.png diff --git a/graphics/text_window/8.pal b/graphics/text_window/8.pal new file mode 100644 index 000000000..4d80d0f89 --- /dev/null +++ b/graphics/text_window/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +82 189 0 +139 246 41 +156 115 41 +131 98 24 +172 139 65 +246 98 131 +255 156 180 +255 246 0 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png Binary files differnew file mode 100644 index 000000000..480751a02 --- /dev/null +++ b/graphics/text_window/8.png diff --git a/graphics/text_window/9.pal b/graphics/text_window/9.pal new file mode 100644 index 000000000..b0e3b49e6 --- /dev/null +++ b/graphics/text_window/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 246 255 +90 131 189 +115 156 213 +156 197 255 +197 238 255 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/9.png b/graphics/text_window/9.png Binary files differnew file mode 100644 index 000000000..2b8b5bd54 --- /dev/null +++ b/graphics/text_window/9.png @@ -232,4 +232,10 @@ $(PSSGFXDIR)/header.4bpp: $(PSSGFXDIR)/header.png $(GFX) $< $@ -num_tiles 47 $(PSSGFXDIR)/misc1.4bpp: $(PSSGFXDIR)/misc1.png - $(GFX) $< $@ -num_tiles 100 + $(GFX) $< $@ -num_tiles 91 + +$(PSSGFXDIR)/hof_header.4bpp: $(PSSGFXDIR)/hof_header.png + $(GFX) $< $@ -num_tiles 37 + +$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png + $(GFX) $< $@ -num_tiles 65 |