diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 20 | ||||
| -rw-r--r-- | data/graphics.s | 548 |
2 files changed, 554 insertions, 14 deletions
diff --git a/data/data.s b/data/data.s index 7f2b474aa..dcb46036a 100644 --- a/data/data.s +++ b/data/data.s @@ -4,12 +4,15 @@ gUnknown_8231EC4:: @ 8231EC4 .incbin "baserom.gba", 0x231EC4, 0x20 -gUnknown_8231EE4:: @ 8231EE4 - .incbin "baserom.gba", 0x231EE4, 0x4A8 + .align 2 +gWirelessLinkDisplay4bpp:: @ 8231EE4 + .incbin "graphics/interface/wireless_link_display.4bpp.lz" -gUnknown_823238C:: @ 823238C - .incbin "baserom.gba", 0x23238C, 0x1EC + .align 2 +gWirelessLinkDisplayBin:: @ 823238C + .incbin "graphics/interface/wireless_link_display.bin.lz" + .align 2 gUnknown_8232578:: @ 8232578 .incbin "baserom.gba", 0x232578, 0x20 @@ -661,8 +664,9 @@ gUnknown_8269A5C:: @ 8269A5C gUnknown_826AA5C:: @ 826AA5C .incbin "baserom.gba", 0x26AA5C, 0x1000 -gUnknown_826BA5C:: @ 826BA5C - .incbin "baserom.gba", 0x26BA5C, 0x100 + .align 2 +gUnknown_3379A0Bin:: @ 826BA5C + .incbin "graphics/trade/unknown_3379A0.bin.lz" gUnknown_826BB5C:: @ 826BB5C .incbin "baserom.gba", 0x26BB5C, 0x200 @@ -673,8 +677,8 @@ gUnknown_826BD5C:: @ 826BD5C gUnknown_826BF5C:: @ 826BF5C .incbin "baserom.gba", 0x26BF5C, 0x20 -gUnknown_826BF7C:: @ 826BF7C - .incbin "baserom.gba", 0x26BF7C, 0x690 +gWirelessSignal4bpp:: @ 826BF7C + .incbin "graphics/trade/wireless_signal.4bpp.lz" gUnknown_826C60C:: @ 826C60C .incbin "baserom.gba", 0x26C60C, 0x7C8 diff --git a/data/graphics.s b/data/graphics.s index a81ff20c2..fd965ede6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -6,11 +6,538 @@ gUnknown_8D00000:: @ 8D00000 gUnknown_8D004D8:: @ 8D004D8 .incbin "baserom.gba", 0xD004D8, 0x44 -gUnknown_8D0051C:: @ 8D0051C - .incbin "baserom.gba", 0xD0051C, 0x1DCC + .align 2 +gMenuMapBin:: @ 8D0051C + .incbin "graphics/interface/menu_map.bin.lz" + + .align 2 +gUnknown_8D00748:: @ 8D00748 + .incbin "baserom.gba", 0xD00748, 0x488 + + .align 2 +gUnknown_8D00BD0:: @ 8D00BD0 + .incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz" + + .align 2 +gUnknown_8D00BE8:: @ 8D00BE8 + .incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" + + .align 2 +gOldCharmap4bpp:: @ 8D00C00 + .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby + + .align 2 +gOldCharmapBin:: @ 8D013D8 + .incbin "graphics/unused/old_charmap.bin.lz" @from ruby + + .align 2 +gOldCharmapGbapal:: @ 8D01604 + .incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby + + .align 2 +gSmokescreenImpact4bpp:: @ 8D0162C + .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" + + .align 2 +gSmokescreenImpactGbapal:: @ 8D0170C + .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + + .align 2 +gBallPoke4bpp:: @ 8D01724 + .incbin "graphics/interface/ball/poke.4bpp.lz" + + .align 2 +gBallPokeGbaPal:: @ 8D017E0 + .incbin "graphics/interface/ball/poke.gbapal.lz" + + .align 2 +gBallGreat4bpp:: @ 8D01800 + .incbin "graphics/interface/ball/great.4bpp.lz" + + .align 2 +gBallGreatGbapal:: @ 8D018BC + .incbin "graphics/interface/ball/great.gbapal.lz" + + .align 2 +gBallSafari4bpp:: @ 8D018E0 + .incbin "graphics/interface/ball/safari.4bpp.lz" + + .align 2 +gBallSafariGbapal:: @ 8D019A4 + .incbin "graphics/interface/ball/safari.gbapal.lz" + + .align 2 +gBallUltra4bpp:: @ 8D019C8 + .incbin "graphics/interface/ball/ultra.4bpp.lz" + + .align 2 +gBallUltraGbapal:: @ 8D01A7C + .incbin "graphics/interface/ball/ultra.gbapal.lz" + + .align 2 +gBallMaster4bpp:: @ 8D01A9C + .incbin "graphics/interface/ball/master.4bpp.lz" + + .align 2 +gBallMasterGbapal:: @ 8D01B5C + .incbin "graphics/interface/ball/master.gbapal.lz" + + .align 2 +gBallNet4bpp:: @ 8D01B80 + .incbin "graphics/interface/ball/net.4bpp.lz" + + .align 2 +gBallNetGbapal:: @ 8D01C40 + .incbin "graphics/interface/ball/net.gbapal.lz" + + .align 2 +gBallDive4bpp:: @ 8D01C60 + .incbin "graphics/interface/ball/dive.4bpp.lz" + + .align 2 +gBallDiveGbapal:: @ 8D01D74 + .incbin "graphics/interface/ball/dive.gbapal.lz" + + .align 2 +gBallNest4bpp:: @ 8D01D9C + .incbin "graphics/interface/ball/nest.4bpp.lz" + + .align 2 +gBallNestGbapal:: @ 8D01E60 + .incbin "graphics/interface/ball/nest.gbapal.lz" + + .align 2 +gBallRepeat4bpp:: @ 8D01E84 + .incbin "graphics/interface/ball/repeat.4bpp.lz" + + .align 2 +gBallRepeatGbapal:: @ 8D01F44 + .incbin "graphics/interface/ball/repeat.gbapal.lz" + + .align 2 +gBallTimer4bpp:: @ 8D01F68 + .incbin "graphics/interface/ball/timer.4bpp.lz" + + .align 2 +gBallTimerGbapal:: @ 8D02060 + .incbin "graphics/interface/ball/timer.gbapal.lz" + + .align 2 +gBallLuxury4bpp:: @ 8D02084 + .incbin "graphics/interface/ball/luxury.4bpp.lz" + + .align 2 +gBallLuxuryGbapal:: @ 8D021B0 + .incbin "graphics/interface/ball/luxury.gbapal.lz" + + .align 2 +gBallPremier4bpp:: @ 8D021D8 + .incbin "graphics/interface/ball/premier.4bpp.lz" + + .align 2 +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" + + .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 "graphics/battle_anims/sprites/027.gbapal.lz" + + .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" -gUnknown_8D022E8:: @ 8D022E8 - .incbin "baserom.gba", 0xD022E8, 0x70F0 + .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 "graphics/battle_anims/sprites/044.gbapal.lz" + + .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_8D093D8:: @ 8D093D8 .incbin "baserom.gba", 0xD093D8, 0x87EC @@ -118,8 +645,17 @@ gUnknown_8D2EC70:: @ 8D2EC70 .incbin "baserom.gba", 0xD2EC70, 0xF44 gUnknown_8D2FBB4:: @ 8D2FBB4 - .incbin "baserom.gba", 0xD2FBB4, 0x1477C8 - + .incbin "baserom.gba", 0xD2FBB4, 0x20 + + @ INSERT POKEMANS HERE +gUnknown_8D2FBD4:: @ 8D2FBD4 + .incbin "baserom.gba", 0xD2FBD4, 0x119184 + + @ INSERT TRAINERS HERE +gUnknown_8E48D58:: @ 8E48D58 + .incbin "baserom.gba", 0xE48D58, 0x2E624 + + @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz gUnknown_8E7737C:: @ 8E7737C .incbin "baserom.gba", 0xE7737C, 0xE8 |