diff options
107 files changed, 1473 insertions, 32 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index e93a714eb..7ef803c32 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gUnknown_8D0051C + ldr r1, _0800F458 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gUnknown_8D0051C +_0800F458: .4byte gMenuMapBin _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gUnknown_8D0051C + ldr r1, _0800FD10 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gUnknown_8D0051C +_0800FD10: .4byte gMenuMapBin _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 02d8f123f..884308c52 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gUnknown_8D0051C + ldr r1, _080471A0 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gUnknown_8D0051C +_080471A0: .4byte gMenuMapBin _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C diff --git a/asm/link.s b/asm/link.s index 90fccf86f..c70b5e8cf 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C sub_800AE1C: @ 800AE1C push {r4,r5,lr} sub sp, 0xC - ldr r1, _0800AEB8 @ =gUnknown_8231EE4 + ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _0800AEBC @ =gUnknown_823238C + ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C pop {r0} bx r0 .align 2, 0 -_0800AEB8: .4byte gUnknown_8231EE4 -_0800AEBC: .4byte gUnknown_823238C +_0800AEB8: .4byte gWirelessLinkDisplay4bpp +_0800AEBC: .4byte gWirelessLinkDisplayBin _0800AEC0: .4byte gUnknown_8231EC4 _0800AEC4: .4byte gUnknown_8234610 _0800AEC8: .4byte gUnknown_841DEF0 diff --git a/asm/pokeball.s b/asm/pokeball.s index b5d718a13..a60a05040 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/asm/trade.s b/asm/trade.s index 52cd8e2fa..967e0f1fa 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gUnknown_8D0051C + ldr r0, _080505BC @ =gMenuMapBin mov r8, r0 ldr r4, _080505C0 @ =gUnknown_201C000 adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gUnknown_8D0051C +_080505BC: .4byte gMenuMapBin _080505C0: .4byte gUnknown_201C000 _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC @@ -8490,7 +8490,7 @@ _08050AC4: ldr r1, _08050AF8 @ =0x00001241 movs r0, 0 bl SetGpuReg - ldr r0, _08050AFC @ =gUnknown_826BA5C + ldr r0, _08050AFC @ =gUnknown_3379A0Bin ldr r1, _08050B00 @ =0x06002800 bl LZ77UnCompVram movs r0, 0x8 @@ -8498,7 +8498,7 @@ _08050AC4: .align 2, 0 _08050AF4: .4byte gUnknown_2031DAC _08050AF8: .4byte 0x00001241 -_08050AFC: .4byte gUnknown_826BA5C +_08050AFC: .4byte gUnknown_3379A0Bin _08050B00: .4byte 0x06002800 _08050B04: ldr r1, _08050B28 @ =0x00001241 @@ -8529,7 +8529,7 @@ _08050B3C: movs r1, 0x30 movs r2, 0x20 bl LoadPalette - ldr r0, _08050B70 @ =gUnknown_826BF7C + ldr r0, _08050B70 @ =gWirelessSignal4bpp ldr r1, _08050B74 @ =0x06004000 bl LZ77UnCompVram ldr r0, _08050B78 @ =gUnknown_826C60C @@ -8548,7 +8548,7 @@ _08050B64: b _08050DB4 .align 2, 0 _08050B6C: .4byte gUnknown_826BF5C -_08050B70: .4byte gUnknown_826BF7C +_08050B70: .4byte gWirelessSignal4bpp _08050B74: .4byte 0x06004000 _08050B78: .4byte gUnknown_826C60C _08050B7C: .4byte 0x06009000 diff --git a/data/data.s b/data/data.s index c8b79e61a..d54a5c777 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 @@ -655,8 +658,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 @@ -667,8 +671,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 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_anims/sprites/smokescreen_impact.png b/graphics/battle_anims/sprites/smokescreen_impact.png Binary files differnew file mode 100644 index 000000000..01a94429a --- /dev/null +++ b/graphics/battle_anims/sprites/smokescreen_impact.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/dive.png b/graphics/interface/ball/dive.png Binary files differnew file mode 100644 index 000000000..5be9b1ed6 --- /dev/null +++ b/graphics/interface/ball/dive.png diff --git a/graphics/interface/ball/great.png b/graphics/interface/ball/great.png Binary files differnew file mode 100644 index 000000000..0c054d7d3 --- /dev/null +++ b/graphics/interface/ball/great.png diff --git a/graphics/interface/ball/luxury.png b/graphics/interface/ball/luxury.png Binary files differnew file mode 100644 index 000000000..8056416b2 --- /dev/null +++ b/graphics/interface/ball/luxury.png diff --git a/graphics/interface/ball/master.png b/graphics/interface/ball/master.png Binary files differnew file mode 100644 index 000000000..9787a8896 --- /dev/null +++ b/graphics/interface/ball/master.png diff --git a/graphics/interface/ball/nest.png b/graphics/interface/ball/nest.png Binary files differnew file mode 100644 index 000000000..a2fa81c1e --- /dev/null +++ b/graphics/interface/ball/nest.png diff --git a/graphics/interface/ball/net.png b/graphics/interface/ball/net.png Binary files differnew file mode 100644 index 000000000..6fef48101 --- /dev/null +++ b/graphics/interface/ball/net.png diff --git a/graphics/interface/ball/poke.png b/graphics/interface/ball/poke.png Binary files differnew file mode 100644 index 000000000..1e4aba669 --- /dev/null +++ b/graphics/interface/ball/poke.png diff --git a/graphics/interface/ball/premier.png b/graphics/interface/ball/premier.png Binary files differnew file mode 100644 index 000000000..f5aaadbaf --- /dev/null +++ b/graphics/interface/ball/premier.png diff --git a/graphics/interface/ball/repeat.png b/graphics/interface/ball/repeat.png Binary files differnew file mode 100644 index 000000000..5abe789a2 --- /dev/null +++ b/graphics/interface/ball/repeat.png diff --git a/graphics/interface/ball/safari.png b/graphics/interface/ball/safari.png Binary files differnew file mode 100644 index 000000000..0dd49aef9 --- /dev/null +++ b/graphics/interface/ball/safari.png diff --git a/graphics/interface/ball/timer.png b/graphics/interface/ball/timer.png Binary files differnew file mode 100644 index 000000000..2b63f6795 --- /dev/null +++ b/graphics/interface/ball/timer.png diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png Binary files differnew file mode 100644 index 000000000..1221cec4e --- /dev/null +++ b/graphics/interface/ball/ultra.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/menu_map.bin b/graphics/interface/menu_map.bin Binary files differnew file mode 100644 index 000000000..8a7b3f1f0 --- /dev/null +++ b/graphics/interface/menu_map.bin 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/interface/wireless_link_display.bin b/graphics/interface/wireless_link_display.bin Binary files differnew file mode 100644 index 000000000..1832ae850 --- /dev/null +++ b/graphics/interface/wireless_link_display.bin diff --git a/graphics/interface/wireless_link_display.png b/graphics/interface/wireless_link_display.png Binary files differnew file mode 100644 index 000000000..3946b9b22 --- /dev/null +++ b/graphics/interface/wireless_link_display.png diff --git a/graphics/pokemon/palettes/circled_question_mark_palette.pal b/graphics/pokemon/palettes/circled_question_mark_palette.pal new file mode 100644 index 000000000..681f1cefe --- /dev/null +++ b/graphics/pokemon/palettes/circled_question_mark_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 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 +205 205 205 +172 172 172 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal b/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal new file mode 100644 index 000000000..aa8d08dc3 --- /dev/null +++ b/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 172 172 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +172 172 172 +139 139 139 +222 222 222 +32 32 32 diff --git a/graphics/trade/unknown_3379A0.bin b/graphics/trade/unknown_3379A0.bin Binary files differnew file mode 100644 index 000000000..d1e364a29 --- /dev/null +++ b/graphics/trade/unknown_3379A0.bin diff --git a/graphics/trade/wireless_signal.bin b/graphics/trade/wireless_signal.bin Binary files differnew file mode 100644 index 000000000..4ce5d18b8 --- /dev/null +++ b/graphics/trade/wireless_signal.bin diff --git a/graphics/trade/wireless_signal.png b/graphics/trade/wireless_signal.png Binary files differnew file mode 100644 index 000000000..a48c70ae7 --- /dev/null +++ b/graphics/trade/wireless_signal.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_charmap.bin b/graphics/unused/old_charmap.bin Binary files differnew file mode 100644 index 000000000..aa15ea36e --- /dev/null +++ b/graphics/unused/old_charmap.bin diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png Binary files differnew file mode 100644 index 000000000..b5ea6e803 --- /dev/null +++ b/graphics/unused/old_charmap.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 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 876262eb2..055c459b2 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,4 +1,250 @@ +MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics +MONBACKGFXDIR := graphics/pokemon/back_pics +MONFRONTGFXDIR := graphics/pokemon/anim_front_pics +MONPALDIR := graphics/pokemon/palettes +TILESETGFXDIR := data/tilesets FONTGFXDIR := data/graphics/fonts +INTERFACEGFXDIR := graphics/interface +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +UNUSEDGFXDIR := graphics/unused +UNKNOWNGFXDIR := graphics/unknown +BATINTGFXDIR := graphics/battle_interface +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +RAYQUAZAGFXDIR := graphics/rayquaza_scene +ROULETTEGFXDIR := graphics/roulette +SLOTMACHINEGFXDIR := graphics/slot_machine +PKNAVGFXDIR := graphics/pokenav +PKNAVOPTIONSGFXDIR := graphics/pokenav/options +PSSGFXDIR := graphics/pokemon_storage +EVENTOBJGFXDIR := graphics/event_objects +MISCGFXDIR := graphics/misc + +types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark +contest_types := cool beauty cute smart tough + +$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp + @cat $^ >$@ + +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp + @cat $^ >$@ + +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp + @cat $^ >$@ + +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal + @cat $^ >$@ + +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal + @cat $^ >$@ + +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 159 + +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 498 + +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 450 + +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 493 + +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 328 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 478 + +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 425 + +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 278 + +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 17 + +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 460 + +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 120 + +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 312 + +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 345 + +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 355 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 430 + +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 431 + +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 + +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 469 + +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 150 + +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 60 + +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 148 + +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 484 + +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 294 + +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 342 + +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 505 + +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 310 + +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 424 + +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 382 + +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 95 + +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 374 + +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 136 + +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 $(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ @@ -32,3 +278,376 @@ $(FONTGFXDIR)/font5_jap.fwjpnfont: $(FONTGFXDIR)/font5_jap.png $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png $(GFX) $< $@ + +graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal + $(GFX) $< $@ -num_colors 224 + +graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 63 + +graphics/pokenav/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 29 + +$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \ + $(INTERFACEGFXDIR)/menu_1.gbapal + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp + @cat $^ >$@ + +$(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ + $(INTERFACEGFXDIR)/numbers1.4bpp \ + $(INTERFACEGFXDIR)/numbers2.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin + @cat $^ >$@ + +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 353 + +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 5 + +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp + @cat $^ >$@ + +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp + @cat $^ >$@ + +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 14 + +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 16 + +$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) + @cat $^ >$@ + +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal + @cat $^ >$@ + +$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 227 + +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 313 + +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 124 + +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp + cp $< $@ + head -c 12 /dev/zero >> $@ + +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 19 + +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 155 + +graphics/picture_frame/frame5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 86 + +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp + @cat $^ >$@ + +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 938 + +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp + @cat $^ >$@ + +$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \ + $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 822 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@ + +$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 8 + +$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 43 + +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp + @cat $^ >$@ + +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 13 + +$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 232 + +$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp + @cat $^ >$@ |
