diff options
author | paul <nintendo6496@googlemail.com> | 2018-10-07 00:16:05 +0200 |
---|---|---|
committer | paul <nintendo6496@googlemail.com> | 2018-10-07 00:16:05 +0200 |
commit | 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 (patch) | |
tree | 3931ddcf6944f92a203befbada1b90a4be3f82f9 | |
parent | 0c6d127007b8e0830f89b06bded74ec3cb9cc512 (diff) |
push through first incbin, two files are apparently missing
78 files changed, 730 insertions, 7 deletions
diff --git a/asm/pokeball.s b/asm/pokeball.s index 5408e5567..cc24efb91 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gUnknown_8D022E8 + ldr r0, _0804BF5C @ =gBallOpen4bpp lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gUnknown_8D022E8 +_0804BF5C: .4byte gBallOpen4bpp _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/data/graphics.s b/data/graphics.s index 62234423a..8b7d09760 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -21,8 +21,6 @@ gUnknown_8D00BD0:: @ 8D00BD0 gUnknown_8D00BE8:: @ 8D00BE8 .incbin "baserom.gba", 0xD00BE8, 0x18 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - .align 2 gOldCharmap4bpp:: @ 8D00C00 .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby @@ -139,10 +137,491 @@ gBallPremier4bpp:: @ 8D021D8 gBallPremierGbapal:: @ 8D022C8 .incbin "graphics/interface/ball/premier.gbapal.lz" -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + .align 2 +gBallOpen4bpp:: @ 8D022E8 + .incbin "graphics/interface/ball_open.4bpp.lz" + + .align 2 +gBlank4bpp:: @ 8D02364 + .incbin "graphics/interface/blank.4bpp.lz" + + .align 2 +gSprite1464bpp:: @ 8D02460 + .incbin "graphics/battle_anims/sprites/146.4bpp.lz" + + .align 2 +gSprite0004bpp:: @ 8D02520 + .incbin "graphics/battle_anims/sprites/000.4bpp.lz" + + .align 2 +gSprite0034bpp:: @ 8D025D0 + .incbin "graphics/battle_anims/sprites/003.4bpp.lz" + + .align 2 +gSprite0044bpp:: @ 8D02644 + .incbin "graphics/battle_anims/sprites/004.4bpp.lz" + + .align 2 +gSprite0054bpp:: @ 8D026F4 + .incbin "graphics/battle_anims/sprites/005.4bpp.lz" + + .align 2 +gSprite0064bpp:: @ 8D027C8 + .incbin "graphics/battle_anims/sprites/006.4bpp.lz" + + .align 2 +gSprite115Gbapal:: @ 8D02894 + .incbin "graphics/battle_anims/sprites/115.gbapal.lz" + + .align 2 +gSprite000Gbapal:: @ 8D028B4 + .incbin "graphics/battle_anims/sprites/000.gbapal.lz" + + .align 2 +gSprite003Gbapal:: @ 8D028D8 + .incbin "graphics/battle_anims/sprites/003.gbapal.lz" + + .align 2 +gSprite004Gbapal:: @ 8D02900 + .incbin "graphics/battle_anims/sprites/004.gbapal.lz" + + .align 2 +gSprite005Gbapal:: @ 8D02914 + .incbin "graphics/battle_anims/sprites/005.gbapal.lz" + + .align 2 +gSprite006Gbapal:: @ 8D0293C + .incbin "graphics/battle_anims/sprites/006.gbapal.lz" + + .align 2 +gSprite1614bpp:: @ 8D02964 + .incbin "graphics/battle_anims/sprites/161.4bpp.lz" + + .align 2 +gSprite161Gbapal:: @ 8D0298C + .incbin "graphics/battle_anims/sprites/161.gbapal.lz" + + .align 2 +gSprite0074bpp:: @ 8D029B4 + .incbin "graphics/battle_anims/sprites/007.4bpp.lz" + + .align 2 +gSprite0074Gbapal:: @ 8D02B30 + .incbin "graphics/battle_anims/sprites/007.gbapal.lz" + + .align 2 +gSprite0084bpp:: @ 8D02B50 + .incbin "graphics/battle_anims/sprites/008.4bpp.lz" + + .align 2 +gSprite008Gbapal:: @ 8D02B70 + .incbin "graphics/battle_anims/sprites/008.gbapal.lz" + + .align 2 +gSprite010Gbapal:: @ 8D02B8C + .incbin "graphics/battle_anims/sprites/010.gbapal.lz" + + .align 2 +gSprite0104bpp:: @ 8D02BAC + .incbin "graphics/battle_anims/sprites/010.4bpp.lz" + + .align 2 +gSprite0094bpp:: @ 8D02F8C + .incbin "graphics/battle_anims/sprites/009.4bpp.lz" + + .align 2 +gSprite009Gbapal:: @ 8D03274 + .incbin "graphics/battle_anims/sprites/009.gbapal.lz" + @ BEGINHERE + .align 2 +gSprite0114bpp:: @ 8D03294 + .incbin "graphics/battle_anims/sprites/011.4bpp.lz" + + .align 2 +gSprite011Gbapal:: @ 8D0330C + .incbin "graphics/battle_anims/sprites/011.gbapal.lz" + + .align 2 +gSprite0124bpp:: @ 8D03334 + .incbin "graphics/battle_anims/sprites/012.4bpp.lz" + + .align 2 +gSprite012Gbapal:: @ 8D0339C + .incbin "graphics/battle_anims/sprites/012.gbapal.lz" + + .align 2 +gSprite1524bpp:: @ 8D033B4 + .incbin "graphics/battle_anims/sprites/152.4bpp.lz" + + .align 2 +gSprite152Gbapal:: @ 8D033FC + .incbin "graphics/battle_anims/sprites/152.gbapal.lz" + + .align 2 +gSprite0134bpp:: @ 8D03420 + .incbin "graphics/battle_anims/sprites/013.4bpp.lz" + + .align 2 +gSprite013Gbapal:: @ 8D03454 + .incbin "graphics/battle_anims/sprites/013.gbapal.lz" + + .align 2 +gSprite0154bpp:: @ 8D0346C + .incbin "graphics/battle_anims/sprites/015.4bpp.lz" + + .align 2 +gSprite015Gbapal:: @ 8D034D8 + .incbin "graphics/battle_anims/sprites/015.gbapal.lz" + + .align 2 +gSprite0164bpp:: @ 8D03500 + .incbin "graphics/battle_anims/sprites/016.4bpp.lz" + + .align 2 +gSprite016Gbapal:: @ 8D03570 + .incbin "graphics/battle_anims/sprites/016.gbapal.lz" + + .align 2 +gSprite0174bpp:: @ 8D03580 + .incbin "graphics/battle_anims/sprites/017.4bpp.lz" + + .align 2 +gUnknown_8D035A0:: @ 8D035A0 + .incbin "graphics/unknown/unknown_D035A0.4bpp.lz" + + .align 2 +gSprite019Gbapal:: @ 8D035C4 + .incbin "graphics/battle_anims/sprites/019.gbapal.lz" + + .align 2 +gSprite0194bpp:: @ 8D035E0 + .incbin "graphics/battle_anims/sprites/019.4bpp.lz" + + .align 2 +gSprite0204bpp:: @ 8D036A0 + .incbin "graphics/battle_anims/sprites/020.4bpp.lz" + + .align 2 +gSprite020Gbapal:: @ 8D0376C + .incbin "graphics/battle_anims/sprites/020.gbapal.lz" + + .align 2 +gSprite023Gbapal:: @ 8D03794 + .incbin "graphics/battle_anims/sprites/023.gbapal.lz" + + .align 2 +gSprite0234bpp:: @ 8D037BC + .incbin "graphics/battle_anims/sprites/023.4bpp.lz" + + .align 2 +gSprite023UnusedGbapal:: @ 8D038C4 + .incbin "graphics/unused/battle_anim_023.gbapal.lz" + + .align 2 +gSpriteMusicNotes4bpp:: @ 8D038EC + .incbin "graphics/unused/music_notes.4bpp.lz" + + .align 2 +gSprite021Gbapal:: @ 8D039E8 + .incbin "graphics/battle_anims/sprites/021.gbapal.lz" + + .align 2 +gSprite0214bpp:: @ 8D03A10 + .incbin "graphics/battle_anims/sprites/021.4bpp.lz" + + .align 2 +gSprite022Gbapal:: @ 8D03D48 + .incbin "graphics/battle_anims/sprites/022.gbapal.lz" + + .align 2 +gSprite025Gbapal:: @ 8D03D70 + .incbin "graphics/battle_anims/sprites/025.gbapal.lz" + + .align 2 +gSprite0254bpp:: @ 8D03D98 + .incbin "graphics/battle_anims/sprites/025.4bpp.lz" + + .align 2 +gSprite0244bpp:: @ 8D03E88 + .incbin "graphics/battle_anims/sprites/024.4bpp.lz" + + .align 2 +gSprite024Gbapal:: @ 8D03F54 + .incbin "graphics/battle_anims/sprites/024.gbapal.lz" + + .align 2 +gSprite0314bpp:: @ 8D03F68 + .incbin "graphics/battle_anims/sprites/031.4bpp.lz" + + .align 2 +gSprite031Gbapal:: @ 8D04348 + .incbin "graphics/battle_anims/sprites/031.gbapal.lz" + + .align 2 +gSprite032Gbapal:: @ 8D04368 + .incbin "graphics/battle_anims/sprites/032.gbapal.lz" + + .align 2 +gSprite0324bpp:: @ 8D04390 + .incbin "graphics/battle_anims/sprites/032.4bpp.lz" + + .align 2 +gSprite0264bpp:: @ 8D0447C + .incbin "graphics/battle_anims/sprites/026.4bpp.lz" + + .align 2 +gSprite026Gbapal:: @ 8D047B4 + .incbin "graphics/battle_anims/sprites/026.gbapal.lz" + + .align 2 +gSprite027Gbapal:: @ 8D047DC + .incbin "baserom.gba", 0xD047DC, 0x28 @ this should be 027.gbapal.lz but my matcher didnt pick it up... + + .align 2 +gSprite0274bpp:: @ 8D04804 + .incbin "graphics/battle_anims/sprites/027.4bpp.lz" + + + + .align 2 +gSprite028Gbapal:: @ 8D04B00 + .incbin "graphics/battle_anims/sprites/028.gbapal.lz" + + + + .align 2 +gSprite0284bpp:: @ 8D04B28 + .incbin "graphics/battle_anims/sprites/028.4bpp.lz" + + + + .align 2 +gSprite0294bpp:: @ 8D04E78 + .incbin "graphics/battle_anims/sprites/029.4bpp.lz" + + + + .align 2 +gSprite029Gbapal:: @ 8D05130 + .incbin "graphics/battle_anims/sprites/029.gbapal.lz" + + + + + .align 2 +gSprite0304bpp:: @ 8D05158 + .incbin "graphics/battle_anims/sprites/030.4bpp.lz" + + + + .align 2 +gSprite030Gbapal:: @ 8D05518 + .incbin "graphics/battle_anims/sprites/030.gbapal.lz" + + + + .align 2 +gSprite033Gbapal:: @ 8D0553C + .incbin "graphics/battle_anims/sprites/033.gbapal.lz" + + + + .align 2 +gSprite0334bpp:: @ 8D05564 + .incbin "graphics/battle_anims/sprites/033.4bpp.lz" + + + + .align 2 +gSprite0344bpp:: @ 8D05ED4 + .incbin "graphics/battle_anims/sprites/034.4bpp.lz" + + + + .align 2 +gSprite0354bpp:: @ 8D062A0 + .incbin "graphics/battle_anims/sprites/035.4bpp.lz" + + + + .align 2 +gSprite036Gbapal:: @ 8D06638 + .incbin "graphics/battle_anims/sprites/036.gbapal.lz" + + + + .align 2 +gSprite0364bpp:: @ 8D06660 + .incbin "graphics/battle_anims/sprites/036.4bpp.lz" + + + + .align 2 +gSprite0374bpp:: @ 8D06A34 + .incbin "graphics/battle_anims/sprites/037.4bpp.lz" + + + + + .align 2 +gUnknown_D06D804bpp:: @ 8D06D80 + .incbin "graphics/unknown/unknown_D06D80.4bpp.lz" + + + + + .align 2 +gUnknown_D06D80Gbapal:: @ 8D06DC4 + .incbin "graphics/unknown/unknown_D06D80.gbapal.lz" + + + + + .align 2 +gUnknown_D06D80Gbapal2:: @ 8D06DD8 + .incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz" + + + + + .align 2 +gUnusedObi14bpp:: @ 8D06E0C + .incbin "graphics/unused/obi1.4bpp.lz" + + + + .align 2 +gUnusedObiPalpak1Gbapal:: @ 8D07170 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" + + + + .align 2 +gUnusedOldPal4Gbapal:: @ 8D071B4 + .incbin "graphics/unused/old_pal4.gbapal.lz" + + + + .align 2 +gUnusedObiPalpak3Gbapal:: @ 8D071CC + .incbin "graphics/unused/obi_palpak3.gbapal.lz" + + + + .align 2 +gUnusedObi24bpp:: @ 8D07224 + .incbin "graphics/unused/obi2.4bpp.lz" + + + + .align 2 +gUnusedOldBattleInterfaceTilemapBin:: @ 8D077EC + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" + + + + + .align 2 +gSprite038Gbapal:: @ 8D078FC + .incbin "graphics/battle_anims/sprites/038.gbapal.lz" + + + + .align 2 +gSprite039Gbapal:: @ 8D07924 + .incbin "graphics/battle_anims/sprites/039.gbapal.lz" + + + + .align 2 +gSprite0384bpp:: @ 8D0794C + .incbin "graphics/battle_anims/sprites/038.4bpp.lz" + + + + .align 2 +gSprite0394bpp:: @ 8D07B70 + .incbin "graphics/battle_anims/sprites/039.4bpp.lz" + + + + .align 2 +gSprite0404bpp:: @ 8D07E6C + .incbin "graphics/battle_anims/sprites/040.4bpp.lz" + + + + + .align 2 +gSprite0414bpp:: @ 8D08078 + .incbin "graphics/battle_anims/sprites/041.4bpp.lz" + + + + .align 2 +gIntefacePartyMenuHpBar4bpp:: @ 8D08218 + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" + + + + .align 2 +gSprite0424bpp:: @ 8D082AC + .incbin "graphics/battle_anims/sprites/042.4bpp.lz" + + + + .align 2 +gSprite042Gbapal:: @ 8D0857C + .incbin "graphics/battle_anims/sprites/042.gbapal.lz" + + + + .align 2 +gSprite0434bpp:: @ 8D085A4 + .incbin "graphics/battle_anims/sprites/043.4bpp.lz" + + + + .align 2 +gSprite043Gbapal:: @ 8D089A4 + .incbin "graphics/battle_anims/sprites/043.gbapal.lz" + + + .align 2 +gSprite044Gbapal:: @ 8D089CC + .incbin "baserom.gba", 0xD089CC, 0x28 @ this should be 044.gbapal.lz but my matched didnt pick it up... + + + .align 2 +gSprite0444bpp:: @ 8D089F4 + .incbin "graphics/battle_anims/sprites/044.4bpp.lz" + + + + .align 2 +gSprite045Gbapal:: @ 8D08C60 + .incbin "graphics/battle_anims/sprites/045.gbapal.lz" + + + + .align 2 +gSprite0454bpp:: @ 8D08C88 + .incbin "graphics/battle_anims/sprites/045.4bpp.lz" + + + + .align 2 +gBattleInterfaceUnusedWindow4bpp:: @ 8D08EF4 + .incbin "graphics/battle_interface/unused_window.4bpp.lz" + + + + .align 2 +gBattleInterfaceUnusedWindowGbapal:: @ 8D093B0 + .incbin "graphics/battle_interface/unused_window.gbapal.lz" + -gUnknown_8D022E8:: @ 8D022E8 - .incbin "baserom.gba", 0xD022E8, 0x70F0 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gUnknown_8D093D8:: @ 8D093D8 .incbin "baserom.gba", 0xD093D8, 0x87EC diff --git a/graphics/battle_anims/sprites/000.png b/graphics/battle_anims/sprites/000.png Binary files differnew file mode 100644 index 000000000..3d8662a86 --- /dev/null +++ b/graphics/battle_anims/sprites/000.png diff --git a/graphics/battle_anims/sprites/003.png b/graphics/battle_anims/sprites/003.png Binary files differnew file mode 100644 index 000000000..b3164ff01 --- /dev/null +++ b/graphics/battle_anims/sprites/003.png diff --git a/graphics/battle_anims/sprites/004.png b/graphics/battle_anims/sprites/004.png Binary files differnew file mode 100644 index 000000000..c7cad5ef9 --- /dev/null +++ b/graphics/battle_anims/sprites/004.png diff --git a/graphics/battle_anims/sprites/005.png b/graphics/battle_anims/sprites/005.png Binary files differnew file mode 100644 index 000000000..8bd4ac426 --- /dev/null +++ b/graphics/battle_anims/sprites/005.png diff --git a/graphics/battle_anims/sprites/006.png b/graphics/battle_anims/sprites/006.png Binary files differnew file mode 100644 index 000000000..30e2dffc1 --- /dev/null +++ b/graphics/battle_anims/sprites/006.png diff --git a/graphics/battle_anims/sprites/007.png b/graphics/battle_anims/sprites/007.png Binary files differnew file mode 100644 index 000000000..5a2369dad --- /dev/null +++ b/graphics/battle_anims/sprites/007.png diff --git a/graphics/battle_anims/sprites/008.png b/graphics/battle_anims/sprites/008.png Binary files differnew file mode 100644 index 000000000..634c4d2bb --- /dev/null +++ b/graphics/battle_anims/sprites/008.png diff --git a/graphics/battle_anims/sprites/009.png b/graphics/battle_anims/sprites/009.png Binary files differnew file mode 100644 index 000000000..5818ae41d --- /dev/null +++ b/graphics/battle_anims/sprites/009.png diff --git a/graphics/battle_anims/sprites/010.pal b/graphics/battle_anims/sprites/010.pal new file mode 100644 index 000000000..c5f241feb --- /dev/null +++ b/graphics/battle_anims/sprites/010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 255 +205 205 255 +230 230 255 diff --git a/graphics/battle_anims/sprites/010_0.png b/graphics/battle_anims/sprites/010_0.png Binary files differnew file mode 100644 index 000000000..8eea99de0 --- /dev/null +++ b/graphics/battle_anims/sprites/010_0.png diff --git a/graphics/battle_anims/sprites/010_1.png b/graphics/battle_anims/sprites/010_1.png Binary files differnew file mode 100644 index 000000000..ba3ca6192 --- /dev/null +++ b/graphics/battle_anims/sprites/010_1.png diff --git a/graphics/battle_anims/sprites/010_2.png b/graphics/battle_anims/sprites/010_2.png Binary files differnew file mode 100644 index 000000000..b71a875e7 --- /dev/null +++ b/graphics/battle_anims/sprites/010_2.png diff --git a/graphics/battle_anims/sprites/010_3.png b/graphics/battle_anims/sprites/010_3.png Binary files differnew file mode 100644 index 000000000..e310ca5df --- /dev/null +++ b/graphics/battle_anims/sprites/010_3.png diff --git a/graphics/battle_anims/sprites/011.png b/graphics/battle_anims/sprites/011.png Binary files differnew file mode 100644 index 000000000..23ce049b0 --- /dev/null +++ b/graphics/battle_anims/sprites/011.png diff --git a/graphics/battle_anims/sprites/012.png b/graphics/battle_anims/sprites/012.png Binary files differnew file mode 100644 index 000000000..1a9e4c870 --- /dev/null +++ b/graphics/battle_anims/sprites/012.png diff --git a/graphics/battle_anims/sprites/013.png b/graphics/battle_anims/sprites/013.png Binary files differnew file mode 100644 index 000000000..407671ff6 --- /dev/null +++ b/graphics/battle_anims/sprites/013.png diff --git a/graphics/battle_anims/sprites/015.png b/graphics/battle_anims/sprites/015.png Binary files differnew file mode 100644 index 000000000..48895d36a --- /dev/null +++ b/graphics/battle_anims/sprites/015.png diff --git a/graphics/battle_anims/sprites/016.png b/graphics/battle_anims/sprites/016.png Binary files differnew file mode 100644 index 000000000..df9651411 --- /dev/null +++ b/graphics/battle_anims/sprites/016.png diff --git a/graphics/battle_anims/sprites/017.png b/graphics/battle_anims/sprites/017.png Binary files differnew file mode 100644 index 000000000..e287698b4 --- /dev/null +++ b/graphics/battle_anims/sprites/017.png diff --git a/graphics/battle_anims/sprites/019.png b/graphics/battle_anims/sprites/019.png Binary files differnew file mode 100644 index 000000000..af29ec730 --- /dev/null +++ b/graphics/battle_anims/sprites/019.png diff --git a/graphics/battle_anims/sprites/020.png b/graphics/battle_anims/sprites/020.png Binary files differnew file mode 100644 index 000000000..73c7f1344 --- /dev/null +++ b/graphics/battle_anims/sprites/020.png diff --git a/graphics/battle_anims/sprites/021.png b/graphics/battle_anims/sprites/021.png Binary files differnew file mode 100644 index 000000000..c531b820c --- /dev/null +++ b/graphics/battle_anims/sprites/021.png diff --git a/graphics/battle_anims/sprites/022.pal b/graphics/battle_anims/sprites/022.pal new file mode 100644 index 000000000..35cbf0096 --- /dev/null +++ b/graphics/battle_anims/sprites/022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 255 255 +156 255 255 +106 255 255 +57 255 255 +8 255 255 +8 205 255 +8 156 255 +8 106 255 +8 57 255 +8 8 255 +8 8 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/023.png b/graphics/battle_anims/sprites/023.png Binary files differnew file mode 100644 index 000000000..a1dbc20c2 --- /dev/null +++ b/graphics/battle_anims/sprites/023.png diff --git a/graphics/battle_anims/sprites/024.png b/graphics/battle_anims/sprites/024.png Binary files differnew file mode 100644 index 000000000..7c5d0f382 --- /dev/null +++ b/graphics/battle_anims/sprites/024.png diff --git a/graphics/battle_anims/sprites/025.png b/graphics/battle_anims/sprites/025.png Binary files differnew file mode 100644 index 000000000..864f71065 --- /dev/null +++ b/graphics/battle_anims/sprites/025.png diff --git a/graphics/battle_anims/sprites/026.png b/graphics/battle_anims/sprites/026.png Binary files differnew file mode 100644 index 000000000..c531b820c --- /dev/null +++ b/graphics/battle_anims/sprites/026.png diff --git a/graphics/battle_anims/sprites/027.png b/graphics/battle_anims/sprites/027.png Binary files differnew file mode 100644 index 000000000..28b3876b7 --- /dev/null +++ b/graphics/battle_anims/sprites/027.png diff --git a/graphics/battle_anims/sprites/028.png b/graphics/battle_anims/sprites/028.png Binary files differnew file mode 100644 index 000000000..b3a096996 --- /dev/null +++ b/graphics/battle_anims/sprites/028.png diff --git a/graphics/battle_anims/sprites/029.png b/graphics/battle_anims/sprites/029.png Binary files differnew file mode 100644 index 000000000..b04a8dc65 --- /dev/null +++ b/graphics/battle_anims/sprites/029.png diff --git a/graphics/battle_anims/sprites/030.png b/graphics/battle_anims/sprites/030.png Binary files differnew file mode 100644 index 000000000..ba7161fa1 --- /dev/null +++ b/graphics/battle_anims/sprites/030.png diff --git a/graphics/battle_anims/sprites/031.png b/graphics/battle_anims/sprites/031.png Binary files differnew file mode 100644 index 000000000..c6727ad1c --- /dev/null +++ b/graphics/battle_anims/sprites/031.png diff --git a/graphics/battle_anims/sprites/032.png b/graphics/battle_anims/sprites/032.png Binary files differnew file mode 100644 index 000000000..80ffb7b72 --- /dev/null +++ b/graphics/battle_anims/sprites/032.png diff --git a/graphics/battle_anims/sprites/033.png b/graphics/battle_anims/sprites/033.png Binary files differnew file mode 100644 index 000000000..eb1ed3473 --- /dev/null +++ b/graphics/battle_anims/sprites/033.png diff --git a/graphics/battle_anims/sprites/034.png b/graphics/battle_anims/sprites/034.png Binary files differnew file mode 100644 index 000000000..22f836d1e --- /dev/null +++ b/graphics/battle_anims/sprites/034.png diff --git a/graphics/battle_anims/sprites/035.png b/graphics/battle_anims/sprites/035.png Binary files differnew file mode 100644 index 000000000..cde2105dd --- /dev/null +++ b/graphics/battle_anims/sprites/035.png diff --git a/graphics/battle_anims/sprites/036.png b/graphics/battle_anims/sprites/036.png Binary files differnew file mode 100644 index 000000000..bddf4a25a --- /dev/null +++ b/graphics/battle_anims/sprites/036.png diff --git a/graphics/battle_anims/sprites/037.png b/graphics/battle_anims/sprites/037.png Binary files differnew file mode 100644 index 000000000..62a692036 --- /dev/null +++ b/graphics/battle_anims/sprites/037.png diff --git a/graphics/battle_anims/sprites/038.png b/graphics/battle_anims/sprites/038.png Binary files differnew file mode 100644 index 000000000..2dfa037c1 --- /dev/null +++ b/graphics/battle_anims/sprites/038.png diff --git a/graphics/battle_anims/sprites/039.png b/graphics/battle_anims/sprites/039.png Binary files differnew file mode 100644 index 000000000..bc61b20d7 --- /dev/null +++ b/graphics/battle_anims/sprites/039.png diff --git a/graphics/battle_anims/sprites/040.png b/graphics/battle_anims/sprites/040.png Binary files differnew file mode 100644 index 000000000..c7d493d92 --- /dev/null +++ b/graphics/battle_anims/sprites/040.png diff --git a/graphics/battle_anims/sprites/041.png b/graphics/battle_anims/sprites/041.png Binary files differnew file mode 100644 index 000000000..e088c1f86 --- /dev/null +++ b/graphics/battle_anims/sprites/041.png diff --git a/graphics/battle_anims/sprites/042.png b/graphics/battle_anims/sprites/042.png Binary files differnew file mode 100644 index 000000000..cf8909080 --- /dev/null +++ b/graphics/battle_anims/sprites/042.png diff --git a/graphics/battle_anims/sprites/043.png b/graphics/battle_anims/sprites/043.png Binary files differnew file mode 100644 index 000000000..e5e929ede --- /dev/null +++ b/graphics/battle_anims/sprites/043.png diff --git a/graphics/battle_anims/sprites/044.png b/graphics/battle_anims/sprites/044.png Binary files differnew file mode 100644 index 000000000..7baf82357 --- /dev/null +++ b/graphics/battle_anims/sprites/044.png diff --git a/graphics/battle_anims/sprites/045.png b/graphics/battle_anims/sprites/045.png Binary files differnew file mode 100644 index 000000000..45aeae356 --- /dev/null +++ b/graphics/battle_anims/sprites/045.png diff --git a/graphics/battle_anims/sprites/115.png b/graphics/battle_anims/sprites/115.png Binary files differnew file mode 100644 index 000000000..51c909134 --- /dev/null +++ b/graphics/battle_anims/sprites/115.png diff --git a/graphics/battle_anims/sprites/146.png b/graphics/battle_anims/sprites/146.png Binary files differnew file mode 100644 index 000000000..e7b0360a6 --- /dev/null +++ b/graphics/battle_anims/sprites/146.png diff --git a/graphics/battle_anims/sprites/152.png b/graphics/battle_anims/sprites/152.png Binary files differnew file mode 100644 index 000000000..1b5e8e904 --- /dev/null +++ b/graphics/battle_anims/sprites/152.png diff --git a/graphics/battle_anims/sprites/161.png b/graphics/battle_anims/sprites/161.png Binary files differnew file mode 100644 index 000000000..5976b2b8c --- /dev/null +++ b/graphics/battle_anims/sprites/161.png diff --git a/graphics/battle_interface/unused_window.png b/graphics/battle_interface/unused_window.png Binary files differnew file mode 100644 index 000000000..73086d4d2 --- /dev/null +++ b/graphics/battle_interface/unused_window.png diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png Binary files differnew file mode 100644 index 000000000..1030f4942 --- /dev/null +++ b/graphics/interface/ball_open.png diff --git a/graphics/interface/blank.pal b/graphics/interface/blank.pal new file mode 100644 index 000000000..9757f2e57 --- /dev/null +++ b/graphics/interface/blank.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +148 255 164 +139 246 115 +65 205 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 205 +74 74 74 diff --git a/graphics/interface/blank.png b/graphics/interface/blank.png Binary files differnew file mode 100644 index 000000000..3a4ba289c --- /dev/null +++ b/graphics/interface/blank.png diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png Binary files differnew file mode 100644 index 000000000..763b91210 --- /dev/null +++ b/graphics/interface/party_menu_hpbar.png diff --git a/graphics/unknown/party_menu_hpbar.png b/graphics/unknown/party_menu_hpbar.png Binary files differnew file mode 100644 index 000000000..763b91210 --- /dev/null +++ b/graphics/unknown/party_menu_hpbar.png diff --git a/graphics/unknown/unknown_D035A0.png b/graphics/unknown/unknown_D035A0.png Binary files differnew file mode 100644 index 000000000..0b2ae80f9 --- /dev/null +++ b/graphics/unknown/unknown_D035A0.png diff --git a/graphics/unknown/unknown_D06D80.png b/graphics/unknown/unknown_D06D80.png Binary files differnew file mode 100644 index 000000000..d36afa64d --- /dev/null +++ b/graphics/unknown/unknown_D06D80.png diff --git a/graphics/unknown/unknown_D06D80_2.pal b/graphics/unknown/unknown_D06D80_2.pal new file mode 100644 index 000000000..44f4b55d6 --- /dev/null +++ b/graphics/unknown/unknown_D06D80_2.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +255 205 0 +255 255 98 +213 98 24 +255 123 32 +106 65 172 +65 24 172 +255 205 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +57 123 0 +90 189 0 +123 255 8 +230 106 148 +255 139 255 +255 205 0 +255 255 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unused_window.png b/graphics/unknown/unused_window.png Binary files differnew file mode 100644 index 000000000..73086d4d2 --- /dev/null +++ b/graphics/unknown/unused_window.png diff --git a/graphics/unused/battle_anim_023.pal b/graphics/unused/battle_anim_023.pal new file mode 100644 index 000000000..8e6e6e902 --- /dev/null +++ b/graphics/unused/battle_anim_023.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 230 255 +115 230 255 +213 230 255 +0 0 0 +255 255 172 +255 255 115 +0 0 0 +98 139 98 +0 0 0 +0 0 0 +131 131 131 +164 164 164 +213 205 205 +255 255 255 diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png Binary files differnew file mode 100644 index 000000000..af89e55a0 --- /dev/null +++ b/graphics/unused/music_notes.png diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png Binary files differnew file mode 100644 index 000000000..0b2fe5eb7 --- /dev/null +++ b/graphics/unused/old_battle_interface_1.png diff --git a/graphics/unused/old_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png Binary files differnew file mode 100644 index 000000000..04229ccda --- /dev/null +++ b/graphics/unused/old_battle_interface_2.png diff --git a/graphics/unused/old_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png Binary files differnew file mode 100644 index 000000000..428c7765d --- /dev/null +++ b/graphics/unused/old_battle_interface_3.png diff --git a/graphics/unused/old_battle_interface_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin Binary files differnew file mode 100644 index 000000000..aae3307e7 --- /dev/null +++ b/graphics/unused/old_battle_interface_tilemap.bin diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png Binary files differnew file mode 100644 index 000000000..729ebe789 --- /dev/null +++ b/graphics/unused/old_bulbasaur.png diff --git a/graphics/unused/old_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png Binary files differnew file mode 100644 index 000000000..f374e5a9f --- /dev/null +++ b/graphics/unused/old_bulbasaur2.png diff --git a/graphics/unused/old_charizard.png b/graphics/unused/old_charizard.png Binary files differnew file mode 100644 index 000000000..e1470aada --- /dev/null +++ b/graphics/unused/old_charizard.png diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal new file mode 100644 index 000000000..1e2ef9083 --- /dev/null +++ b/graphics/unused/old_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +148 8 8 +148 65 65 +24 16 0 +16 139 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal2.pal b/graphics/unused/old_pal2.pal new file mode 100644 index 000000000..3c5e6ad7f --- /dev/null +++ b/graphics/unused/old_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +16 0 0 +148 65 65 +0 0 0 +16 139 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal3.pal b/graphics/unused/old_pal3.pal new file mode 100644 index 000000000..d07e21019 --- /dev/null +++ b/graphics/unused/old_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 16 139 +0 0 0 +0 213 98 +32 0 0 +0 213 98 +24 16 0 +0 213 98 +156 8 8 +0 213 98 +24 16 0 +0 213 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal4.pal b/graphics/unused/old_pal4.pal new file mode 100644 index 000000000..60b814f75 --- /dev/null +++ b/graphics/unused/old_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +41 41 57 +90 90 106 +172 172 180 +197 197 205 +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 diff --git a/graphics/unused/old_pal5.pal b/graphics/unused/old_pal5.pal new file mode 100644 index 000000000..b6f481d46 --- /dev/null +++ b/graphics/unused/old_pal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +189 164 41 +246 246 41 +222 106 32 +246 131 41 +115 98 246 +98 74 205 +238 115 156 +246 148 246 +115 172 246 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal6.pal b/graphics/unused/old_pal6.pal new file mode 100644 index 000000000..6d91e9918 --- /dev/null +++ b/graphics/unused/old_pal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +115 148 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 41 +246 246 41 +8 8 8 +8 8 8 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal7.pal b/graphics/unused/old_pal7.pal new file mode 100644 index 000000000..d380bc65d --- /dev/null +++ b/graphics/unused/old_pal7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +156 156 156 +255 255 255 +98 115 246 +115 172 246 +164 98 41 +230 172 139 +189 164 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +213 41 156 +90 90 90 +65 65 65 |