diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-06-14 17:27:21 -0400 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-06-14 14:27:21 -0700 |
commit | f2654a380e46152f2624174e8087b6998cccb91b (patch) | |
tree | 7556ca6a85eab04f07fcb188059071c42ed2d668 | |
parent | abf89edae8dc5cd52428144288faef077999a910 (diff) |
Dump graphics from graphics.s (#7)
* dump rom header as bytes
* dissassemble egg hatching animation image
* dissassemble gba picture for trading and its palette
* split egg images and add dissassemble trade shadow
* dump menu graphics and palette - requires precompressed files due to broken gbagfx
* fix menu graphics and include palette
* update makefile because it didnt want to include makefile in commit
* dump unused character table
* finish fixing menu concatenation
* dump open pokeball graphic
* dissassemble pokeball icons
* rename openball file
* dump rest of D019E4 as unknown bins and graphic
* dissassemble gBattleAnimPicTable
46 files changed, 806 insertions, 18 deletions
@@ -63,6 +63,7 @@ include castform.mk include tilesets.mk include fonts.mk include generated.mk +include menu.mk %.png: ; %.pal: ; diff --git a/data/data2.s b/data/data2.s index 84cce0306..ed5b1ea4a 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1233,7 +1233,12 @@ gUnknown_08209AC4: @ 8209AC4 gUnknown_08209AD4: @ 8209AD4 .string "タマゴ$" - .incbin "baserom.gba", 0x00209ad8, 0x8d8 + .incbin "graphics/pokemon/egg/palette.gbapal" + .incbin "graphics/pokemon/egg/egg_hatch.4bpp" + .incbin "graphics/pokemon/egg/egg_crumble.4bpp" + + .space 2 + .incbin "baserom.gba", 0x0020A37A, 0x36 .global gUnknown_0820A3B0 gUnknown_0820A3B0: @ 820A3B0 @@ -1412,12 +1417,35 @@ gUnknown_0820A904: @ 820A904 .incbin "baserom.gba", 0x0020a904, 0x28 .global gUnknown_0820A92C -gUnknown_0820A92C: @ 820A92C - .incbin "baserom.gba", 0x0020a92c, 0x60 - - .global gUnknown_0820A98C +gUnknown_0820A92C: @ 820A92C @ graphics + obj_tiles gInterfaceGfx_PokeBall, 384, 0xd6d8 @ poke + obj_tiles gInterfaceGfx_GreatBall, 384, 0xd6d9 @ great + obj_tiles gInterfaceGfx_SafariBall, 384, 0xd6da @ safari + obj_tiles gInterfaceGfx_UltraBall, 384, 0xd6db @ ultra + obj_tiles gInterfaceGfx_MasterBall, 384, 0xd6dc @ master + obj_tiles gInterfaceGfx_NetBall, 384, 0xd6dd @ net + obj_tiles gInterfaceGfx_DiveBall, 384, 0xd6de @ dive + obj_tiles gInterfaceGfx_NestBall, 384, 0xd6df @ nest + obj_tiles gInterfaceGfx_RepeatBall, 384, 0xd6e0 @ repeat + obj_tiles gInterfaceGfx_TimerBall, 384, 0xd6e1 @ timer + obj_tiles gInterfaceGfx_LuxuryBall, 384, 0xd6e2 @ luxury + obj_tiles gInterfaceGfx_PremierBall, 384, 0xd6e3 @ premier + + .global gUnknown_0820A98C @ palettes gUnknown_0820A98C: @ 820A98C - .incbin "baserom.gba", 0x0020a98c, 0x128 + obj_pal gInterfacePal_PokeBall, 0xD6D8 @ poke + obj_pal gInterfacePal_GreatBall, 0xD6D9 @ great + obj_pal gInterfacePal_SafariBall, 0xD6DA @ safari + obj_pal gInterfacePal_UltraBall, 0xD6DB @ ultra + obj_pal gInterfacePal_MasterBall, 0xD6DC @ master + obj_pal gInterfacePal_NetBall, 0xD6DD @ net + obj_pal gInterfacePal_DiveBall, 0xD6DE @ dive + obj_pal gInterfacePal_NestBall, 0xD6DF @ nest + obj_pal gInterfacePal_RepeatBall, 0xD6E0 @ repeat + obj_pal gInterfacePal_TimerBall, 0xD6E1 @ timer + obj_pal gInterfacePal_LuxuryBall, 0xD6E2 @ luxury + obj_pal gInterfacePal_PremierBall, 0xD6E3 @ premier + .incbin "baserom.gba", 0x0020A9EC, 0xC8 .global gUnknown_0820AAB4 gUnknown_0820AAB4: @ 820AAB4 @@ -1571,27 +1599,34 @@ gUnknown_0820C3B0: @ 820C3B0 .global gUnknown_0820C3D1 gUnknown_0820C3D1: @ 820C3D1 - .incbin "baserom.gba", 0x0020c3d1, 0x627 + .incbin "baserom.gba", 0x0020c3d1, 0x7 + .incbin "graphics/interface/ball_open.gbapal" + .incbin "baserom.gba", 0x0020c3f8, 0x600 .global gUnknown_0820C9F8 gUnknown_0820C9F8: @ 820C9F8 - .incbin "baserom.gba", 0x0020c9f8, 0xa0 + .incbin "baserom.gba", 0x0020c9f8, 0x20 + .incbin "graphics/interface/gba.gbapal" + .incbin "graphics/interface/trade_shadow.gbapal" + .incbin "baserom.gba", 0x0020ca58, 0x20 @ blank + .incbin "baserom.gba", 0x0020ca78, 0x20 .global gUnknown_0820CA98 gUnknown_0820CA98: @ 820CA98 - .incbin "baserom.gba", 0x0020ca98, 0x1300 + .incbin "graphics/interface/gba.4bpp" + .incbin "graphics/interface/trade_shadow.4bpp" .global gUnknown_0820DD98 gUnknown_0820DD98: @ 820DD98 - .incbin "baserom.gba", 0x0020dd98, 0x1a00 + .incbin "baserom.gba", 0x0020dd98, 0x1a00 @ unused? .global gUnknown_0820F798 gUnknown_0820F798: @ 820F798 - .incbin "baserom.gba", 0x0020f798, 0x1000 + .incbin "baserom.gba", 0x0020f798, 0x1000 .global gUnknown_08210798 gUnknown_08210798: @ 8210798 - .incbin "baserom.gba", 0x00210798, 0x1000 + .incbin "baserom.gba", 0x00210798, 0x1000 @ debug? .global gUnknown_08211798 gUnknown_08211798: @ 8211798 @@ -1603,7 +1638,7 @@ gUnknown_08211F98: @ 8211F98 .global gUnknown_08213738 gUnknown_08213738: @ 8213738 - .incbin "baserom.gba", 0x00213738, 0x2040 + .incbin "baserom.gba", 0x00213738, 0x2040 @ copy of gba .global gUnknown_08215778 gUnknown_08215778: @ 8215778 @@ -4094,7 +4129,295 @@ gUnknown_0837DEF4: @ 837DEF4 .global gBattleAnimPicTable gBattleAnimPicTable: @ 837E164 - .incbin "baserom.gba", 0x0037e164, 0x908 + obj_tiles 0x08d03308, 512, 0x2710 + obj_tiles 0x08d1ca44, 768, 0x2711 + obj_tiles 0x08d20b30, 512, 0x2712 + obj_tiles 0x08d033b8, 256, 0x2713 + obj_tiles 0x08d0342c, 512, 0x2714 + obj_tiles 0x08d034dc, 1024, 0x2715 + obj_tiles 0x08d035b0, 384, 0x2716 + obj_tiles 0x08d0379c, 2048, 0x2717 + obj_tiles 0x08d03938, 32, 0x2718 + obj_tiles 0x08d03d74, 1024, 0x2719 + obj_tiles 0x08d03994, 4608, 0x271a + obj_tiles 0x08d0407c, 384, 0x271b + obj_tiles 0x08d0411c, 128, 0x271c + obj_tiles 0x08d04208, 128, 0x271d + obj_tiles 0x08d1ff80, 640, 0x271e + obj_tiles 0x08d04254, 128, 0x271f + obj_tiles 0x08d042e8, 256, 0x2720 + obj_tiles 0x08d04368, 32, 0x2721 + obj_tiles 0x08d25128, 128, 0x2722 + obj_tiles 0x08d043c8, 1024, 0x2723 + obj_tiles 0x08d04488, 512, 0x2724 + obj_tiles 0x08d047f8, 2560, 0x2725 + obj_tiles 0x08d047f8, 2560, 0x2726 + obj_tiles 0x08d045a4, 896, 0x2727 + obj_tiles 0x08d04c70, 768, 0x2728 + obj_tiles 0x08d04b80, 2560, 0x2729 + obj_tiles 0x08d05264, 2560, 0x272a + obj_tiles 0x08d055ec, 2560, 0x272b + obj_tiles 0x08d05910, 2560, 0x272c + obj_tiles 0x08d05c60, 2560, 0x272d + obj_tiles 0x08d05f40, 2560, 0x272e + obj_tiles 0x08d04d50, 3584, 0x272f + obj_tiles 0x08d05178, 896, 0x2730 + obj_tiles 0x08d0634c, 4096, 0x2731 + obj_tiles 0x08d06cbc, 2048, 0x2732 + obj_tiles 0x08d07088, 2560, 0x2733 + obj_tiles 0x08d07448, 2048, 0x2734 + obj_tiles 0x08d0781c, 2560, 0x2735 + obj_tiles 0x08d08734, 2560, 0x2736 + obj_tiles 0x08d08958, 2560, 0x2737 + obj_tiles 0x08d08c54, 2560, 0x2738 + obj_tiles 0x08d08e60, 2560, 0x2739 + obj_tiles 0x08d09000, 2560, 0x273a + obj_tiles 0x08d092f8, 2560, 0x273b + obj_tiles 0x08d09748, 2560, 0x273c + obj_tiles 0x08d099dc, 2560, 0x273d + obj_tiles 0x08d09e5c, 4096, 0x273e + obj_tiles 0x08d09e5c, 4096, 0x273f + obj_tiles 0x08d0a280, 4096, 0x2740 + obj_tiles 0x08d0a280, 4096, 0x2741 + obj_tiles 0x08d0a58c, 512, 0x2742 + obj_tiles 0x08d0a62c, 512, 0x2743 + obj_tiles 0x08d0a6d8, 512, 0x2744 + obj_tiles 0x08d2ebdc, 2048, 0x2745 + obj_tiles 0x08d0a938, 128, 0x2746 + obj_tiles 0x08d0ae4c, 512, 0x2747 + obj_tiles 0x08d0a97c, 4096, 0x2748 + obj_tiles 0x08d0af10, 384, 0x2749 + obj_tiles 0x08d0afbc, 3072, 0x274a + obj_tiles 0x08d0b44c, 256, 0x274b + obj_tiles 0x08d0b4c8, 64, 0x274c + obj_tiles 0x08d0b50c, 384, 0x274d + obj_tiles 0x08d0b5dc, 2048, 0x274e + obj_tiles 0x08d0b9d4, 1152, 0x274f + obj_tiles 0x08d234b0, 512, 0x2750 + obj_tiles 0x08d0bc4c, 512, 0x2751 + obj_tiles 0x08d0bd80, 256, 0x2752 + obj_tiles 0x08d0bc4c, 512, 0x2753 + obj_tiles 0x08d0bc4c, 512, 0x2754 + obj_tiles 0x08d0bc4c, 512, 0x2755 + obj_tiles 0x08d0bdf4, 512, 0x2756 + obj_tiles 0x08d0be9c, 2560, 0x2757 + obj_tiles 0x08d0c0c8, 768, 0x2758 + obj_tiles 0x08d0c1b0, 384, 0x2759 + obj_tiles 0x08d1b600, 160, 0x275a + obj_tiles 0x08d0c2ec, 1792, 0x275b + obj_tiles 0x08d14e90, 1024, 0x275c + obj_tiles 0x08d150f4, 512, 0x275d + obj_tiles 0x08d0c58c, 768, 0x275e + obj_tiles 0x08d0c74c, 3072, 0x275f + obj_tiles 0x08d0cb7c, 2560, 0x2760 + obj_tiles 0x08d0cf04, 128, 0x2761 + obj_tiles 0x08d0d120, 64, 0x2762 + obj_tiles 0x08d0d3a8, 3584, 0x2763 + obj_tiles 0x08d0d84c, 3584, 0x2764 + obj_tiles 0x08d0dc10, 640, 0x2765 + obj_tiles 0x08d0dcc8, 512, 0x2766 + obj_tiles 0x08d250a8, 128, 0x2767 + obj_tiles 0x08d0de38, 192, 0x2768 + obj_tiles 0x08d0de88, 2560, 0x2769 + obj_tiles 0x08d0e0fc, 512, 0x276a + obj_tiles 0x08d0e18c, 384, 0x276b + obj_tiles 0x08d0e2c0, 128, 0x276c + obj_tiles 0x08d0e33c, 4096, 0x276d + obj_tiles 0x08d0ea0c, 2560, 0x276e + obj_tiles 0x08d0ebb0, 384, 0x276f + obj_tiles 0x08d0ec60, 896, 0x2770 + obj_tiles 0x08d0edd0, 3072, 0x2771 + obj_tiles 0x08d0efb0, 512, 0x2772 + obj_tiles 0x08d28098, 512, 0x2773 + obj_tiles 0x08d0f0e8, 512, 0x2774 + obj_tiles 0x08d0f1e8, 512, 0x2775 + obj_tiles 0x08d0f318, 1024, 0x2776 + obj_tiles 0x08d0f4b0, 128, 0x2777 + obj_tiles 0x08d0f51c, 1024, 0x2778 + obj_tiles 0x08d0f704, 3072, 0x2779 + obj_tiles 0x08d0fcb0, 512, 0x277a + obj_tiles 0x08d0fda0, 4096, 0x277b + obj_tiles 0x08d10174, 2560, 0x277c + obj_tiles 0x08d104f8, 32, 0x277d + obj_tiles 0x08d10548, 3584, 0x277e + obj_tiles 0x08d1092c, 128, 0x277f + obj_tiles 0x08d10994, 2560, 0x2780 + obj_tiles 0x08d10ce4, 1024, 0x2781 + obj_tiles 0x08d10f78, 512, 0x2782 + obj_tiles 0x08d11b74, 1792, 0x2783 + obj_tiles 0x08d1302c, 2048, 0x2784 + obj_tiles 0x08d13300, 2560, 0x2785 + obj_tiles 0x08d13558, 1536, 0x2786 + obj_tiles 0x08d1370c, 2048, 0x2787 + obj_tiles 0x08d139c4, 512, 0x2788 + obj_tiles 0x08d13ae0, 64, 0x2789 + obj_tiles 0x08d13b30, 384, 0x278a + obj_tiles 0x08d13c48, 1536, 0x278b + obj_tiles 0x08d13d84, 1536, 0x278c + obj_tiles 0x08d14044, 512, 0x278d + obj_tiles 0x08d14158, 128, 0x278e + obj_tiles 0x08d141e0, 512, 0x278f + obj_tiles 0x08d143a4, 2048, 0x2790 + obj_tiles 0x08d14630, 128, 0x2791 + obj_tiles 0x08d14694, 2560, 0x2792 + obj_tiles 0x08d14a8c, 640, 0x2793 + obj_tiles 0x08d14bfc, 640, 0x2794 + obj_tiles 0x08d14d1c, 256, 0x2795 + obj_tiles 0x08d14dc0, 512, 0x2796 + obj_tiles 0x08d1a704, 512, 0x2797 + obj_tiles 0x08d1a8a4, 32, 0x2798 + obj_tiles 0x08d1a8f0, 2560, 0x2799 + obj_tiles 0x08d1aea4, 2048, 0x279a + obj_tiles 0x08d1aaf4, 2048, 0x279b + obj_tiles 0x08d1aff0, 192, 0x279c + obj_tiles 0x08d1b090, 448, 0x279d + obj_tiles 0x08d1b1b8, 256, 0x279e + obj_tiles 0x08d2cf58, 2048, 0x279f + obj_tiles 0x08d1bfc8, 512, 0x27a0 + obj_tiles 0x08d1ad04, 2048, 0x27a1 + obj_tiles 0x08d03248, 384, 0x27a2 + obj_tiles 0x08d1b2d0, 384, 0x27a3 + obj_tiles 0x08d1b4dc, 512, 0x27a4 + obj_tiles 0x08d1b40c, 512, 0x27a5 + obj_tiles 0x08d1b68c, 384, 0x27a6 + obj_tiles 0x08d1b77c, 1024, 0x27a7 + obj_tiles 0x08d0419c, 128, 0x27a8 + obj_tiles 0x08d1b874, 256, 0x27a9 + obj_tiles 0x08d1b8f8, 256, 0x27aa + obj_tiles 0x08d1b9c4, 320, 0x27ab + obj_tiles 0x08d1baac, 2048, 0x27ac + obj_tiles 0x08d1bcec, 512, 0x27ad + obj_tiles 0x08d1bd68, 256, 0x27ae + obj_tiles 0x08d1be54, 160, 0x27af + obj_tiles 0x08d1bef8, 256, 0x27b0 + obj_tiles 0x08d0374c, 128, 0x27b1 + obj_tiles 0x08d1c1a4, 768, 0x27b2 + obj_tiles 0x08d1c248, 256, 0x27b3 + obj_tiles 0x08d1c248, 256, 0x27b4 + obj_tiles 0x08d1c248, 256, 0x27b5 + obj_tiles 0x08d1c308, 2048, 0x27b6 + obj_tiles 0x08d1c308, 2048, 0x27b7 + obj_tiles 0x08d1c308, 2048, 0x27b8 + obj_tiles 0x08d1c308, 2048, 0x27b9 + obj_tiles 0x08d1c308, 2048, 0x27ba + obj_tiles 0x08d1c6b4, 128, 0x27bb + obj_tiles 0x08d1bfc8, 512, 0x27bc + obj_tiles 0x08d1cb20, 512, 0x27bd + obj_tiles 0x08d1d960, 512, 0x27be + obj_tiles 0x08d1da28, 128, 0x27bf + obj_tiles 0x08d1dab4, 512, 0x27c0 + obj_tiles 0x08d1dc34, 1280, 0x27c1 + obj_tiles 0x08d1dd10, 2048, 0x27c2 + obj_tiles 0x08d1dec8, 1024, 0x27c3 + obj_tiles 0x08d1dfa4, 32, 0x27c4 + obj_tiles 0x08d1dfbc, 2048, 0x27c5 + obj_tiles 0x08d1e34c, 256, 0x27c6 + obj_tiles 0x08d1e418, 2048, 0x27c7 + obj_tiles 0x08d1e6b8, 1024, 0x27c8 + obj_tiles 0x08d1e834, 2560, 0x27c9 + obj_tiles 0x08d1f13c, 4096, 0x27ca + obj_tiles 0x08d1ef2c, 2048, 0x27cb + obj_tiles 0x08e71228, 1024, 0x27cc + obj_tiles 0x08d20544, 512, 0x27cd + obj_tiles 0x08d20030, 2048, 0x27ce + obj_tiles 0x08d202b0, 2048, 0x27cf + obj_tiles 0x08d205e8, 2048, 0x27d0 + obj_tiles 0x08d20890, 512, 0x27d1 + obj_tiles 0x08d20ff8, 2048, 0x27d2 + obj_tiles 0x08d21358, 512, 0x27d3 + obj_tiles 0x08d20c3c, 2048, 0x27d4 + obj_tiles 0x08d21430, 512, 0x27d5 + obj_tiles 0x08d215c8, 2048, 0x27d6 + obj_tiles 0x08d219e0, 1024, 0x27d7 + obj_tiles 0x08d21ac4, 512, 0x27d8 + obj_tiles 0x08d21c20, 2688, 0x27d9 + obj_tiles 0x08d22454, 1536, 0x27da + obj_tiles 0x08d225e0, 2048, 0x27db + obj_tiles 0x08d222b8, 512, 0x27dc + obj_tiles 0x08d22a50, 1536, 0x27dd + obj_tiles 0x08d227b0, 2048, 0x27de + obj_tiles 0x08d22ca8, 384, 0x27df + obj_tiles 0x08d22d98, 2048, 0x27e0 + obj_tiles 0x08d23188, 2048, 0x27e1 + obj_tiles 0x08d235c4, 128, 0x27e2 + obj_tiles 0x08d2465c, 128, 0x27e3 + obj_tiles 0x08d24428, 2048, 0x27e4 + obj_tiles 0x08d246ac, 2048, 0x27e5 + obj_tiles 0x08d2493c, 1536, 0x27e6 + obj_tiles 0x08d24bcc, 1536, 0x27e7 + obj_tiles 0x08d235c4, 128, 0x27e8 + obj_tiles 0x08d243a0, 128, 0x27e9 + obj_tiles 0x08d24ffc, 384, 0x27ea + obj_tiles 0x08d235c4, 128, 0x27eb + obj_tiles 0x08d251a8, 512, 0x27ec + obj_tiles 0x08d252f4, 1024, 0x27ed + obj_tiles 0x08d25558, 2560, 0x27ee + obj_tiles 0x08d2588c, 2048, 0x27ef + obj_tiles 0x08d25b40, 512, 0x27f0 + obj_tiles 0x08d27b10, 1024, 0x27f1 + obj_tiles 0x08d27e04, 128, 0x27f2 + obj_tiles 0x08d27cbc, 2048, 0x27f3 + obj_tiles 0x08d25ec8, 512, 0x27f4 + obj_tiles 0x08d27eb4, 768, 0x27f5 + obj_tiles 0x08d25c64, 2048, 0x27f6 + obj_tiles 0x08d28740, 896, 0x27f7 + obj_tiles 0x08d281e0, 2048, 0x27f8 + obj_tiles 0x08d28910, 192, 0x27f9 + obj_tiles 0x08d289bc, 2048, 0x27fa + obj_tiles 0x08d28c2c, 96, 0x27fb + obj_tiles 0x08d28c2c, 96, 0x27fc + obj_tiles 0x08d28c2c, 96, 0x27fd + obj_tiles 0x08d28ba0, 128, 0x27fe + obj_tiles 0x08d2ce4c, 384, 0x27ff + obj_tiles 0x08d2d1a0, 384, 0x2800 + obj_tiles 0x08d2d6f4, 512, 0x2801 + obj_tiles 0x08d2d91c, 512, 0x2802 + obj_tiles 0x08d2da7c, 32, 0x2803 + obj_tiles 0x08d2e900, 1024, 0x2804 + obj_tiles 0x08d2e2b4, 1536, 0x2805 + obj_tiles 0x08d2e458, 4096, 0x2806 + obj_tiles 0x08d2e9f8, 1024, 0x2807 + obj_tiles 0x08d2ef50, 32, 0x2808 + obj_tiles 0x08d2ef80, 128, 0x2809 + obj_tiles 0x08d2eff0, 2048, 0x280a + obj_tiles 0x08d2f1e4, 128, 0x280b + obj_tiles 0x08d2f260, 512, 0x280c + obj_tiles 0x08d2f39c, 1024, 0x280d + obj_tiles 0x08d2f5a0, 512, 0x280e + obj_tiles 0x08d2f700, 512, 0x280f + obj_tiles 0x08d2f89c, 2048, 0x2810 + obj_tiles 0x08d2fc50, 640, 0x2811 + obj_tiles 0x08d2f78c, 512, 0x2812 + obj_tiles 0x08d1b40c, 512, 0x2813 + obj_tiles 0x08e685a8, 1024, 0x2814 + obj_tiles 0x08e67d6c, 512, 0x2815 + obj_tiles 0x08e69308, 512, 0x2816 + obj_tiles 0x08e6e6ac, 128, 0x2817 + obj_tiles 0x08e695b8, 32, 0x2818 + obj_tiles 0x08e695b8, 32, 0x2819 + obj_tiles 0x08e6e704, 128, 0x281a + obj_tiles 0x08d24428, 2048, 0x281b + obj_tiles 0x08e695b8, 32, 0x281c + obj_tiles 0x08e69a94, 128, 0x281d + obj_tiles 0x08e7e9fc, 1024, 0x281e + obj_tiles 0x08e7eb3c, 128, 0x281f + obj_tiles 0x08e6982c, 2048, 0x2820 + obj_tiles 0x08e69a6c, 32, 0x2821 + obj_tiles 0x08e69b00, 2048, 0x2822 + obj_tiles 0x08e69c80, 2048, 0x2823 + obj_tiles 0x08e69dec, 2048, 0x2824 + obj_tiles 0x08e6da54, 4096, 0x2825 + obj_tiles 0x08e6e78c, 2048, 0x2826 + obj_tiles 0x08e6e9b4, 160, 0x2827 + obj_tiles 0x08e6a2e8, 2048, 0x2828 + obj_tiles 0x08e6ea1c, 512, 0x2829 + obj_tiles 0x08e7e7f8, 1536, 0x282a + obj_tiles 0x08e6dfdc, 512, 0x282b + obj_tiles 0x08e6f1c0, 2048, 0x282c + obj_tiles 0x08e6f558, 512, 0x282d + obj_tiles 0x08d1e418, 2048, 0x282e + obj_tiles 0x08d0a97c, 4096, 0x282f + obj_tiles 0x08d1c248, 256, 0x2830 .global gBattleAnimPaletteTable gBattleAnimPaletteTable: @ 837EA6C diff --git a/data/graphics.s b/data/graphics.s index 981766fe7..571721a1b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4,11 +4,11 @@ .global gUnknown_08D00000 gUnknown_08D00000: @ 8D00000 - .incbin "baserom.gba", 0x00d00000, 0x4e0 + .incbin "graphics/interface/menu.4bpp.lz" @ menu window and arrows .global gUnknown_08D004E0 gUnknown_08D004E0: @ 8D004E0 - .incbin "baserom.gba", 0x00d004e0, 0x44 + .incbin "graphics/interface/menu.gbapal.lz" .global gUnknown_08D00524 gUnknown_08D00524: @ 8D00524 @@ -18,11 +18,112 @@ gUnknown_08D00524: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.s" @ 8D019E4 - .incbin "baserom.gba", 0xd019e4, 0x16EC + .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff + .incbin "graphics/unused/unknown_D021BC.bin" + .incbin "graphics/unused/unknown_D023E8.bin" + .incbin "graphics/unused/unknown_D02410.4bpp.lz" + .incbin "graphics/unused/unknown_D024F0.bin" + + .global gInterfaceGfx_PokeBall +gInterfaceGfx_PokeBall: + .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC + + .global gInterfacePal_PokeBall +gInterfacePal_PokeBall: + .incbin "graphics/interface/ball/poke.gbapal.lz" + + .global gInterfaceGfx_GreatBall +gInterfaceGfx_GreatBall: + .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC + + .global gInterfacePal_GreatBall +gInterfacePal_GreatBall: + .incbin "graphics/interface/ball/great.gbapal.lz" + + .global gInterfaceGfx_SafariBall +gInterfaceGfx_SafariBall: + .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC + + .global gInterfacePal_SafariBall +gInterfacePal_SafariBall: + .incbin "graphics/interface/ball/safari.gbapal.lz" + + .global gInterfaceGfx_UltraBall +gInterfaceGfx_UltraBall: + .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC + + .global gInterfacePal_UltraBall +gInterfacePal_UltraBall: + .incbin "graphics/interface/ball/ultra.gbapal.lz" + + .global gInterfaceGfx_MasterBall +gInterfaceGfx_MasterBall: + .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC + + .global gInterfacePal_MasterBall +gInterfacePal_MasterBall: + .incbin "graphics/interface/ball/master.gbapal.lz" + + .global gInterfaceGfx_NetBall +gInterfaceGfx_NetBall: + .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC + + .global gInterfacePal_NetBall +gInterfacePal_NetBall: + .incbin "graphics/interface/ball/net.gbapal.lz" + + .global gInterfaceGfx_DiveBall +gInterfaceGfx_DiveBall: + .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC + + .global gInterfacePal_DiveBall +gInterfacePal_DiveBall: + .incbin "graphics/interface/ball/dive.gbapal.lz" + + .global gInterfaceGfx_NestBall +gInterfaceGfx_NestBall: + .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC + + .global gInterfacePal_NestBall +gInterfacePal_NestBall: + .incbin "graphics/interface/ball/nest.gbapal.lz" + + .global gInterfaceGfx_RepeatBall +gInterfaceGfx_RepeatBall: + .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC + + .global gInterfacePal_RepeatBall +gInterfacePal_RepeatBall: + .incbin "graphics/interface/ball/repeat.gbapal.lz" + + .global gInterfaceGfx_TimerBall +gInterfaceGfx_TimerBall: + .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC + + .global gInterfacePal_TimerBall +gInterfacePal_TimerBall: + .incbin "graphics/interface/ball/timer.gbapal.lz" + + .global gInterfaceGfx_LuxuryBall +gInterfaceGfx_LuxuryBall: + .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC + + .global gInterfacePal_LuxuryBall +gInterfacePal_LuxuryBall: + .incbin "graphics/interface/ball/luxury.gbapal.lz" + + .global gInterfaceGfx_PremierBall +gInterfaceGfx_PremierBall: + .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC + + .global gInterfacePal_PremierBall +gInterfacePal_PremierBall: + .incbin "graphics/interface/ball/premier.gbapal.lz" .global gUnknown_08D030D0 gUnknown_08D030D0: @ 8D030D0 - .incbin "baserom.gba", 0x00d030d0, 0x6b78 + .incbin "graphics/interface/ball_open.4bpp.lz" + .incbin "baserom.gba", 0x00d0314c, 0x6AFC .global gUnknown_08D09C48 gUnknown_08D09C48: @ 8D09C48 diff --git a/graphics/interface/ball/dive.pal b/graphics/interface/ball/dive.pal new file mode 100755 index 000000000..1bd07d69d --- /dev/null +++ b/graphics/interface/ball/dive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +90 139 222 +115 164 230 +148 197 238 +180 230 255 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +0 90 156 +24 106 172 +57 123 197 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/dive.png b/graphics/interface/ball/dive.png Binary files differnew file mode 100755 index 000000000..5be9b1ed6 --- /dev/null +++ b/graphics/interface/ball/dive.png diff --git a/graphics/interface/ball/great.pal b/graphics/interface/ball/great.pal new file mode 100755 index 000000000..f19aa5e4a --- /dev/null +++ b/graphics/interface/ball/great.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +98 139 180 +123 156 222 +148 180 222 +180 205 230 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +189 41 90 +222 65 115 +255 98 139 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/great.png b/graphics/interface/ball/great.png Binary files differnew file mode 100755 index 000000000..0c054d7d3 --- /dev/null +++ b/graphics/interface/ball/great.png diff --git a/graphics/interface/ball/luxury.pal b/graphics/interface/ball/luxury.pal new file mode 100755 index 000000000..a49399d01 --- /dev/null +++ b/graphics/interface/ball/luxury.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +49 49 41 +90 90 82 +131 131 123 +180 172 164 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 156 +255 222 106 +255 189 57 +255 156 8 +230 74 24 +180 74 24 +255 255 255 diff --git a/graphics/interface/ball/luxury.png b/graphics/interface/ball/luxury.png Binary files differnew file mode 100755 index 000000000..8056416b2 --- /dev/null +++ b/graphics/interface/ball/luxury.png diff --git a/graphics/interface/ball/master.pal b/graphics/interface/ball/master.pal new file mode 100755 index 000000000..72247849b --- /dev/null +++ b/graphics/interface/ball/master.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +115 16 156 +139 41 172 +164 65 189 +189 90 205 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 98 139 +255 148 172 +255 197 213 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/master.png b/graphics/interface/ball/master.png Binary files differnew file mode 100755 index 000000000..9787a8896 --- /dev/null +++ b/graphics/interface/ball/master.png diff --git a/graphics/interface/ball/nest.pal b/graphics/interface/ball/nest.pal new file mode 100755 index 000000000..4bee9fa12 --- /dev/null +++ b/graphics/interface/ball/nest.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 98 0 +49 148 16 +98 197 32 +156 255 57 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 123 98 +255 172 131 +255 222 172 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/nest.png b/graphics/interface/ball/nest.png Binary files differnew file mode 100755 index 000000000..a2fa81c1e --- /dev/null +++ b/graphics/interface/ball/nest.png diff --git a/graphics/interface/ball/net.pal b/graphics/interface/ball/net.pal new file mode 100755 index 000000000..dc5abb94d --- /dev/null +++ b/graphics/interface/ball/net.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 156 106 +49 189 123 +98 222 148 +156 255 172 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +205 205 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/net.png b/graphics/interface/ball/net.png Binary files differnew file mode 100755 index 000000000..6fef48101 --- /dev/null +++ b/graphics/interface/ball/net.png diff --git a/graphics/interface/ball/poke.pal b/graphics/interface/ball/poke.pal new file mode 100755 index 000000000..0e6b2fb5c --- /dev/null +++ b/graphics/interface/ball/poke.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +131 0 0 +172 0 0 +213 41 41 +255 156 123 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/poke.png b/graphics/interface/ball/poke.png Binary files differnew file mode 100755 index 000000000..1e4aba669 --- /dev/null +++ b/graphics/interface/ball/poke.png diff --git a/graphics/interface/ball/premier.pal b/graphics/interface/ball/premier.pal new file mode 100755 index 000000000..0e6b2fb5c --- /dev/null +++ b/graphics/interface/ball/premier.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +131 0 0 +172 0 0 +213 41 41 +255 156 123 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/premier.png b/graphics/interface/ball/premier.png Binary files differnew file mode 100755 index 000000000..f5aaadbaf --- /dev/null +++ b/graphics/interface/ball/premier.png diff --git a/graphics/interface/ball/repeat.pal b/graphics/interface/ball/repeat.pal new file mode 100755 index 000000000..c3689e13f --- /dev/null +++ b/graphics/interface/ball/repeat.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +222 98 0 +230 131 32 +238 164 65 +255 197 98 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +205 156 8 +255 255 8 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/repeat.png b/graphics/interface/ball/repeat.png Binary files differnew file mode 100755 index 000000000..5abe789a2 --- /dev/null +++ b/graphics/interface/ball/repeat.png diff --git a/graphics/interface/ball/safari.pal b/graphics/interface/ball/safari.pal new file mode 100755 index 000000000..bbe4d76f3 --- /dev/null +++ b/graphics/interface/ball/safari.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +148 172 16 +164 197 32 +180 222 49 +197 246 65 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +205 106 41 +230 164 98 +255 222 156 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/safari.png b/graphics/interface/ball/safari.png Binary files differnew file mode 100755 index 000000000..0dd49aef9 --- /dev/null +++ b/graphics/interface/ball/safari.png diff --git a/graphics/interface/ball/timer.pal b/graphics/interface/ball/timer.pal new file mode 100755 index 000000000..e0c23569e --- /dev/null +++ b/graphics/interface/ball/timer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +172 0 0 +197 49 41 +222 98 82 +255 156 123 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +180 180 180 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 diff --git a/graphics/interface/ball/timer.png b/graphics/interface/ball/timer.png Binary files differnew file mode 100755 index 000000000..2b63f6795 --- /dev/null +++ b/graphics/interface/ball/timer.png diff --git a/graphics/interface/ball/ultra.pal b/graphics/interface/ball/ultra.pal new file mode 100755 index 000000000..3b7021097 --- /dev/null +++ b/graphics/interface/ball/ultra.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +180 139 16 +205 172 32 +230 205 49 +255 238 65 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png Binary files differnew file mode 100755 index 000000000..edae9a9f1 --- /dev/null +++ b/graphics/interface/ball/ultra.png diff --git a/graphics/interface/ball_open.pal b/graphics/interface/ball_open.pal new file mode 100755 index 000000000..0e6b2fb5c --- /dev/null +++ b/graphics/interface/ball_open.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +131 0 0 +172 0 0 +213 41 41 +255 156 123 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png Binary files differnew file mode 100755 index 000000000..1030f4942 --- /dev/null +++ b/graphics/interface/ball_open.png diff --git a/graphics/interface/gba.pal b/graphics/interface/gba.pal new file mode 100755 index 000000000..64a442293 --- /dev/null +++ b/graphics/interface/gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 diff --git a/graphics/interface/gba.png b/graphics/interface/gba.png Binary files differnew file mode 100755 index 000000000..61ce32b4f --- /dev/null +++ b/graphics/interface/gba.png diff --git a/graphics/interface/menu.lz b/graphics/interface/menu.lz Binary files differnew file mode 100755 index 000000000..fb0e427ef --- /dev/null +++ b/graphics/interface/menu.lz diff --git a/graphics/interface/menu.pal b/graphics/interface/menu.pal new file mode 100755 index 000000000..80a6cefcd --- /dev/null +++ b/graphics/interface/menu.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +255 255 255 +255 0 0 +82 98 156 +106 139 189 +255 255 255 +106 90 115 +213 205 213 +65 74 123 +74 65 82 +131 139 139 +106 65 90 +172 106 98 +213 74 57 +156 74 98 +106 164 164 +0 0 0 +74 57 115 +82 98 156 +106 139 189 +41 49 49 +255 255 255 +106 90 115 +222 213 222 +90 82 82 +180 189 180 +139 156 213 +90 74 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png Binary files differnew file mode 100755 index 000000000..e82b78ff3 --- /dev/null +++ b/graphics/interface/menu.png diff --git a/graphics/interface/menu_0.pal b/graphics/interface/menu_0.pal new file mode 100755 index 000000000..67e1af896 --- /dev/null +++ b/graphics/interface/menu_0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 0 0 +82 98 156 +106 139 189 +255 255 255 +106 90 115 +213 205 213 +65 74 123 +74 65 82 +131 139 139 +106 65 90 +172 106 98 +213 74 57 +156 74 98 +106 164 164 diff --git a/graphics/interface/menu_1.pal b/graphics/interface/menu_1.pal new file mode 100755 index 000000000..3adc73766 --- /dev/null +++ b/graphics/interface/menu_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 57 115 +82 98 156 +106 139 189 +41 49 49 +255 255 255 +106 90 115 +222 213 222 +90 82 82 +180 189 180 +139 156 213 +90 74 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/interface/trade_shadow.pal b/graphics/interface/trade_shadow.pal new file mode 100755 index 000000000..a4bec6478 --- /dev/null +++ b/graphics/interface/trade_shadow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +0 16 172 +32 32 106 +16 16 90 +0 0 74 +255 255 189 +230 230 164 +205 205 148 +189 180 115 +139 139 90 +74 74 57 +32 32 32 diff --git a/graphics/interface/trade_shadow.png b/graphics/interface/trade_shadow.png Binary files differnew file mode 100755 index 000000000..109979f90 --- /dev/null +++ b/graphics/interface/trade_shadow.png diff --git a/graphics/pokemon/egg/egg_crumble.png b/graphics/pokemon/egg/egg_crumble.png Binary files differnew file mode 100755 index 000000000..d404445b8 --- /dev/null +++ b/graphics/pokemon/egg/egg_crumble.png diff --git a/graphics/pokemon/egg/egg_hatch.png b/graphics/pokemon/egg/egg_hatch.png Binary files differnew file mode 100755 index 000000000..abea3122f --- /dev/null +++ b/graphics/pokemon/egg/egg_hatch.png diff --git a/graphics/unused/old.png b/graphics/unused/old.png Binary files differnew file mode 100755 index 000000000..523f8fa9f --- /dev/null +++ b/graphics/unused/old.png diff --git a/graphics/unused/unknown_D021BC.bin b/graphics/unused/unknown_D021BC.bin Binary files differnew file mode 100755 index 000000000..9d7c14a2d --- /dev/null +++ b/graphics/unused/unknown_D021BC.bin diff --git a/graphics/unused/unknown_D023E8.bin b/graphics/unused/unknown_D023E8.bin Binary files differnew file mode 100755 index 000000000..58efd7d3e --- /dev/null +++ b/graphics/unused/unknown_D023E8.bin diff --git a/graphics/unused/unknown_D02410.png b/graphics/unused/unknown_D02410.png Binary files differnew file mode 100755 index 000000000..c02c644a1 --- /dev/null +++ b/graphics/unused/unknown_D02410.png diff --git a/graphics/unused/unknown_D024F0.bin b/graphics/unused/unknown_D024F0.bin Binary files differnew file mode 100755 index 000000000..d23673450 --- /dev/null +++ b/graphics/unused/unknown_D024F0.bin diff --git a/menu.mk b/menu.mk new file mode 100755 index 000000000..b4135ad72 --- /dev/null +++ b/menu.mk @@ -0,0 +1,5 @@ +MENUGFXDIR := graphics/interface + +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal + + @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
\ No newline at end of file |