diff options
36 files changed, 856 insertions, 127 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 0c51eac84..3b3790736 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -8430,7 +8430,7 @@ _0800D7E4: .4byte gBattleTerrainTiles_Building _0800D7E8: .4byte 0x06008000 _0800D7EC: .4byte gBattleTerrainTilemap_Building _0800D7F0: .4byte 0x0600d000 -_0800D7F4: .4byte gUnknown_08E62AC0 +_0800D7F4: .4byte gBattleTerrainPalette_BattleTower _0800D7F8: movs r0, 0x80 lsls r0, 5 @@ -8455,7 +8455,7 @@ _0800D824: .4byte gBattleTerrainTiles_Cave _0800D828: .4byte 0x06008000 _0800D82C: .4byte gBattleTerrainTilemap_Cave _0800D830: .4byte 0x0600d000 -_0800D834: .4byte gUnknown_08E636E0 +_0800D834: .4byte gBattleTerrainPalette_Groudon _0800D838: ldr r0, _0800D84C ldr r1, _0800D850 @@ -8470,7 +8470,7 @@ _0800D84C: .4byte gBattleTerrainTiles_Water _0800D850: .4byte 0x06008000 _0800D854: .4byte gBattleTerrainTilemap_Water _0800D858: .4byte 0x0600d000 -_0800D85C: .4byte gUnknown_08E636A4 +_0800D85C: .4byte gBattleTerrainPalette_Kyogre _0800D860: movs r0, 0x8 ands r0, r1 @@ -8501,7 +8501,7 @@ _0800D898: .4byte gBattleTerrainTiles_Building _0800D89C: .4byte 0x06008000 _0800D8A0: .4byte gBattleTerrainTilemap_Building _0800D8A4: .4byte 0x0600d000 -_0800D8A8: .4byte gUnknown_08E63774 +_0800D8A8: .4byte gBattleTerrainPalette_BuildingLeader _0800D8AC: cmp r0, 0x20 bne _0800D8D8 @@ -8514,11 +8514,11 @@ _0800D8AC: ldr r0, _0800D8D4 b _0800DA66 .align 2, 0 -_0800D8C4: .4byte gUnknown_08E62DAC +_0800D8C4: .4byte gBattleTerrainTiles_Stadium _0800D8C8: .4byte 0x06008000 -_0800D8CC: .4byte gUnknown_08E633B4 +_0800D8CC: .4byte gBattleTerrainTilemap_Stadium _0800D8D0: .4byte 0x0600d000 -_0800D8D4: .4byte gUnknown_08E639A8 +_0800D8D4: .4byte gBattleTerrainPalette_StadiumSteven _0800D8D8: bl sav1_map_get_battletype lsls r0, 24 @@ -8592,7 +8592,7 @@ _0800D978: .4byte gBattleTerrainTiles_Building _0800D97C: .4byte 0x06008000 _0800D980: .4byte gBattleTerrainTilemap_Building _0800D984: .4byte 0x0600d000 -_0800D988: .4byte gUnknown_08E63738 +_0800D988: .4byte gBattleTerrainPalette_BuildingGym _0800D98C: ldr r0, _0800D9A0 ldr r1, _0800D9A4 @@ -8603,11 +8603,11 @@ _0800D98C: ldr r0, _0800D9B0 b _0800DA66 .align 2, 0 -_0800D9A0: .4byte gUnknown_08E62DAC +_0800D9A0: .4byte gBattleTerrainTiles_Stadium _0800D9A4: .4byte 0x06008000 -_0800D9A8: .4byte gUnknown_08E633B4 +_0800D9A8: .4byte gBattleTerrainTilemap_Stadium _0800D9AC: .4byte 0x0600d000 -_0800D9B0: .4byte gUnknown_08E63810 +_0800D9B0: .4byte gBattleTerrainPalette_StadiumMagma _0800D9B4: ldr r0, _0800D9C8 ldr r1, _0800D9CC @@ -8618,11 +8618,11 @@ _0800D9B4: ldr r0, _0800D9D8 b _0800DA66 .align 2, 0 -_0800D9C8: .4byte gUnknown_08E62DAC +_0800D9C8: .4byte gBattleTerrainTiles_Stadium _0800D9CC: .4byte 0x06008000 -_0800D9D0: .4byte gUnknown_08E633B4 +_0800D9D0: .4byte gBattleTerrainTilemap_Stadium _0800D9D4: .4byte 0x0600d000 -_0800D9D8: .4byte gUnknown_08E637B0 +_0800D9D8: .4byte gBattleTerrainPalette_StadiumAqua _0800D9DC: ldr r0, _0800D9F0 ldr r1, _0800D9F4 @@ -8633,11 +8633,11 @@ _0800D9DC: ldr r0, _0800DA00 b _0800DA66 .align 2, 0 -_0800D9F0: .4byte gUnknown_08E62DAC +_0800D9F0: .4byte gBattleTerrainTiles_Stadium _0800D9F4: .4byte 0x06008000 -_0800D9F8: .4byte gUnknown_08E633B4 +_0800D9F8: .4byte gBattleTerrainTilemap_Stadium _0800D9FC: .4byte 0x0600d000 -_0800DA00: .4byte gUnknown_08E6387C +_0800DA00: .4byte gBattleTerrainPalette_StadiumSidney _0800DA04: ldr r0, _0800DA18 ldr r1, _0800DA1C @@ -8648,11 +8648,11 @@ _0800DA04: ldr r0, _0800DA28 b _0800DA66 .align 2, 0 -_0800DA18: .4byte gUnknown_08E62DAC +_0800DA18: .4byte gBattleTerrainTiles_Stadium _0800DA1C: .4byte 0x06008000 -_0800DA20: .4byte gUnknown_08E633B4 +_0800DA20: .4byte gBattleTerrainTilemap_Stadium _0800DA24: .4byte 0x0600d000 -_0800DA28: .4byte gUnknown_08E638CC +_0800DA28: .4byte gBattleTerrainPalette_StadiumPhoebe _0800DA2C: ldr r0, _0800DA40 ldr r1, _0800DA44 @@ -8663,11 +8663,11 @@ _0800DA2C: ldr r0, _0800DA50 b _0800DA66 .align 2, 0 -_0800DA40: .4byte gUnknown_08E62DAC +_0800DA40: .4byte gBattleTerrainTiles_Stadium _0800DA44: .4byte 0x06008000 -_0800DA48: .4byte gUnknown_08E633B4 +_0800DA48: .4byte gBattleTerrainTilemap_Stadium _0800DA4C: .4byte 0x0600d000 -_0800DA50: .4byte gUnknown_08E63914 +_0800DA50: .4byte gBattleTerrainPalette_StadiumGlacia _0800DA54: ldr r0, _0800DA70 ldr r1, _0800DA74 @@ -8682,11 +8682,11 @@ _0800DA66: bl LoadCompressedPalette b _0800DA9E .align 2, 0 -_0800DA70: .4byte gUnknown_08E62DAC +_0800DA70: .4byte gBattleTerrainTiles_Stadium _0800DA74: .4byte 0x06008000 -_0800DA78: .4byte gUnknown_08E633B4 +_0800DA78: .4byte gBattleTerrainTilemap_Stadium _0800DA7C: .4byte 0x0600d000 -_0800DA80: .4byte gUnknown_08E63958 +_0800DA80: .4byte gBattleTerrainPalette_StadiumDrake _0800DA84: ldr r0, _0800DAA4 ldr r1, _0800DAA8 @@ -8707,7 +8707,7 @@ _0800DAA4: .4byte gBattleTerrainTiles_Building _0800DAA8: .4byte 0x06008000 _0800DAAC: .4byte gBattleTerrainTilemap_Building _0800DAB0: .4byte 0x0600d000 -_0800DAB4: .4byte gUnknown_08E62AC0 +_0800DAB4: .4byte gBattleTerrainPalette_BattleTower thumb_func_end sub_800D7B8 thumb_func_start sub_800DAB8 @@ -9673,14 +9673,14 @@ sub_800E23C: @ 800E23C b _0800E3FC .align 2, 0 _0800E29C: .4byte 0x020239f8 -_0800E2A0: .4byte gUnknown_08E5DA10 +_0800E2A0: .4byte gVersusFrameGfx _0800E2A4: .4byte 0x06004000 -_0800E2A8: .4byte gUnknown_08E5DAF8 +_0800E2A8: .4byte gVersusFrameTilemap _0800E2AC: .4byte 0x0600e000 _0800E2B0: .4byte 0x0600f000 _0800E2B4: .4byte gUnknown_08E5DC2C _0800E2B8: .4byte 0x06010000 -_0800E2BC: .4byte gUnknown_08E5DC04 +_0800E2BC: .4byte gVersusFramePal _0800E2C0: .4byte REG_BG1CNT _0800E2C4: .4byte 0x00005c04 _0800E2C8: .4byte REG_WININ @@ -9926,7 +9926,7 @@ _0800E4C0: .align 2, 0 _0800E4E4: .4byte gTrainers _0800E4E8: .4byte 0x0202ff5e -_0800E4EC: .4byte gUnknown_08E62DAC +_0800E4EC: .4byte gBattleTerrainTiles_Stadium _0800E4F0: bl sav1_map_get_battletype lsls r0, 24 @@ -9970,32 +9970,32 @@ _0800E54C: ldr r0, _0800E550 b _0800E57E .align 2, 0 -_0800E550: .4byte gUnknown_08E62DAC +_0800E550: .4byte gBattleTerrainTiles_Stadium _0800E554: ldr r0, _0800E558 b _0800E57E .align 2, 0 -_0800E558: .4byte gUnknown_08E62DAC +_0800E558: .4byte gBattleTerrainTiles_Stadium _0800E55C: ldr r0, _0800E560 b _0800E57E .align 2, 0 -_0800E560: .4byte gUnknown_08E62DAC +_0800E560: .4byte gBattleTerrainTiles_Stadium _0800E564: ldr r0, _0800E568 b _0800E57E .align 2, 0 -_0800E568: .4byte gUnknown_08E62DAC +_0800E568: .4byte gBattleTerrainTiles_Stadium _0800E56C: ldr r0, _0800E570 b _0800E57E .align 2, 0 -_0800E570: .4byte gUnknown_08E62DAC +_0800E570: .4byte gBattleTerrainTiles_Stadium _0800E574: ldr r0, _0800E578 b _0800E57E .align 2, 0 -_0800E578: .4byte gUnknown_08E62DAC +_0800E578: .4byte gBattleTerrainTiles_Stadium _0800E57C: ldr r0, _0800E588 _0800E57E: @@ -10057,7 +10057,7 @@ _0800E5CC: .align 2, 0 _0800E5F0: .4byte gTrainers _0800E5F4: .4byte 0x0202ff5e -_0800E5F8: .4byte gUnknown_08E633B4 +_0800E5F8: .4byte gBattleTerrainTilemap_Stadium _0800E5FC: bl sav1_map_get_battletype lsls r0, 24 @@ -10102,32 +10102,32 @@ _0800E658: ldr r0, _0800E65C b _0800E68A .align 2, 0 -_0800E65C: .4byte gUnknown_08E633B4 +_0800E65C: .4byte gBattleTerrainTilemap_Stadium _0800E660: ldr r0, _0800E664 b _0800E68A .align 2, 0 -_0800E664: .4byte gUnknown_08E633B4 +_0800E664: .4byte gBattleTerrainTilemap_Stadium _0800E668: ldr r0, _0800E66C b _0800E68A .align 2, 0 -_0800E66C: .4byte gUnknown_08E633B4 +_0800E66C: .4byte gBattleTerrainTilemap_Stadium _0800E670: ldr r0, _0800E674 b _0800E68A .align 2, 0 -_0800E674: .4byte gUnknown_08E633B4 +_0800E674: .4byte gBattleTerrainTilemap_Stadium _0800E678: ldr r0, _0800E67C b _0800E68A .align 2, 0 -_0800E67C: .4byte gUnknown_08E633B4 +_0800E67C: .4byte gBattleTerrainTilemap_Stadium _0800E680: ldr r0, _0800E684 b _0800E68A .align 2, 0 -_0800E684: .4byte gUnknown_08E633B4 +_0800E684: .4byte gBattleTerrainTilemap_Stadium _0800E688: ldr r0, _0800E694 _0800E68A: @@ -10161,12 +10161,12 @@ _0800E6AA: _0800E6C0: .4byte 0x020239f8 _0800E6C4: .4byte 0x00000902 _0800E6C8: .4byte gGameVersion -_0800E6CC: .4byte gUnknown_08E636E0 +_0800E6CC: .4byte gBattleTerrainPalette_Groudon _0800E6D0: ldr r0, _0800E6D4 b _0800E7A6 .align 2, 0 -_0800E6D4: .4byte gUnknown_08E636A4 +_0800E6D4: .4byte gBattleTerrainPalette_Kyogre _0800E6D8: movs r0, 0x8 ands r0, r1 @@ -10187,14 +10187,14 @@ _0800E6D8: .align 2, 0 _0800E6F8: .4byte gTrainers _0800E6FC: .4byte 0x0202ff5e -_0800E700: .4byte gUnknown_08E63774 +_0800E700: .4byte gBattleTerrainPalette_BuildingLeader _0800E704: cmp r0, 0x20 bne _0800E710 ldr r0, _0800E70C b _0800E7A6 .align 2, 0 -_0800E70C: .4byte gUnknown_08E639A8 +_0800E70C: .4byte gBattleTerrainPalette_StadiumSteven _0800E710: bl sav1_map_get_battletype lsls r0, 24 @@ -10237,37 +10237,37 @@ _0800E76C: ldr r0, _0800E770 b _0800E7A6 .align 2, 0 -_0800E770: .4byte gUnknown_08E63738 +_0800E770: .4byte gBattleTerrainPalette_BuildingGym _0800E774: ldr r0, _0800E778 b _0800E7A6 .align 2, 0 -_0800E778: .4byte gUnknown_08E63810 +_0800E778: .4byte gBattleTerrainPalette_StadiumMagma _0800E77C: ldr r0, _0800E780 b _0800E7A6 .align 2, 0 -_0800E780: .4byte gUnknown_08E637B0 +_0800E780: .4byte gBattleTerrainPalette_StadiumAqua _0800E784: ldr r0, _0800E788 b _0800E7A6 .align 2, 0 -_0800E788: .4byte gUnknown_08E6387C +_0800E788: .4byte gBattleTerrainPalette_StadiumSidney _0800E78C: ldr r0, _0800E790 b _0800E7A6 .align 2, 0 -_0800E790: .4byte gUnknown_08E638CC +_0800E790: .4byte gBattleTerrainPalette_StadiumPhoebe _0800E794: ldr r0, _0800E798 b _0800E7A6 .align 2, 0 -_0800E798: .4byte gUnknown_08E63914 +_0800E798: .4byte gBattleTerrainPalette_StadiumGlacia _0800E79C: ldr r0, _0800E7A0 b _0800E7A6 .align 2, 0 -_0800E7A0: .4byte gUnknown_08E63958 +_0800E7A0: .4byte gBattleTerrainPalette_StadiumDrake _0800E7A4: ldr r0, _0800E7B0 _0800E7A6: @@ -10276,7 +10276,7 @@ _0800E7A6: bl LoadCompressedPalette b _0800E7BC .align 2, 0 -_0800E7B0: .4byte gUnknown_08E62AC0 +_0800E7B0: .4byte gBattleTerrainPalette_BattleTower _0800E7B4: bl sub_800D74C b _0800E7BC @@ -67969,7 +67969,7 @@ _0802BB8C: .4byte gBattleTerrainTiles_Building _0802BB90: .4byte 0x06008000 _0802BB94: .4byte gBattleTerrainTilemap_Building _0802BB98: .4byte 0x0600d000 -_0802BB9C: .4byte gUnknown_08E62AC0 +_0802BB9C: .4byte gBattleTerrainPalette_BattleTower _0802BBA0: .4byte REG_BG3CNT _0802BBA4: .4byte 0x00005a0b _0802BBA8: .4byte 0x030041b0 @@ -80675,7 +80675,7 @@ _08032376: ldr r0, _08032384 b _08032396 .align 2, 0 -_08032384: .4byte gUnknown_08D2D4CC +_08032384: .4byte gSubstituteDollTilemap _08032388: adds r0, r5, 0 bl battle_side_get_owner @@ -80691,7 +80691,7 @@ _08032396: bl LZDecompressVram b _080323BA .align 2, 0 -_080323A4: .4byte gUnknown_08D2D28C +_080323A4: .4byte gSubstituteDollGfx _080323A8: .4byte gUnknown_081FAF4C _080323AC: ldr r0, _080323F4 @@ -80731,9 +80731,9 @@ _080323D4: bl LoadCompressedPalette b _08032456 .align 2, 0 -_080323F4: .4byte gUnknown_08D2D4CC +_080323F4: .4byte gSubstituteDollTilemap _080323F8: .4byte gUnknown_081FAF4C -_080323FC: .4byte gUnknown_08D2D268 +_080323FC: .4byte gSubstituteDollPal _08032400: .4byte 0x040000d4 _08032404: .4byte 0x84000200 _08032408: diff --git a/asm/rom5.s b/asm/rom5.s index add5dfe08..920ed8668 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -178143,7 +178143,7 @@ _080D1B24: .align 2, 0 _080D1B34: .4byte 0x000027de _080D1B38: .4byte 0x00002710 -_080D1B3C: .4byte gUnknown_08D229BC +_080D1B3C: .4byte gBattleAnimSpritePalette_206 _080D1B40: .4byte 0x02018000 _080D1B44: .4byte 0xffffc800 _080D1B48: .4byte 0x02014800 @@ -178977,9 +178977,9 @@ _080D21CC: .4byte 0x030041b4 _080D21D0: .4byte REG_BG1HOFS _080D21D4: .4byte 0x040000d4 _080D21D8: .4byte 0x85000400 -_080D21DC: .4byte gUnknown_08D24124 -_080D21E0: .4byte gUnknown_08D2368C -_080D21E4: .4byte gUnknown_08D240FC +_080D21DC: .4byte gAttractTilemap +_080D21E0: .4byte gAttractGfx +_080D21E4: .4byte gAttractPal _080D21E8: .4byte 0x03004b20 _080D21EC: .4byte sub_80D21F0 thumb_func_end sub_80D2100 @@ -179342,8 +179342,8 @@ _080D24B6: bx r0 .align 2, 0 _080D24CC: .4byte gUnknown_08E6E2E4 -_080D24D0: .4byte gUnknown_08D24DA4 -_080D24D4: .4byte gUnknown_08D24D7C +_080D24D0: .4byte gScaryFaceGfx +_080D24D4: .4byte gScaryFacePal _080D24D8: .4byte 0x03004b20 _080D24DC: .4byte sub_80D24E0 thumb_func_end sub_80D23B4 @@ -420341,7 +420341,7 @@ _08147C60: movs r0, 0x1 b _08147C86 .align 2, 0 -_08147C78: .4byte gUnknown_08E62AC0 +_08147C78: .4byte gBattleTerrainPalette_BattleTower _08147C7C: .4byte 0x02000000 _08147C80: .4byte 0x0001ffff _08147C84: diff --git a/data/graphics.s b/data/graphics.s index ff65d5f30..d6af0681b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1231,7 +1231,7 @@ gContestAudienceGfx:: @ 8D18818 .incbin "graphics/contest/audience.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD19474, 0x11C @ LZ, uncomp. size = 0x180 + .incbin "graphics/contest/faces.4bpp.lz" .align 2 gContestJudgeSymbolsGfx:: @ 8D19590 @@ -1562,16 +1562,16 @@ gUnknown_08D1D54C:: @ 8D1D54C .align 2 gUnknown_08D1D574:: @ 8D1D574 - .incbin "baserom.gba", 0xD1D574, 0x172 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" .align 2 - .incbin "baserom.gba", 0xD1D6E8, 0x10E @ LZ, uncomp. size = 0x600 + .incbin "graphics/unused/goosuto.4bpp.lz" @ ghost .align 2 - .incbin "baserom.gba", 0xD1D7F8, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/goosuto.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1D810, 0x14E @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/goosuto.bin.lz" .align 2 gBattleAnimSpriteSheet_174:: @ 8D1D960 @@ -1710,10 +1710,10 @@ gBattleWindowLarge2Gfx:: @ 8d1fc94 .incbin "graphics/interface/battle_window5.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF0C, 0x5D @ LZ, uncomp. size = 0x100 + .incbin "graphics/unused/shadow.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF6C, 0x12 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/shadow.gbapal.lz" .align 2 gBattleAnimSpriteSheet_014:: @ 8D1FF80 @@ -1872,7 +1872,6 @@ gBattleAnimSpriteSheet_206:: @ 8D227B0 .incbin "graphics/battle_anims/sprites/206.4bpp.lz" .align 2 -gUnknown_08D229BC:: gBattleAnimSpritePalette_206:: @ 8D229BC .incbin "graphics/battle_anims/sprites/206.gbapal.lz" @@ -1929,16 +1928,16 @@ gBattleAnimSpritePalette_216:: @ 8D2366C .incbin "graphics/battle_anims/sprites/216.gbapal.lz" .align 2 -gUnknown_08D2368C:: @ 8D2368C - .incbin "baserom.gba", 0xD2368C, 0xA6E @ LZ, uncomp. size = 0x2000 +gAttractGfx:: @ 8D2368C + .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" .align 2 -gUnknown_08D240FC:: @ 8D240FC - .incbin "baserom.gba", 0xD240FC, 0x28 @ LZ, uncomp. size = 0x20 +gAttractPal:: @ 8D240FC + .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" .align 2 -gUnknown_08D24124:: @ 8D24124 - .incbin "baserom.gba", 0xD24124, 0x27A @ LZ, uncomp. size = 0x800 +gAttractTilemap:: @ 8D24124 + .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" .align 2 gBattleAnimSpriteSheet_217:: @ 8D243A0 @@ -1977,12 +1976,12 @@ gBattleAnimSpritePalette_215:: @ 8D24D58 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 -gUnknown_08D24D7C:: @ 8D24D7C - .incbin "baserom.gba", 0xD24D7C, 0x28 @ LZ, uncomp. size = 0x20 +gScaryFacePal:: @ 8D24D7C + .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gUnknown_08D24DA4:: @ 8D24DA4 - .incbin "baserom.gba", 0xD24DA4, 0x22D @ LZ, uncomp. size = 0xA00 +gScaryFaceGfx:: @ 8D24DA4 + .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 gBattleAnimSpritePalette_218:: @ 8D24FD4 @@ -2293,16 +2292,16 @@ gBattleAnimSpritePalette_240:: @ 8D2D240 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 -gUnknown_08D2D268:: @ 8D2D268 - .incbin "baserom.gba", 0xD2D268, 0x24 @ LZ, uncomp. size = 0x20 +gSubstituteDollPal:: @ 8D2D268 + .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" .align 2 -gUnknown_08D2D28C:: @ 8D2D28C - .incbin "baserom.gba", 0xD2D28C, 0x23D @ LZ, uncomp. size = 0x800 +gSubstituteDollGfx:: @ 8D2D28C + .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" .align 2 -gUnknown_08D2D4CC:: @ 8D2D4CC - .incbin "baserom.gba", 0xD2D4CC, 0x225 @ LZ, uncomp. size = 0x800 +gSubstituteDollTilemap:: @ 8D2D4CC + .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 gBattleAnimSpriteSheet_241:: @ 8D2D6F4 @@ -2527,16 +2526,16 @@ gMonFootprint_QuestionMark:: @ 8E5D9F0 .incbin "graphics/pokemon/question_mark/footprint.1bpp" .align 2 -gUnknown_08E5DA10:: @ 8E5DA10 - .incbin "baserom.gba", 0xE5DA10, 0xE5 @ LZ, uncomp. size = 0x200 +gVersusFrameGfx:: @ 8E5DA10 + .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" .align 2 -gUnknown_08E5DAF8:: @ 8E5DAF8 - .incbin "baserom.gba", 0xE5DAF8, 0x10A @ LZ, uncomp. size = 0x800 +gVersusFrameTilemap:: @ 8E5DAF8 + .incbin "graphics/battle_transitions/vs_frame.bin.lz" .align 2 -gUnknown_08E5DC04:: @ 8E5DC04 - .incbin "baserom.gba", 0xE5DC04, 0x28 @ LZ, uncomp. size = 0x20 +gVersusFramePal:: @ 8E5DC04 + .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" .align 2 gUnknown_08E5DC2C:: @ 8E5DC2C @@ -2647,68 +2646,68 @@ gBattleTerrainTiles_Building:: @ 8E62514 .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" .align 2 -gUnknown_08E62AC0:: @ 8E62AC0 - .incbin "baserom.gba", 0xE62AC0, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BattleTower:: @ 8E62AC0 + .incbin "graphics/battle_terrain/stadium/battle_tower.gbapal.lz" @ this is also used for link battles .align 2 gBattleTerrainTilemap_Building:: @ 8E62AFC .incbin "graphics/battle_terrain/building/map.bin.lz" .align 2 -gUnknown_08E62DAC:: @ 8E62DAC - .incbin "baserom.gba", 0xE62DAC, 0x606 @ LZ, uncomp. size = 0x2000 +gBattleTerrainTiles_Stadium:: @ 8E62DAC + .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" .align 2 -gUnknown_08E633B4:: @ 8E633B4 - .incbin "baserom.gba", 0xE633B4, 0x2AE @ LZ, uncomp. size = 0x1000 +gBattleTerrainTilemap_Stadium:: @ 8E633B4 + .incbin "graphics/battle_terrain/stadium/map.bin.lz" .align 2 gBattleTerrainPalette_Building:: @ 8E63664 .incbin "graphics/battle_terrain/building/palette.gbapal.lz" .align 2 -gUnknown_08E636A4:: @ 8E636A4 - .incbin "baserom.gba", 0xE636A4, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Kyogre:: + .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" .align 2 -gUnknown_08E636E0:: @ 8E636E0 - .incbin "baserom.gba", 0xE636E0, 0x57 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Groudon:: + .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" .align 2 -gUnknown_08E63738:: @ 8E63738 - .incbin "baserom.gba", 0xE63738, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingGym:: @ 8E63738 + .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" .align 2 -gUnknown_08E63774:: @ 8E63774 - .incbin "baserom.gba", 0xE63774, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingLeader:: @ 8E63774 + .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" .align 2 -gUnknown_08E637B0:: @ 8E637B0 - .incbin "baserom.gba", 0xE637B0, 0x5E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumAqua:: @ 8E637B0 + .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" .align 2 -gUnknown_08E63810:: @ 8E63810 - .incbin "baserom.gba", 0xE63810, 0x6A @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumMagma:: @ 8E63810 + .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" .align 2 -gUnknown_08E6387C:: @ 8E6387C - .incbin "baserom.gba", 0xE6387C, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSidney:: @ 8E6387C + .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" .align 2 -gUnknown_08E638CC:: @ 8E638CC - .incbin "baserom.gba", 0xE638CC, 0x48 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumPhoebe:: @ 8E638CC + .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" .align 2 -gUnknown_08E63914:: @ 8E63914 - .incbin "baserom.gba", 0xE63914, 0x41 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumGlacia:: @ 8E63914 + .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" .align 2 -gUnknown_08E63958:: @ 8E63958 - .incbin "baserom.gba", 0xE63958, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumDrake:: @ 8E63958 + .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" .align 2 -gUnknown_08E639A8:: @ 8E639A8 - .incbin "baserom.gba", 0xE639A8, 0x3B @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSteven:: @ 8E639A8 + .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" .align 2 gBattleTerrainAnimTiles_TallGrass:: @ 8E639E4 diff --git a/graphics/battle_anims/backgrounds/attract.bin b/graphics/battle_anims/backgrounds/attract.bin Binary files differnew file mode 100755 index 000000000..b06f46479 --- /dev/null +++ b/graphics/battle_anims/backgrounds/attract.bin diff --git a/graphics/battle_anims/backgrounds/attract.pal b/graphics/battle_anims/backgrounds/attract.pal new file mode 100755 index 000000000..a3a183566 --- /dev/null +++ b/graphics/battle_anims/backgrounds/attract.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 172 205 +255 189 213 +255 205 222 +255 222 230 +148 8 0 +255 205 230 +255 180 213 +255 164 197 +255 148 189 +255 131 172 +246 106 139 +238 82 115 +238 57 90 +230 32 65 +230 8 41 diff --git a/graphics/battle_anims/backgrounds/attract.png b/graphics/battle_anims/backgrounds/attract.png Binary files differnew file mode 100755 index 000000000..c5bba0f89 --- /dev/null +++ b/graphics/battle_anims/backgrounds/attract.png diff --git a/graphics/battle_anims/backgrounds/scary_face.pal b/graphics/battle_anims/backgrounds/scary_face.pal new file mode 100755 index 000000000..580360ac0 --- /dev/null +++ b/graphics/battle_anims/backgrounds/scary_face.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +123 98 0 +189 172 0 +255 255 0 +255 189 0 +255 123 0 +255 57 0 +255 0 0 +230 8 16 +205 16 32 +180 24 49 +156 32 65 +131 41 82 +106 49 98 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/scary_face.png b/graphics/battle_anims/backgrounds/scary_face.png Binary files differnew file mode 100755 index 000000000..a395485cf --- /dev/null +++ b/graphics/battle_anims/backgrounds/scary_face.png diff --git a/graphics/battle_anims/masks/metal_shine.bin b/graphics/battle_anims/masks/metal_shine.bin Binary files differnew file mode 100755 index 000000000..fed60df36 --- /dev/null +++ b/graphics/battle_anims/masks/metal_shine.bin diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin Binary files differnew file mode 100755 index 000000000..d30c07d4e --- /dev/null +++ b/graphics/battle_anims/sprites/substitute.bin diff --git a/graphics/battle_anims/sprites/substitute.pal b/graphics/battle_anims/sprites/substitute.pal new file mode 100755 index 000000000..8b6e458a1 --- /dev/null +++ b/graphics/battle_anims/sprites/substitute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 238 197 +255 255 255 +230 238 222 +205 222 189 +189 205 164 +164 189 131 +148 172 106 +123 139 90 +106 106 82 +82 82 74 +65 49 65 +49 24 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/substitute.png b/graphics/battle_anims/sprites/substitute.png Binary files differnew file mode 100755 index 000000000..0b6dea850 --- /dev/null +++ b/graphics/battle_anims/sprites/substitute.png diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/building/palette2.pal new file mode 100755 index 000000000..3ca2e0b0c --- /dev/null +++ b/graphics/battle_terrain/building/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +164 197 246 +205 246 255 +180 222 255 +189 230 255 +197 238 255 +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/battle_terrain/building/palette3.pal b/graphics/battle_terrain/building/palette3.pal new file mode 100755 index 000000000..cebf5e687 --- /dev/null +++ b/graphics/battle_terrain/building/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 222 65 +255 255 180 +255 238 74 +255 246 115 +255 255 148 +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/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/cave/groudon.pal new file mode 100755 index 000000000..73021c957 --- /dev/null +++ b/graphics/battle_terrain/cave/groudon.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +213 115 32 +222 172 106 +230 197 139 +230 213 156 +238 230 180 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +82 106 172 +148 156 164 +197 189 164 +230 213 180 +238 230 180 +0 0 0 +106 74 65 +148 115 82 +180 139 90 +213 180 131 +230 213 156 +0 0 0 +205 148 74 +230 156 57 +255 172 49 +255 189 49 +205 148 74 +205 148 74 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/stadium/battle_tower.pal b/graphics/battle_terrain/stadium/battle_tower.pal new file mode 100755 index 000000000..10a842bcc --- /dev/null +++ b/graphics/battle_terrain/stadium/battle_tower.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +172 189 213 +238 238 246 +180 197 222 +205 222 238 +222 230 246 +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/battle_terrain/stadium/map.bin b/graphics/battle_terrain/stadium/map.bin Binary files differnew file mode 100755 index 000000000..d7bee6035 --- /dev/null +++ b/graphics/battle_terrain/stadium/map.bin diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/stadium/palette1.pal new file mode 100755 index 000000000..8252e3c5e --- /dev/null +++ b/graphics/battle_terrain/stadium/palette1.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 255 +65 131 213 +131 197 255 +148 205 246 +82 148 222 +172 213 246 +106 172 238 +98 164 246 +82 148 230 +98 164 246 +65 164 213 +106 189 230 +139 205 238 +180 230 238 +205 238 246 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 131 +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/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/stadium/palette2.pal new file mode 100755 index 000000000..48b2d851b --- /dev/null +++ b/graphics/battle_terrain/stadium/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +222 222 222 +222 106 0 +156 148 156 +172 164 172 +197 106 49 +189 180 189 +172 123 98 +238 131 0 +230 115 0 +246 131 0 +139 139 139 +156 148 156 +180 172 180 +197 189 197 +205 197 213 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +123 205 164 +189 255 230 +139 222 180 +156 238 197 +172 255 213 +0 0 0 +213 49 0 +255 222 139 +213 106 57 +246 180 16 +255 197 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/stadium/palette3.pal new file mode 100755 index 000000000..10c5b50d6 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +222 197 148 +246 222 172 +230 222 189 +230 205 156 +213 230 205 +238 213 164 +246 222 172 +238 205 164 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +205 172 131 +238 213 164 +238 222 189 +213 180 139 +238 230 222 +222 197 148 +230 205 156 +222 189 148 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 131 +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/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/stadium/palette4.pal new file mode 100755 index 000000000..201de5471 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette4.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +197 156 205 +230 205 238 +205 222 230 +205 172 213 +213 213 230 +213 189 222 +213 156 238 +205 164 222 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +197 139 205 +230 205 238 +205 222 230 +205 156 213 +213 213 230 +213 180 222 +213 156 238 +205 156 213 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +189 90 230 +230 213 246 +189 115 230 +197 139 230 +213 189 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_terrain/stadium/palette5.pal new file mode 100755 index 000000000..16f50d89b --- /dev/null +++ b/graphics/battle_terrain/stadium/palette5.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +139 172 238 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +131 164 230 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +90 148 238 +172 238 255 +106 172 238 +123 189 246 +164 222 255 +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/battle_terrain/stadium/palette6.pal b/graphics/battle_terrain/stadium/palette6.pal new file mode 100755 index 000000000..118a6a3bb --- /dev/null +++ b/graphics/battle_terrain/stadium/palette6.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +246 156 90 +197 197 197 +197 205 205 +230 164 123 +197 222 213 +213 180 156 +255 189 90 +255 172 90 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +230 115 32 +164 164 164 +172 189 180 +205 131 74 +180 213 205 +180 148 115 +255 148 32 +246 131 32 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +238 189 49 +255 255 131 +238 197 57 +246 222 74 +255 246 98 +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/battle_terrain/stadium/palette7.pal b/graphics/battle_terrain/stadium/palette7.pal new file mode 100755 index 000000000..b0c050be5 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette7.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 172 0 +255 238 131 +255 180 16 +255 197 41 +255 238 57 +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/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/stadium/tiles.png Binary files differnew file mode 100755 index 000000000..ece531ec0 --- /dev/null +++ b/graphics/battle_terrain/stadium/tiles.png diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/water/kyogre.pal new file mode 100755 index 000000000..eaa19730f --- /dev/null +++ b/graphics/battle_terrain/water/kyogre.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +0 0 0 +98 164 230 +131 197 255 +172 238 255 +255 255 255 +205 255 255 +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/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin Binary files differnew file mode 100755 index 000000000..2ad153964 --- /dev/null +++ b/graphics/battle_transitions/vs_frame.bin diff --git a/graphics/battle_transitions/vs_frame.pal b/graphics/battle_transitions/vs_frame.pal new file mode 100755 index 000000000..104afd395 --- /dev/null +++ b/graphics/battle_transitions/vs_frame.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +65 65 65 +255 255 255 +238 230 197 +213 205 131 +123 148 131 +82 106 98 +32 57 0 +57 82 65 +246 148 115 +222 106 90 +65 205 255 +255 255 255 +213 205 189 +131 131 139 +74 65 90 diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png Binary files differnew file mode 100755 index 000000000..0b38c8960 --- /dev/null +++ b/graphics/battle_transitions/vs_frame.png diff --git a/graphics/contest/faces.png b/graphics/contest/faces.png Binary files differnew file mode 100755 index 000000000..bba47a91d --- /dev/null +++ b/graphics/contest/faces.png diff --git a/graphics/unused/goosuto.bin b/graphics/unused/goosuto.bin Binary files differnew file mode 100755 index 000000000..8e5329157 --- /dev/null +++ b/graphics/unused/goosuto.bin diff --git a/graphics/unused/goosuto.pal b/graphics/unused/goosuto.pal new file mode 100755 index 000000000..4315453b8 --- /dev/null +++ b/graphics/unused/goosuto.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 255 255 +0 65 148 +148 65 148 +255 255 0 +255 255 255 +255 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/goosuto.png b/graphics/unused/goosuto.png Binary files differnew file mode 100755 index 000000000..257a25c71 --- /dev/null +++ b/graphics/unused/goosuto.png diff --git a/graphics/unused/shadow.pal b/graphics/unused/shadow.pal new file mode 100755 index 000000000..72d9b7406 --- /dev/null +++ b/graphics/unused/shadow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +238 238 238 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/shadow.png b/graphics/unused/shadow.png Binary files differnew file mode 100755 index 000000000..7d090ad3d --- /dev/null +++ b/graphics/unused/shadow.png @@ -12,6 +12,7 @@ BTLANMSPRGFXDIR := graphics/battle_anims/sprites PICFRAMEGFXDIR := graphics/picture_frame CONTESTGFXDIR := graphics/contest MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ @@ -197,4 +198,7 @@ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSE @cat $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp >$@ $(MASKSGFXDIR)/unknown_D2EDFC.4bpp: $(MASKSGFXDIR)/unknown_D2EDFC.png - $(GFX) $< $@ -num_tiles 14
\ No newline at end of file + $(GFX) $< $@ -num_tiles 14 + +$(BATTRANSGFXDIR)/vs_frame.4bpp: $(BATTRANSGFXDIR)/vs_frame.png + $(GFX) $< $@ -num_tiles 16 |
