diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-09-03 13:45:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 13:45:05 -0700 |
| commit | dbaf6e125020cac5d897983dc9dfbf8d3d74e589 (patch) | |
| tree | 2cf7c01a63ac97fc9e18e2b31bef0668ce72c92d | |
| parent | fc23707dc64abdc3219f72e7cb7992890737d00d (diff) | |
| parent | 48711cdf9aed3512b7229e7c8488b3c05ff64ff9 (diff) | |
Merge pull request #38 from TwitchPlaysPokemon/master
386 files changed, 5422 insertions, 818 deletions
diff --git a/.gitattributes b/.gitattributes index 5229f0d3f..18a043001 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ Makefile text eol=lf *.h text eol=lf *.pl text eol=lf *.inc text eol=lf +*.sha1 text eol=lf *.png binary *.bin binary diff --git a/asm/rom3.s b/asm/rom3.s index 862a7bc0f..a32cec299 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/rom4.s b/asm/rom4.s index 14fe79e77..f125cead0 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -41238,7 +41238,7 @@ sub_8065348: @ 8065348 pop {r0} bx r0 .align 2, 0 -_08065364: .4byte gUnknown_08EA0108 +_08065364: .4byte gTextWindowMainFrame_Gfx _08065368: .4byte 0x030005ae thumb_func_end sub_8065348 @@ -58703,14 +58703,14 @@ _0806D7BA: bx r1 .align 2, 0 _0806D7C4: .4byte 0x00007fff -_0806D7C8: .4byte gUnknown_08E71354 -_0806D7CC: .4byte gUnknown_08E71788 +_0806D7C8: .4byte gPartyMenuMisc_Gfx +_0806D7CC: .4byte gPartyMenuMisc_Tilemap _0806D7D0: .4byte 0x06003800 -_0806D7D4: .4byte gUnknown_08E716A0 +_0806D7D4: .4byte gPartyMenuMisc_Pal _0806D7D8: .4byte gFontDefaultPalette -_0806D7DC: .4byte gUnknown_08E71894 +_0806D7DC: .4byte gPartyMenuHpBar_Gfx _0806D7E0: .4byte 0x06006000 -_0806D7E4: .4byte gUnknown_08E71934 +_0806D7E4: .4byte gPartyMenuOrderText_Gfx _0806D7E8: .4byte 0x06006180 _0806D7EC: .4byte gStatusGfx_Icons _0806D7F0: .4byte 0x06007180 diff --git a/asm/rom5.s b/asm/rom5.s index b1257dc97..f7fcad083 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -37871,7 +37871,7 @@ _0808D400: .4byte 0x0202ffb4 _0808D404: .4byte 0x0000064a _0808D408: .4byte REG_BG2VOFS _0808D40C: .4byte 0x0000062d -_0808D410: .4byte gUnknown_08E86758 +_0808D410: .4byte gPokedexMenu_Gfx _0808D414: .4byte gUnknown_08E96738 _0808D418: .4byte 0x06006800 _0808D41C: .4byte gUnknown_08E9C6DC @@ -38137,7 +38137,7 @@ _0808D66E: bl LoadPalette b _0808D686 .align 2, 0 -_0808D678: .4byte gUnknown_08E87AF6 +_0808D678: .4byte gPokedexMenu_Pal + 0x2 _0808D67C: ldr r0, _0808D68C movs r1, 0x1 @@ -41844,7 +41844,7 @@ _0808F38C: adds r1, r3 b _0808F682 .align 2, 0 -_0808F3B8: .4byte gUnknown_08E86758 +_0808F3B8: .4byte gPokedexMenu_Gfx _0808F3BC: .4byte gUnknown_08E96BD4 _0808F3C0: .4byte 0x06007800 _0808F3C4: .4byte 0x0202ffbc @@ -42742,7 +42742,7 @@ _0808FB28: adds r1, r3 b _0808FDA0 .align 2, 0 -_0808FB44: .4byte gUnknown_08E86758 +_0808FB44: .4byte gPokedexMenu_Gfx _0808FB48: .4byte gUnknown_0839F8A0 _0808FB4C: .4byte 0x06007000 _0808FB50: .4byte 0x03001770 @@ -43422,7 +43422,7 @@ _08090120: adds r1, r2 b _08090368 .align 2, 0 -_0809013C: .4byte gUnknown_08E86758 +_0809013C: .4byte gPokedexMenu_Gfx _08090140: .4byte gUnknown_0839F988 _08090144: .4byte 0x06007000 _08090148: .4byte 0x03001770 @@ -44278,13 +44278,13 @@ _08090800: strh r0, [r4, 0x8] b _08090A26 .align 2, 0 -_08090840: .4byte gUnknown_08E86758 +_08090840: .4byte gPokedexMenu_Gfx _08090844: .4byte 0x06004000 _08090848: .4byte gUnknown_08E96BD4 _0809084C: .4byte 0x06007800 _08090850: .4byte 0x0000027f _08090854: .4byte 0x03004b20 -_08090858: .4byte gUnknown_08E87AF6 +_08090858: .4byte gPokedexMenu_Pal + 0x2 _0809085C: ldr r4, _0809088C adds r0, r4, 0 @@ -44637,7 +44637,7 @@ _08090B44: b _08090B7A .align 2, 0 _08090B68: .4byte 0x03004b20 -_08090B6C: .4byte gUnknown_08E87AF6 +_08090B6C: .4byte gPokedexMenu_Pal + 0x2 _08090B70: ldr r0, _08090B88 movs r1, 0x51 @@ -44651,7 +44651,7 @@ _08090B7A: pop {r0} bx r0 .align 2, 0 -_08090B88: .4byte gUnknown_08E87B56 +_08090B88: .4byte gPokedexMenu2_Pal + 0x2 thumb_func_end sub_8090A3C thumb_func_start sub_8090B8C @@ -47220,10 +47220,10 @@ _08091F10: _08091F1C: .4byte 0x0202f388 _08091F20: .4byte 0x0202ffb4 _08091F24: .4byte 0x0000064a -_08091F28: .4byte gUnknown_08E87DB0 +_08091F28: .4byte gPokedexMenuSearch_Gfx _08091F2C: .4byte gUnknown_08E96D2C _08091F30: .4byte 0x06007800 -_08091F34: .4byte gUnknown_08E882D8 + 0x2 +_08091F34: .4byte gPokedexMenuSearch_Pal + 0x2 _08091F38: .4byte 0x06007a80 _08091F3C: .4byte 0x06007b00 _08091F40: .4byte 0x06007ac0 @@ -51246,7 +51246,7 @@ _08093E4E: bx r0 .align 2, 0 _08093E84: .4byte gUnknown_083B5F6C -_08093E88: .4byte gUnknown_08E8B4E0 +_08093E88: .4byte gMenuTrainerCard_Gfx _08093E8C: .4byte 0x040000d4 _08093E90: .4byte 0x80000800 _08093E94: .4byte gBadgesTiles @@ -59324,13 +59324,13 @@ sub_8097E70: @ 8097E70 pop {r0} bx r0 .align 2, 0 -_08097F2C: .4byte gUnknown_08E8DEC0 +_08097F2C: .4byte gPSSMenuHeader_Gfx _08097F30: .4byte 0x06005000 -_08097F34: .4byte gUnknown_08E8E128 +_08097F34: .4byte gPSSMenuHeader_Tilemap _08097F38: .4byte 0x02039760 _08097F3C: .4byte 0x06007800 -_08097F40: .4byte gUnknown_08E8E0E8 -_08097F44: .4byte gUnknown_08E8E108 +_08097F40: .4byte gPSSMenu1_Pal +_08097F44: .4byte gPSSMenu2_Pal _08097F48: .4byte gUnknown_083B6D74 _08097F4C: .4byte gUnknown_083B6D94 _08097F50: .4byte gUnknownPalette_81E6692+0x2 @@ -59972,12 +59972,12 @@ sub_8098400: @ 8098400 .align 2, 0 _0809847C: .4byte REG_BG1CNT _08098480: .4byte 0x00000f01 -_08098484: .4byte gUnknown_08E8E244 +_08098484: .4byte gPSSMenuMisc_Gfx _08098488: .4byte 0x06006800 -_0809848C: .4byte gUnknown_08E8E6E8 +_0809848C: .4byte gPSSMenuMisc_Tilemap _08098490: .4byte 0x020000a8 -_08098494: .4byte gUnknown_08E8E6A8 -_08098498: .4byte gUnknown_08E8E6C8 +_08098494: .4byte gPSSMenu3_Pal +_08098498: .4byte gPSSMenu4_Pal _0809849C: .4byte 0x06007800 _080984A0: .4byte 0x040000d4 _080984A4: .4byte 0x81000400 @@ -71643,7 +71643,7 @@ _0809DF54: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF60: .4byte gUnknown_08E72A78 +_0809DF60: .4byte gStatusScreen_Gfx _0809DF64: ldr r0, _0809DF6C ldr r1, _0809DF70 @@ -71665,7 +71665,7 @@ _0809DF88: bl LZDecompressVram b _0809E030 .align 2, 0 -_0809DF94: .4byte gUnknown_08E73D08 +_0809DF94: .4byte gStatusScreen_Tilemap _0809DF98: .4byte 0x06004800 _0809DF9C: ldr r0, _0809DFA4 @@ -71692,7 +71692,7 @@ _0809DFC4: bl LoadCompressedPalette b _0809E030 .align 2, 0 -_0809DFD0: .4byte gUnknown_08E73468 +_0809DFD0: .4byte gStatusScreen_Pal _0809DFD4: ldr r0, _0809DFDC bl LoadCompressedObjectPic @@ -71736,7 +71736,7 @@ _0809E010: movs r0, 0x1 b _0809E03C .align 2, 0 -_0809E028: .4byte gUnknown_08E726E4 +_0809E028: .4byte gMoveTypes_Pal _0809E02C: .4byte 0x02018000 _0809E030: ldr r1, _0809E040 @@ -82572,7 +82572,7 @@ _080A355C: bl LZDecompressVram b _080A35EA .align 2, 0 -_080A3568: .4byte gUnknown_08E76728 +_080A3568: .4byte gBagScreen_Gfx _080A356C: .4byte 0x06004000 _080A3570: ldr r0, _080A3580 @@ -82602,7 +82602,7 @@ _080A3598: .align 2, 0 _080A35A4: .4byte gSaveBlock2 _080A35A8: .4byte 0x03000701 -_080A35AC: .4byte gUnknown_08E76F94 +_080A35AC: .4byte gBagScreenMale_Pal _080A35B0: ldr r0, _080A35BC movs r1, 0 @@ -82610,7 +82610,7 @@ _080A35B0: bl LoadCompressedPalette b _080A35EA .align 2, 0 -_080A35BC: .4byte gUnknown_08E76FCC +_080A35BC: .4byte gBagScreenFemale_Pal _080A35C0: ldr r0, _080A35D8 ldrb r0, [r0, 0x8] @@ -98862,8 +98862,8 @@ _080AB2DC: pop {r0} bx r0 .align 2, 0 -_080AB300: .4byte gUnknown_08D17D6C -_080AB304: .4byte gUnknown_08D18818 +_080AB300: .4byte gContestMiscGfx +_080AB304: .4byte gContestAudienceGfx _080AB308: .4byte 0x06002000 _080AB30C: .4byte gUnknown_08D1725C _080AB310: .4byte 0x0600d000 @@ -99430,7 +99430,7 @@ _080AB7A0: bl LZDecompressVram b _080AB946 .align 2, 0 -_080AB7AC: .4byte gUnknown_08D17D6C +_080AB7AC: .4byte gContestMiscGfx _080AB7B0: ldr r0, _080AB7EC ldr r4, _080AB7F0 @@ -99464,7 +99464,7 @@ _080AB7E6: ldr r0, [r1, 0x8] b _080AB946 .align 2, 0 -_080AB7EC: .4byte gUnknown_08D18818 +_080AB7EC: .4byte gContestAudienceGfx _080AB7F0: .4byte 0x06002000 _080AB7F4: .4byte 0x02015800 _080AB7F8: .4byte 0x040000d4 @@ -111900,7 +111900,7 @@ _080B19BC: .4byte 0x02019204 _080B19C0: .4byte 0x02020004 _080B19C4: .4byte 0x06010000 _080B19C8: .4byte REG_BG0CNT -_080B19CC: .4byte gUnknown_08E6978C +_080B19CC: .4byte gContestApplauseMeterGfx thumb_func_end sub_80B1928 thumb_func_start unref_sub_80B19D0 @@ -112814,14 +112814,14 @@ sub_80B208C: @ 80B208C b _080B20BA .align 2, 0 _080B20B0: .4byte 0x02019260 -_080B20B4: .4byte gUnknown_08E69478 +_080B20B4: .4byte gContestNextTurnNumbersGfx _080B20B8: ldr r0, _080B20C0 _080B20BA: pop {r1} bx r1 .align 2, 0 -_080B20C0: .4byte gUnknown_08E69578 +_080B20C0: .4byte gContestNextTurnRandomGfx thumb_func_end sub_80B208C thumb_func_start unref_sub_80B20C4 @@ -115013,9 +115013,9 @@ _080B3204: .4byte REG_BG1HOFS _080B3208: .4byte 0x0202f388 _080B320C: .4byte 0x040000d4 _080B3210: .4byte 0x85000100 -_080B3214: .4byte gUnknown_08E77804 +_080B3214: .4byte gBuyMenuFrame_Gfx _080B3218: .4byte 0x06007c00 -_080B321C: .4byte gUnknown_08E77928 +_080B321C: .4byte gBuyMenuFrame_Tilemap _080B3220: .4byte 0x02018000 _080B3224: .4byte gMenuMoneyPal _080B3228: .4byte gWindowConfig_81E6DFC @@ -123913,7 +123913,7 @@ sub_80B7568: @ 80B7568 pop {r0} bx r0 .align 2, 0 -_080B759C: .4byte gUnknown_08E85998 +_080B759C: .4byte gNamingScreenMenu_Gfx _080B75A0: .4byte 0x0202e9d4 _080B75A4: .4byte 0x040000d4 _080B75A8: .4byte 0x80000400 @@ -124780,7 +124780,7 @@ _080B7BAA: pop {r0} bx r0 .align 2, 0 -_080B7BD8: .4byte gUnknown_08EA2A44 +_080B7BD8: .4byte gDecoration10000_Gfx _080B7BDC: .4byte 0x06008000 _080B7BE0: .4byte 0xfffff000 _080B7BE4: .4byte 0x0600f800 @@ -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 @@ -179287,7 +179287,7 @@ _080D2448: .4byte 0x030041b4 _080D244C: .4byte REG_BG1HOFS _080D2450: .4byte 0x040000d4 _080D2454: .4byte 0x85000400 -_080D2458: .4byte gUnknown_08E6E4C8 +_080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest _080D245C: ldr r0, _080D2478 ldrb r0, [r0] @@ -179303,7 +179303,7 @@ _080D246E: b _080D2488 .align 2, 0 _080D2478: .4byte 0x0202f7c9 -_080D247C: .4byte gUnknown_08E6E100 +_080D247C: .4byte gBattleAnimBackgroundTilemap_ScaryFacePlayer _080D2480: ldr r0, _080D24CC ldr r1, [sp, 0x4] @@ -179341,9 +179341,9 @@ _080D24B6: pop {r0} bx r0 .align 2, 0 -_080D24CC: .4byte gUnknown_08E6E2E4 -_080D24D0: .4byte gUnknown_08D24DA4 -_080D24D4: .4byte gUnknown_08D24D7C +_080D24CC: .4byte gBattleAnimBackgroundTilemap_ScaryFaceOpponent +_080D24D0: .4byte gBattleAnimBackgroundImage_ScaryFace +_080D24D4: .4byte gBattleAnimBackgroundPalette_ScaryFace _080D24D8: .4byte 0x03004b20 _080D24DC: .4byte sub_80D24E0 thumb_func_end sub_80D23B4 @@ -182092,9 +182092,9 @@ _080D39CE: b _080D3A0E .align 2, 0 _080D39F0: .4byte gUnknown_08E70F0C -_080D39F4: .4byte gUnknown_08E6F620 +_080D39F4: .4byte gBattleAnimBackgroundImage_Surf _080D39F8: .4byte 0x03004b00 -_080D39FC: .4byte gUnknown_08E70940 +_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf _080D3A00: ldr r0, _080D3A78 mov r1, sp @@ -182154,7 +182154,7 @@ _080D3A0E: strh r0, [r7, 0xE] b _080D3AEE .align 2, 0 -_080D3A78: .4byte gUnknown_08E6A704 +_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal _080D3A7C: .4byte sub_80D3D68 _080D3A80: .4byte 0x03004b20 _080D3A84: .4byte 0x0000ffb0 @@ -191440,7 +191440,7 @@ _080D81C0: .4byte 0x040000d4 _080D81C4: .4byte 0x85000400 _080D81C8: .4byte gWeatherFog1Tiles _080D81CC: .4byte 0x80000400 -_080D81D0: .4byte gUnknown_08E6DE48 +_080D81D0: .4byte gWeatherFog1Tilemap _080D81D4: .4byte gUnknown_083970E8 _080D81D8: .4byte 0x03004b20 _080D81DC: .4byte sub_80D81E0 @@ -191834,7 +191834,7 @@ _080D84F8: .4byte 0x040000d4 _080D84FC: .4byte 0x85000400 _080D8500: .4byte gWeatherFog1Tiles _080D8504: .4byte 0x80000400 -_080D8508: .4byte gUnknown_08E6DE48 +_080D8508: .4byte gWeatherFog1Tilemap _080D850C: .4byte gUnknown_083970E8 _080D8510: .4byte 0x03004b20 _080D8514: .4byte 0x0000ffff @@ -201714,9 +201714,9 @@ _080DD164: .4byte 0x030041b4 _080DD168: .4byte REG_BG1HOFS _080DD16C: .4byte 0x040000d4 _080DD170: .4byte 0x85000400 -_080DD174: .4byte gUnknown_08E67ED8 -_080DD178: .4byte gUnknown_08E68054 -_080DD17C: .4byte gUnknown_08E68580 +_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew +_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew +_080DD17C: .4byte gBattleAnimSpritePalette_261 _080DD180: .4byte 0x03004b00 _080DD184: .4byte 0x0202f7c8 _080DD188: .4byte 0x03004b20 @@ -214534,7 +214534,7 @@ _080E3550: _080E3568: .4byte 0x02024a6a _080E356C: .4byte 0x03004360 _080E3570: .4byte 0x02024be0 -_080E3574: .4byte gUnknown_08D2DCDC +_080E3574: .4byte gBattleStatMask1_Tilemap _080E3578: ldr r0, _080E35B0 ldr r1, [sp, 0x4] @@ -214562,44 +214562,44 @@ _080E3598: ldr r0, _080E35B8 b _080E35FE .align 2, 0 -_080E35B0: .4byte gUnknown_08D2DDF8 -_080E35B4: .4byte gUnknown_08D2DACC -_080E35B8: .4byte gUnknown_08D2DF34 +_080E35B0: .4byte gBattleStatMask2_Tilemap +_080E35B4: .4byte gBattleStatMask_Gfx +_080E35B8: .4byte gBattleStatMask2_Pal _080E35BC: cmp r0, 0x1 bne _080E35C8 ldr r0, _080E35C4 b _080E35FE .align 2, 0 -_080E35C4: .4byte gUnknown_08D2DF14 +_080E35C4: .4byte gBattleStatMask1_Pal _080E35C8: cmp r0, 0x2 bne _080E35D4 ldr r0, _080E35D0 b _080E35FE .align 2, 0 -_080E35D0: .4byte gUnknown_08D2DF54 +_080E35D0: .4byte gBattleStatMask3_Pal _080E35D4: cmp r0, 0x3 bne _080E35E0 ldr r0, _080E35DC b _080E35FE .align 2, 0 -_080E35DC: .4byte gUnknown_08D2DF74 +_080E35DC: .4byte gBattleStatMask4_Pal _080E35E0: cmp r0, 0x4 bne _080E35EC ldr r0, _080E35E8 b _080E35FE .align 2, 0 -_080E35E8: .4byte gUnknown_08D2DFB4 +_080E35E8: .4byte gBattleStatMask6_Pal _080E35EC: cmp r0, 0x5 bne _080E35F8 ldr r0, _080E35F4 b _080E35FE .align 2, 0 -_080E35F4: .4byte gUnknown_08D2DFD4 +_080E35F4: .4byte gBattleStatMask7_Pal _080E35F8: cmp r0, 0x6 bne _080E3610 @@ -214612,7 +214612,7 @@ _080E35FE: bl LoadCompressedPalette b _080E361E .align 2, 0 -_080E360C: .4byte gUnknown_08D2DFF4 +_080E360C: .4byte gBattleStatMask8_Pal _080E3610: ldr r0, _080E3644 mov r1, sp @@ -214641,7 +214641,7 @@ _080E361E: strh r1, [r0, 0xA] b _080E3668 .align 2, 0 -_080E3644: .4byte gUnknown_08D2DF94 +_080E3644: .4byte gBattleStatMask5_Pal _080E3648: .4byte 0x030042c0 _080E364C: .4byte 0x030041b4 _080E3650: .4byte 0x03004b20 @@ -226243,10 +226243,10 @@ _080E8F34: .4byte 0x00000d09 _080E8F38: .4byte gUnknown_08E945D0 _080E8F3C: .4byte gUnknown_083DB694 _080E8F40: .4byte gUnknown_08E953D0 -_080E8F44: .4byte gUnknown_08E8EE18 +_080E8F44: .4byte gMenuWordGroupFrame_Gfx _080E8F48: .4byte 0x06008000 _080E8F4C: .4byte 0x06006800 -_080E8F50: .4byte gUnknown_08E8F178 +_080E8F50: .4byte gMenuWordGroupFrame1_Pal _080E8F54: .4byte REG_BG2CNT _080E8F58: .4byte 0x00000e02 _080E8F5C: .4byte 0x06007000 @@ -226445,8 +226445,8 @@ _080E90DA: pop {r0} bx r0 .align 2, 0 -_080E90F4: .4byte gUnknown_08E8F19A -_080E90F8: .4byte gUnknown_08E8F1A0 +_080E90F4: .4byte gMenuWordGroupFrame2_Pal + 0x2 +_080E90F8: .4byte gMenuWordGroupFrame2_Pal + 0x8 _080E90FC: .4byte gUnknown_083DB694 _080E9100: .4byte 0x00009c34 _080E9104: .4byte 0x00009c32 @@ -238212,7 +238212,7 @@ _080EEE90: bl LZ77UnCompVram b _080EEF18 .align 2, 0 -_080EEE9C: .4byte gUnknown_08E88D4C +_080EEE9C: .4byte gPokenavHoennMapMisc_Gfx _080EEEA0: .4byte 0x0600c000 _080EEEA4: ldr r0, _080EEEB0 @@ -238229,7 +238229,7 @@ _080EEEB8: bl LoadPalette b _080EEF18 .align 2, 0 -_080EEEC4: .4byte gUnknown_08E89628 +_080EEEC4: .4byte gPokenavHoennMap1_Pal _080EEEC8: movs r0, 0 bl sub_80EF58C @@ -239546,7 +239546,7 @@ _080EF92C: bl LZ77UnCompVram b _080EF9DC .align 2, 0 -_080EF938: .4byte gUnknown_08E892C4 +_080EF938: .4byte gPokenavHoennMapSquares_Gfx _080EF93C: .4byte 0x06005000 _080EF940: ldr r0, _080EF950 @@ -239556,7 +239556,7 @@ _080EF940: bl sub_80EFC3C b _080EF9DC .align 2, 0 -_080EF950: .4byte gUnknown_08E89648 +_080EF950: .4byte gPokenavHoennMapSquares_Pal _080EF954: bl sub_80EFC64 lsls r0, 24 @@ -240428,7 +240428,7 @@ _080F0028: bl LZ77UnCompVram b _080F0154 .align 2, 0 -_080F0034: .4byte gUnknown_08E89AD8 +_080F0034: .4byte gPokenavConditionView_Gfx _080F0038: .4byte 0x06005000 _080F003C: ldr r0, _080F0050 @@ -240442,7 +240442,7 @@ _080F003C: .align 2, 0 _080F0050: .4byte gUnknown_08E9AC4C _080F0054: .4byte 0x0600f000 -_080F0058: .4byte gUnknown_08E8A1C0 +_080F0058: .4byte gPokenavConditionMenu2_Pal _080F005C: ldr r0, _080F0088 ldr r0, [r0] @@ -240507,7 +240507,7 @@ _080F00AC: .align 2, 0 _080F00EC: .4byte gUnknown_083E0254 _080F00F0: .4byte gUnknownPalette_81E6692 -_080F00F4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F00F4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F00F8: ldr r0, _080F0110 ldr r0, [r0] @@ -240825,7 +240825,7 @@ _080F0380: bl LZ77UnCompVram b _080F0618 .align 2, 0 -_080F038C: .4byte gUnknown_08E9FA08 +_080F038C: .4byte gPokenavConditionSearch2_Gfx _080F0390: .4byte 0x06008000 _080F0394: ldr r6, _080F03FC @@ -240878,7 +240878,7 @@ _080F03FC: .4byte gUnknown_083E02B4 _080F0400: .4byte gUnknown_083E0334 _080F0404: .4byte gUnknown_083DFEC4 _080F0408: .4byte 0x000087ca -_080F040C: .4byte gUnknown_083E0294 +_080F040C: .4byte gPokenavConditionSearch2_Pal _080F0410: .4byte 0x0202eac8 _080F0414: .4byte gUnknownPalette_81E6692 _080F0418: @@ -242536,7 +242536,7 @@ _080F116C: bl LZ77UnCompVram b _080F1218 .align 2, 0 -_080F1178: .4byte gUnknown_08E9FB1C +_080F1178: .4byte gPokenavRibbonView_Gfx _080F117C: .4byte 0x06008000 _080F1180: ldr r0, _080F118C @@ -242571,7 +242571,7 @@ _080F1194: bl LoadPalette b _080F1218 .align 2, 0 -_080F11CC: .4byte gUnknown_08E9FAFC +_080F11CC: .4byte gPokenavRibbonView_Pal _080F11D0: .4byte gUnknown_083E03A8 _080F11D4: .4byte gUnknown_083E3C60 _080F11D8: .4byte gUnknownPalette_81E6692 @@ -242873,7 +242873,7 @@ _080F1424: .4byte 0x0600b800 _080F1428: .4byte 0x040000d4 _080F142C: .4byte 0x84000140 _080F1430: .4byte 0x0202eac8 -_080F1434: .4byte gUnknown_08E9FB18 +_080F1434: .4byte gPokenavRibbonView_Pal + 0x1C thumb_func_end sub_80F13FC thumb_func_start sub_80F1438 @@ -243159,7 +243159,7 @@ _080F1670: ldr r0, [r0, 0x8] b _080F16F0 .align 2, 0 -_080F1684: .4byte gUnknown_08EA0028 +_080F1684: .4byte gPokenavRibbonPokeView_Gfx _080F1688: .4byte 0x0600e000 _080F168C: .4byte 0x040000d4 _080F1690: .4byte 0x80000070 @@ -243347,7 +243347,7 @@ _080F17FE: bl LZ77UnCompVram b _080F1914 .align 2, 0 -_080F1808: .4byte gUnknown_08E89AD8 +_080F1808: .4byte gPokenavConditionView_Gfx _080F180C: .4byte 0x06005000 _080F1810: ldr r0, _080F1824 @@ -243361,7 +243361,7 @@ _080F1810: .align 2, 0 _080F1824: .4byte gUnknown_08E9AC4C _080F1828: .4byte 0x0600f000 -_080F182C: .4byte gUnknown_08E8A1C0 +_080F182C: .4byte gPokenavConditionMenu2_Pal _080F1830: ldr r0, _080F1850 ldr r3, _080F1854 @@ -243417,7 +243417,7 @@ _080F186C: .align 2, 0 _080F18AC: .4byte gUnknown_083E0254 _080F18B0: .4byte gUnknownPalette_81E6692 -_080F18B4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F18B4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F18B8: ldr r0, _080F18D0 ldr r0, [r0] @@ -243754,7 +243754,7 @@ _080F1B34: lsls r2, 2 b _080F1B44 .align 2, 0 -_080F1B3C: .4byte gUnknown_08E884CC +_080F1B3C: .4byte gPokenavMenuOptions_Gfx _080F1B40: ldr r0, _080F1B4C ldr r2, _080F1B50 @@ -243763,7 +243763,7 @@ _080F1B44: bl LZ77UnCompWram b _080F1B6C .align 2, 0 -_080F1B4C: .4byte gUnknown_08E89668 +_080F1B4C: .4byte gPokenavConditionMenu_Gfx _080F1B50: .4byte 0x00001788 _080F1B54: ldr r0, _080F1B64 @@ -243773,7 +243773,7 @@ _080F1B54: movs r0, 0 b _080F1B7C .align 2, 0 -_080F1B64: .4byte gUnknown_08E8AD04 +_080F1B64: .4byte gPokenavConditionSearch_Gfx _080F1B68: .4byte 0x00002388 _080F1B6C: ldr r0, _080F1B84 @@ -245105,9 +245105,9 @@ _080F2532: ldr r0, _080F2554 b _080F257A .align 2, 0 -_080F254C: .4byte gUnknown_08E88A28 +_080F254C: .4byte gPokenavMenuOptions1_Pal _080F2550: .4byte 0xffff0000 -_080F2554: .4byte gUnknown_08E88A48 +_080F2554: .4byte gPokenavMenuOptions2_Pal _080F2558: ldr r0, _080F2564 str r0, [sp] @@ -245116,7 +245116,7 @@ _080F2558: strh r0, [r1, 0x4] b _080F2580 .align 2, 0 -_080F2564: .4byte gUnknown_08E89958 +_080F2564: .4byte gPokenavConditionMenu_Pal _080F2568: ldr r0, _080F2590 str r0, [sp] @@ -245139,8 +245139,8 @@ _080F2586: pop {r0} bx r0 .align 2, 0 -_080F2590: .4byte gUnknown_08E8B1C4 -_080F2594: .4byte gUnknown_08E8B1E4 +_080F2590: .4byte gPokenavCondition6_Pal +_080F2594: .4byte gPokenavCondition7_Pal thumb_func_end sub_80F2514 thumb_func_start sub_80F2598 @@ -245326,7 +245326,7 @@ _080F2704: ldr r2, _080F2718 b _080F279C .align 2, 0 -_080F2710: .4byte gUnknown_08E88358 +_080F2710: .4byte gPokenavMainMenu_Gfx _080F2714: .4byte gUnknown_083DFEC4 _080F2718: .4byte 0x00003b98 _080F271C: @@ -245336,7 +245336,7 @@ _080F271C: ldr r2, _080F2730 b _080F279C .align 2, 0 -_080F2728: .4byte gUnknown_08E89978 +_080F2728: .4byte gPokenavConditionMenuHeader_Gfx _080F272C: .4byte gUnknown_083DFEC4 _080F2730: .4byte 0x00004198 _080F2734: @@ -245346,7 +245346,7 @@ _080F2734: ldr r2, _080F2748 b _080F279C .align 2, 0 -_080F2740: .4byte gUnknown_08E8B3A0 +_080F2740: .4byte gPokenavRibbonsHeader_Gfx _080F2744: .4byte gUnknown_083DFEC4 _080F2748: .4byte 0x00004d98 _080F274C: @@ -245356,7 +245356,7 @@ _080F274C: ldr r2, _080F2760 b _080F279C .align 2, 0 -_080F2758: .4byte gUnknown_08E88A88 +_080F2758: .4byte gPokenavHoennMapHeader_Gfx _080F275C: .4byte gUnknown_083DFEC4 _080F2760: .4byte 0x00005398 _080F2764: @@ -245366,7 +245366,7 @@ _080F2764: ldr r2, _080F2778 b _080F279C .align 2, 0 -_080F2770: .4byte gUnknown_08E8A1E0 +_080F2770: .4byte gPokenavConditionMenuOptions_Gfx _080F2774: .4byte gUnknown_083DFEC4 _080F2778: .4byte 0x00005f98 _080F277C: @@ -245376,7 +245376,7 @@ _080F277C: ldr r2, _080F2790 b _080F279C .align 2, 0 -_080F2788: .4byte gUnknown_08E8A5D8 +_080F2788: .4byte gPokenavConditionMenuOptions2_Gfx _080F278C: .4byte gUnknown_083DFEC4 _080F2790: .4byte 0x00006798 _080F2794: @@ -245389,7 +245389,7 @@ _080F279C: bl LZ77UnCompWram b _080F27C0 .align 2, 0 -_080F27A4: .4byte gUnknown_08E8B204 +_080F27A4: .4byte gPokenavTrainersEyesHeader_Gfx _080F27A8: .4byte gUnknown_083DFEC4 _080F27AC: .4byte 0x00004798 _080F27B0: @@ -255407,7 +255407,7 @@ _080F7558: b _080F75FE .align 2, 0 _080F7580: .4byte 0x020388b8 -_080F7584: .4byte gUnknown_08E8A7C4 +_080F7584: .4byte gPokenavConditionMenuMisc_Gfx _080F7588: .4byte 0x03001770 _080F758C: movs r0, 0x80 @@ -255740,7 +255740,7 @@ _080F7770: b _080F787A .align 2, 0 _080F7820: .4byte 0x020388b8 -_080F7824: .4byte gUnknown_08E8A7C4 +_080F7824: .4byte gPokenavConditionMenuMisc_Gfx _080F7828: .4byte gUnknown_08E966B8 _080F782C: .4byte gUnknown_083E5214 _080F7830: .4byte gSpriteAnimTable_83E52AC @@ -286892,7 +286892,7 @@ sub_81063C0: @ 81063C0 pop {r0} bx r0 .align 2, 0 -_081063F0: .4byte gUnknown_08E99848 +_081063F0: .4byte gSlotMachineReelTimeLights_Gfx _081063F4: .4byte 0x02010000 _081063F8: .4byte gUnknown_083EDE8C _081063FC: .4byte gUnknown_083EDC2C @@ -286980,7 +286980,7 @@ _08106468: pop {r0} bx r0 .align 2, 0 -_081064A0: .4byte gUnknown_08E8F844 +_081064A0: .4byte gSlotMachine_Gfx _081064A4: .4byte 0x02010000 _081064A8: .4byte 0x040000d4 _081064AC: .4byte 0x80000800 @@ -295790,9 +295790,9 @@ _0810A77C: .align 2, 0 _0810A7F8: .4byte 0x040000d4 _0810A7FC: .4byte 0x81000800 -_0810A800: .4byte gUnknown_08E8F1B8 +_0810A800: .4byte gMiscClock_Gfx _0810A804: .4byte 0x0202e8cc -_0810A808: .4byte gUnknown_08E8F804 +_0810A808: .4byte gMiscClockMale_Pal _0810A80C: ldr r0, _0810A850 movs r1, 0 @@ -295819,7 +295819,7 @@ _0810A816: pop {r0} bx r0 .align 2, 0 -_0810A850: .4byte gUnknown_08E8F824 +_0810A850: .4byte gMiscClockFemale_Pal _0810A854: .4byte gUnknown_083F7A90 _0810A858: .4byte gUnknown_083F7AA0 _0810A85C: .4byte gWindowConfig_81E6C3C @@ -298048,7 +298048,7 @@ _0810B9D0: bl LZDecompressVram b _0810BA0E .align 2, 0 -_0810B9DC: .4byte gUnknown_08E77AE4 +_0810B9DC: .4byte gMenuPokeblock_Gfx _0810B9E0: .4byte 0x06008000 _0810B9E4: ldr r0, _0810B9F0 @@ -298056,7 +298056,7 @@ _0810B9E4: bl sub_800D238 b _0810BA0E .align 2, 0 -_0810B9F0: .4byte gUnknown_08E78078 +_0810B9F0: .4byte gMenuPokeblock_Tilemap _0810B9F4: .4byte 0x020221cc _0810B9F8: ldr r0, _0810BA04 @@ -298065,7 +298065,7 @@ _0810B9F8: bl LoadCompressedPalette b _0810BA0E .align 2, 0 -_0810BA04: .4byte gUnknown_08E77D20 +_0810BA04: .4byte gMenuPokeblock_Pal _0810BA08: ldr r0, _0810BA1C bl LoadCompressedObjectPic @@ -345641,8 +345641,8 @@ _08123464: .4byte gCableCarTreeTilemap _08123468: .4byte gCableCarMountainTilemap _0812346C: .4byte gCableCarPylonStemTilemap _08123470: .4byte 0x000009d8 -_08123474: .4byte gUnknown_08E7EB9C -_08123478: .4byte gUnknown_08E7EC3C +_08123474: .4byte gCableCarBG_Pal +_08123478: .4byte gCableCarBG_Gfx _0812347C: .4byte 0x03001770 _08123480: .4byte 0x0000043c _08123484: @@ -395734,9 +395734,9 @@ sub_813B808: @ 813B808 pop {r0} bx r0 .align 2, 0 -_0813B848: .4byte gUnknown_08E9C798 -_0813B84C: .4byte gUnknown_08E9CA24 -_0813B850: .4byte gUnknown_08E9CA44 +_0813B848: .4byte gIntroCopyright_Gfx +_0813B84C: .4byte gIntroCopyright_Pal +_0813B850: .4byte gIntroCopyright_Tilemap thumb_func_end sub_813B808 thumb_func_start SerialCb_CopyrightScreen @@ -411575,7 +411575,7 @@ _0814350A: pop {r0} bx r0 .align 2, 0 -_0814354C: .4byte gUnknown_08E8E8B0 +_0814354C: .4byte gHallOfFame_Gfx _08143550: .4byte 0x040000d4 _08143554: .4byte 0x81000800 _08143558: .4byte 0x06003800 @@ -411583,7 +411583,7 @@ _0814355C: .4byte 0x02000000 _08143560: .4byte 0x06003b80 _08143564: .4byte 0x06003000 _08143568: .4byte 0x000003ff -_0814356C: .4byte gUnknown_08E8EA78 +_0814356C: .4byte gHallOfFame_Pal thumb_func_end sub_81433E0 thumb_func_start sub_8143570 @@ -415141,8 +415141,8 @@ _081451D0: pop {r0} bx r0 .align 2, 0 -_081451EC: .4byte gUnknown_08EA260C -_081451F0: .4byte gUnknown_08E9CA24 +_081451EC: .4byte gCreditsCopyrightEnd_Gfx +_081451F0: .4byte gIntroCopyright_Pal _081451F4: .4byte 0x000003ff _081451F8: .4byte 0x060001c8 _081451FC: .4byte 0x06000248 @@ -417285,7 +417285,7 @@ _081462FC: bl LZDecompressVram b _081463CA .align 2, 0 -_08146308: .4byte gUnknown_08E783FC +_08146308: .4byte gBerryCheck_Gfx _0814630C: ldr r0, _0814631C ldr r1, _08146320 @@ -417364,7 +417364,7 @@ _081463A4: adds r1, r2 b _081463D0 .align 2, 0 -_081463B8: .4byte gUnknown_08E7883C +_081463B8: .4byte gBerryCheck_Pal _081463BC: .4byte 0x02000000 _081463C0: .4byte 0x0001ffff _081463C4: @@ -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/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 8084bab9a..3ed3333d8 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -9374,7 +9374,7 @@ _080457BA: bx r0 .align 2, 0 _080457C8: .4byte 0x02020004 -_080457CC: .4byte gUnknown_08E903F8 +_080457CC: .4byte gBattleInterfaceStatusIcons_DynPal _080457D0: .4byte 0x0202ecc8 _080457D4: .4byte 0x05000200 _080457D8: .4byte 0x06010000 diff --git a/compare-ruby.sh b/compare-ruby.sh new file mode 100755 index 000000000..5fbd2a1c8 --- /dev/null +++ b/compare-ruby.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Compares baserom-ruby.gba and pokeruby.gba + +# create baserom.txt if necessary +if [ ! -f baserom-ruby.txt ]; then + hexdump -C baserom-ruby.gba > baserom-ruby.txt +fi + +hexdump -C pokeruby.gba > pokeruby.txt + +diff -u baserom-ruby.txt pokeruby.txt | less diff --git a/compare-sapphire.sh b/compare-sapphire.sh new file mode 100755 index 000000000..b4047e81d --- /dev/null +++ b/compare-sapphire.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Compares baserom-sapphire.gba and pokesapphire.gba + +# create baserom.txt if necessary +if [ ! -f baserom-sapphire.txt ]; then + hexdump -C baserom-sapphire.gba > baserom-sapphire.txt +fi + +hexdump -C pokesapphire.gba > pokesapphire.txt + +diff -u baserom-sapphire.txt pokesapphire.txt | less diff --git a/data/data2.s b/data/data2.s index ac8806eba..191542eed 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1705,7 +1705,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C .align 2 gUnknown_081FAF24:: @ 81FAF24 - obj_tiles gUnknown_08E6A728, 128, 0xD759 + obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 .align 2 gOamData_81FAF2C:: @ 81FAF2C @@ -2358,8 +2358,8 @@ gSubspriteTables_820A6EC:: @ 820A6EC .align 2 gUnknown_0820A754:: @ 820A754 - obj_tiles gUnknown_08E6A758, 512, 0xd70c - obj_tiles gUnknown_08E6A758, 512, 0xd70d + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d .align 2 gUnknown_0820A764:: @ 820A764 @@ -7858,46 +7858,26 @@ gUnknown_083761EC:: @ 83761EC .align 2 gUnknown_083761F0:: @ 83761F0 - .4byte gUnknown_08E9ADDC - .4byte gUnknown_08E9AEFC - .4byte gUnknown_08E9AF1C - .4byte gUnknown_08E9B03C - .4byte gUnknown_08E9B05C - .4byte gUnknown_08E9B17C - .4byte gUnknown_08E9B19C - .4byte gUnknown_08E9B2BC - .4byte gUnknown_08E9B2DC - .4byte gUnknown_08E9B3FC - .4byte gUnknown_08E9B41C - .4byte gUnknown_08E9B53C - .4byte gUnknown_08E9B55C - .4byte gUnknown_08E9B67C - .4byte gUnknown_08E9B69C - .4byte gUnknown_08E9B7BC - .4byte gUnknown_08E9B7DC - .4byte gUnknown_08E9B8FC - .4byte gUnknown_08E9B91C - .4byte gUnknown_08E9BA3C - .4byte gUnknown_08E9BA5C - .4byte gUnknown_08E9BB7C - .4byte gUnknown_08E9BB9C - .4byte gUnknown_08E9BCBC - .4byte gUnknown_08E9BCDC - .4byte gUnknown_08E9BDFC - .4byte gUnknown_08E9BE1C - .4byte gUnknown_08E9BF3C - .4byte gUnknown_08E9BF5C - .4byte gUnknown_08E9C07C - .4byte gUnknown_08E9C09C - .4byte gUnknown_08E9C1BC - .4byte gUnknown_08E9C1DC - .4byte gUnknown_08E9C2FC - .4byte gUnknown_08E9C31C - .4byte gUnknown_08E9C43C - .4byte gUnknown_08E9C45C - .4byte gUnknown_08E9C57C - .4byte gUnknown_08E9C59C - .4byte gUnknown_08E9C6BC + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal gUnknown_08376290:: @ 8376290 .incbin "baserom.gba", 0x00376290, 0x48 @@ -11227,7 +11207,7 @@ gSpriteTemplate_8393F74:: @ 8393F74 .align 2 gUnknown_08393F8C:: @ 8393F8C - obj_tiles Tiles_E9D644, 0x520, 1001 + obj_tiles gTitleScreenPressStart_Gfx, 0x520, 1001 null_obj_tiles .align 2 @@ -11291,7 +11271,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_3 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - + @.4byte unk_20000000 .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000? .align 2 @@ -12641,12 +12621,12 @@ gSpriteTemplate_83A05B4:: @ 83A05B4 .align 2 gUnknown_083A05CC:: @ 83A05CC - obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000 + obj_tiles gPokedexMenu2_Gfx, 0x1F00, 0x1000 null_obj_tiles .align 2 gUnknown_083A05DC:: @ 83A05DC - obj_pal gUnknown_08E87AF4, 0x1000 + obj_pal gPokedexMenu_Pal, 0x1000 null_obj_pal gUnknown_083A05EC:: @ 83A05EC @@ -12944,11 +12924,11 @@ gUnknown_083B5EF4:: @ 83B5EF4 .align 2 gUnknown_083B5EF8:: @ 83B5EF8 - .4byte gUnknown_08E8C8E0 - .4byte gUnknown_08E8C940 - .4byte gUnknown_08E8C9A0 - .4byte gUnknown_08E8CA00 - .4byte gUnknown_08E8CA60 + .4byte gMenuTrainerCard0Star_Pal + .4byte gMenuTrainerCard1Star_Pal + .4byte gMenuTrainerCard2Star_Pal + .4byte gMenuTrainerCard3Star_Pal + .4byte gMenuTrainerCard4Star_Pal gUnknown_083B5F0C:: @ 83B5F0C .incbin "baserom.gba", 0x003b5f0c, 0x20 @@ -13986,7 +13966,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C .align 2 gUnknown_083C11B8:: @ 83C11B8 - obj_tiles gUnknown_08E71D10, 5888, 0x7532 + obj_tiles gMoveTypes_Gfx, 5888, 0x7532 .align 2 gSpriteTemplate_83C11C0:: @ 83C11C0 @@ -14478,11 +14458,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04 .align 2 gUnknown_083C1F74:: @ 83C1F74 - obj_tiles gUnknown_08E78BB4, 2048, 0x2710 + obj_tiles gBerryCheckCircle_Gfx, 2048, 0x2710 .align 2 gUnknown_083C1F7C:: @ 83C1F7C - obj_pal gUnknown_08E7883C, 0x2710 + obj_pal gBerryCheck_Pal, 0x2710 .align 2 gOamData_83C1F84:: @ 83C1F84 @@ -18636,8 +18616,8 @@ gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74 spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014 .align 2 - .incbin "graphics/unused/unknown_3D7D8C.4bpp" - .incbin "graphics/unused/unknown_3D810C.bin" + .incbin "graphics/unknown/unknown_3D7D8C.4bpp" + .incbin "graphics/unknown/unknown_3D810C.bin" .align 2 gSpriteAnim_83D910C:: @ 83D910C @@ -21515,11 +21495,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48 .align 2 gUnknown_083DBD60:: @ 83DBD60 - obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007 + obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007 .align 2 gUnknown_083DBD68:: @ 83DBD68 - obj_pal gMenuWordGroup_Pal, 0x0005 + obj_pal gMenuWordGroupIndicator_Pal, 0x0005 .align 2 gOamData_83DBD70:: @ 83DBD70 @@ -21651,8 +21631,9 @@ gUnknown_083E0254:: @ 83E0254 gUnknown_083E0274:: @ 83E0274 .incbin "baserom.gba", 0x003e0274, 0x20 -gUnknown_083E0294:: @ 83E0294 - .incbin "baserom.gba", 0x003e0294, 0x20 + .align 2 +gPokenavConditionSearch2_Pal:: @ 83E0294 + .incbin "graphics/pokenav/condition_search2.gbapal" gUnknown_083E02B4:: @ 83E02B4 .incbin "baserom.gba", 0x003e02b4, 0x60 @@ -21660,9 +21641,11 @@ gUnknown_083E02B4:: @ 83E02B4 gUnknown_083E0314:: @ 83E0314 .incbin "baserom.gba", 0x003e0314, 0x20 + .align 2 gUnknown_083E0334:: @ 83E0334 .incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced + .align 2 gUnknown_083E0354:: @ 83E0354 .incbin "graphics/pokenav/trainereyes_misc.4bpp.lz" @@ -21837,31 +21820,42 @@ gUnknown_083E3270:: @ 83E3270 .4byte sub_80F0A24 .4byte sub_80F0A74 + .align 2 gPokenavIconPalette:: .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_083E329C:: @ 83E329C .incbin "graphics/pokenav/icon.4bpp.lz" -gPokenavContestPokeballTiles:: - .incbin "graphics/pokenav/contest_pokeball.4bpp" + + .align 2 +gPokenavPokeballTiles:: + .incbin "graphics/pokenav/pokeball.4bpp" + + .align 2 gUnknown_083E3780: @ 83E3780 .incbin "baserom.gba", 0x3e3780, 0x20 .align 2 -gContestSparkle_Pal:: - .incbin "graphics/pokenav/contest_sparkle.gbapal" +gPokenavSparkle_Pal:: + .incbin "graphics/pokenav/sparkle.gbapal" + + .align 2 +gPokenavSparkle_Gfx:: + .incbin "graphics/pokenav/sparkle.4bpp" .align 2 -gContestSparkle_Gfx:: - .incbin "graphics/pokenav/contest_sparkle.4bpp" +gPokenavUpDownArrows_Gfx:: + .incbin "graphics/pokenav/arrows.4bpp" -gContestArrows_Gfx:: - .incbin "graphics/pokenav/contest_arrows.4bpp" gUnknown_083E3BC0:: .incbin "baserom.gba", 0x003E3BC0, 0x20 + + .align 2 gTiles_083E3BE0:: .incbin "graphics/unknown/unknown_3E3BE0.4bpp" + .align 2 gUnknown_083E3C60:: @ 83E3C60 .incbin "graphics/misc/ribbons_cool.gbapal" .incbin "graphics/misc/ribbons_beauty.gbapal" @@ -22069,8 +22063,8 @@ gSpriteTemplate_83E4484:: @ 83E4484 spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654 gUnknown_083E449C:: @ 83E449C - obj_pal Palette_E88A68, 2 - obj_pal Palette_E8ACE4, 3 + obj_pal gPokenavMenuOptions3_Pal, 2 + obj_pal gPokenavCondition5_Pal, 3 obj_pal 0x0, 0 .align 2 @@ -22156,13 +22150,13 @@ gUnknown_083E4588:: @ 83E4588 .align 2 gUnknown_083E4590:: @ 83E4590 - obj_tiles Tiles_E9F9A8, 0x40, 9 - obj_tiles gContestArrows_Gfx, 0x80, 10 + obj_tiles gPokenavArrow_Gfx, 0x40, 9 + obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10 null_obj_tiles .align 2 gUnknown_083E45A8:: @ 83E45A8 - obj_pal gPokenavContestArrowsPalette, 9 + obj_pal gPokenavArrowsPalette, 9 .align 2 gOamData_83E45B0:: @ 83E45B0 @@ -22222,15 +22216,15 @@ gSpriteAnimTable_83E4620:: @ 83E4620 .align 2 gUnknown_083E4628:: @ 83E4628 - obj_tiles gPokenavContestPokeballTiles, 0x100, 3 + obj_tiles gPokenavPokeballTiles, 0x100, 3 obj_tiles gUnknown_083E3780, 0x20, 4 - obj_tiles gTiles_08E8A498, 0x100, 5 + obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5 null_obj_tiles .align 2 gUnknown_083E4648:: @ 83E4648 - obj_pal PokenavContestPokeballPalette, 4 - obj_pal Palette_E8A5B8, 5 + obj_pal gPokenavConditionPokeball_Pal, 4 + obj_pal gPokenavCondition4_Pal, 5 .space 8 .align 2 @@ -22278,11 +22272,11 @@ gSpriteTemplate_83E476C:: @ 83E476C .align 2 gUnknown_083E4784:: @ 83E4784 - obj_tiles gContestSparkle_Gfx, 896, 0x0017 + obj_tiles gPokenavSparkle_Gfx, 896, 0x0017 .align 2 gUnknown_083E478C:: @ 83E478C - obj_pal gContestSparkle_Pal, 0x000f + obj_pal gPokenavSparkle_Pal, 0x000f gUnknown_083E4794:: @ 83E4794 .incbin "baserom.gba", 0x003e4794, 0x28 @@ -24877,8 +24871,8 @@ gUnknown_083F7A90:: @ 83F7A90 .space 8 gUnknown_083F7AA0:: @ 83F7AA0 - obj_pal gUnknown_08E8F804, 0x1000 - obj_pal gUnknown_08E8F824, 0x1001 + obj_pal gMiscClockMale_Pal, 0x1000 + obj_pal gMiscClockFemale_Pal, 0x1001 .space 8 .align 2 @@ -26568,14 +26562,14 @@ gCableCarPylonStemTilemap:: @ 8401CD4 .align 2 gUnknown_08401CF8:: @ 8401CF8 - obj_tiles gUnknown_08E80614, 0x800, 1 - obj_tiles gUnknown_08E80914, 0x40, 2 - obj_tiles gUnknown_08E80944, 0x80, 3 + obj_tiles gCableCar_Gfx, 0x800, 1 + obj_tiles gCableCarDoor_Gfx, 0x40, 2 + obj_tiles gCableCarCord_Gfx, 0x80, 3 .space 8 .align 2 gUnknown_08401D18:: @ 8401D18 - obj_pal Palette_08E7EC1C, 1 + obj_pal gCableCar_Pal, 1 .space 8 .align 2 @@ -31299,20 +31293,20 @@ gSpriteAffineAnimTable_8412050:: @ 8412050 .align 2 gUnknown_084120A4:: @ 84120A4 - .4byte gUnknown_08E781E4 - .4byte gUnknown_08E781F8 - .4byte gUnknown_08E7820C - .4byte gUnknown_08E78220 - .4byte gUnknown_08E78234 - .4byte gUnknown_08E78248 - .4byte gUnknown_08E7825C - .4byte gUnknown_08E78270 - .4byte gUnknown_08E78284 - .4byte gUnknown_08E78298 - .4byte gUnknown_08E782ac - .4byte gUnknown_08E782c0 - .4byte gUnknown_08E782d4 - .4byte gUnknown_08E782e8 + .4byte gPokeblockRed_Pal + .4byte gPokeblockBlue_Pal + .4byte gPokeblockPink_Pal + .4byte gPokeblockGreen_Pal + .4byte gPokeblockYellow_Pal + .4byte gPokeblockPurple_Pal + .4byte gPokeblockIndigo_Pal + .4byte gPokeblockBrown_Pal + .4byte gPokeblockLiteBlue_Pal + .4byte gPokeblockOlive_Pal + .4byte gPokeblockGray_Pal + .4byte gPokeblockBlack_Pal + .4byte gPokeblockWhite_Pal + .4byte gPokeblockGold_Pal .align 2 gSpriteAffineAnim_84120DC:: @ 84120DC @@ -31724,9 +31718,11 @@ gUnknown_08416E34:: @ 8416E34 obj_tiles gIntro2MayTiles, 0x2000, 1003 .space 8 + .align 2 gEvoSparklePalette: @ 8416E44 .incbin "graphics/misc/evo_sparkle.gbapal" + .align 2 gEvoSparkleTiles: @ 8416E64 .incbin "graphics/misc/evo_sparkle.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index ed047f55e..bfa8a578b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,9 +18,9 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.s" @ 8D019E4 - .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/unknown_D021BC.bin" - .incbin "graphics/unused/unknown_D023E8.bin" + .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff + .incbin "graphics/unused/old_charmap.bin.lz" + .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 gSmokescreenImpactTiles:: @ 8D02410 @@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410 gSmokescreenImpactPalette:: @ 8D024F0 .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PokeBall:: .incbin "graphics/interface/ball/poke.gbapal.lz" + .align 2 gInterfaceGfx_GreatBall:: .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_GreatBall:: .incbin "graphics/interface/ball/great.gbapal.lz" + .align 2 gInterfaceGfx_SafariBall:: .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_SafariBall:: .incbin "graphics/interface/ball/safari.gbapal.lz" + .align 2 gInterfaceGfx_UltraBall:: .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_UltraBall:: .incbin "graphics/interface/ball/ultra.gbapal.lz" + .align 2 gInterfaceGfx_MasterBall:: .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_MasterBall:: .incbin "graphics/interface/ball/master.gbapal.lz" + .align 2 gInterfaceGfx_NetBall:: .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NetBall:: .incbin "graphics/interface/ball/net.gbapal.lz" + .align 2 gInterfaceGfx_DiveBall:: .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_DiveBall:: .incbin "graphics/interface/ball/dive.gbapal.lz" + .align 2 gInterfaceGfx_NestBall:: .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NestBall:: .incbin "graphics/interface/ball/nest.gbapal.lz" + .align 2 gInterfaceGfx_RepeatBall:: .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_RepeatBall:: .incbin "graphics/interface/ball/repeat.gbapal.lz" + .align 2 gInterfaceGfx_TimerBall:: .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_TimerBall:: .incbin "graphics/interface/ball/timer.gbapal.lz" + .align 2 gInterfaceGfx_LuxuryBall:: .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_LuxuryBall:: .incbin "graphics/interface/ball/luxury.gbapal.lz" + .align 2 gInterfaceGfx_PremierBall:: .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" + .align 2 gUnknown_08D030D0:: @ 8D030D0 .incbin "graphics/interface/ball_open.4bpp.lz" @@ -250,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x21 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D04388.4bpp.lz" .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -277,10 +302,10 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x26 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/battle_anim_023.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD046D4, 0xFA @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/music_notes.4bpp.lz" .align 2 gBattleAnimSpritePalette_021:: @ 8D047D0 @@ -395,31 +420,33 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/battle_anims/sprites/037.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07B68, 0x42 @ LZ, uncomp. size = 0xA0 + .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07BAC, 0x14 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D07B68.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD07BC0, 0x33 @ LZ, uncomp. size = 0x40 + .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" + +@ old battle interface data, unused .align 2 - .incbin "baserom.gba", 0xD07BF4, 0x362 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/obi1.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07F58, 0x41 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 .align 2 - .incbin "baserom.gba", 0xD07F9C, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself .align 2 - .incbin "baserom.gba", 0xD07FB4, 0x57 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 .align 2 - .incbin "baserom.gba", 0xD0800C, 0x5C6 @ LZ, uncomp. size = 0x1400 + .incbin "graphics/unused/obi2.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD085D4, 0x10D @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 gBattleAnimSpritePalette_038:: @ 8D086E4 @@ -479,7 +506,7 @@ gBattleAnimSpriteSheet_045:: @ 8D099DC .align 2 gUnknown_08D09C48:: @ 8D09C48 - .incbin "baserom.gba", 0xD09C48, 0x211 @ LZ, uncomp. size = 0x520 + .incbin "graphics/interface/hp_numbers.4bpp.lz" .align 2 gBattleAnimSpriteSheet_046:: @ 8D09E5C @@ -522,10 +549,10 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8 .incbin "graphics/battle_anims/sprites/052.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD0A7A4, 0x181 @ LZ, uncomp. size = 0x600 + .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused .align 2 - .incbin "baserom.gba", 0xD0A928, 0xF @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/line_sketch.gbapal.lz" .align 2 gBattleAnimSpriteSheet_054:: @ 8D0A938 @@ -604,7 +631,7 @@ gBattleAnimSpritePalette_063:: @ 8D0BB90 .incbin "graphics/battle_anims/sprites/063.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0BBB8, 0x6D @ LZ, uncomp. size = 0x80 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point .align 2 gBattleAnimSpritePalette_091:: @ 8D0BC28 @@ -690,23 +717,23 @@ gBattleAnimSpriteSheet_081:: @ 8D0CF04 gBattleAnimSpritePalette_081:: @ 8D0CF88 .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - .align 2 - .incbin "baserom.gba", 0xD0CFAC, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFAC + .incbin "graphics/unknown/unknown_D0CFAC.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFD0, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFD0 + .incbin "graphics/unknown/unknown_D0CFD0.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFF4, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFF4 + .incbin "graphics/unknown/unknown_D0CFF4.bin" .align 2 - .incbin "baserom.gba", 0xD0D018, 0x57 @ LZ, uncomp. size = 0x240 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" - .align 2 - .incbin "baserom.gba", 0xD0D070, 0x1F @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0D070 + .incbin "graphics/unknown/unknown_D0D070.bin" .align 2 - .incbin "baserom.gba", 0xD0D090, 0x8F @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/line_sketch_2.bin.lz" .align 2 gBattleAnimSpriteSheet_082:: @ 8D0D120 @@ -757,7 +784,7 @@ gBattleAnimSpritePalette_094:: @ 8D0D294 .incbin "graphics/battle_anims/sprites/094.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0D2B4, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" .align 2 gBattleAnimSpritePalette_095:: @ 8D0D2D4 @@ -936,48 +963,71 @@ gBattleAnimSpritePalette_114:: @ 8D1106C .incbin "graphics/battle_anims/sprites/114.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11094, 0x115 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? .align 2 - .incbin "baserom.gba", 0xD111AC, 0x3FE @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" .align 2 - .incbin "baserom.gba", 0xD115AC, 0x59F @ LZ, uncomp. size = 0x2C20 + .incbin "graphics/unused/color_frames.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11B4C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/color_frames.gbapal.lz" .align 2 gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "graphics/battle_anims/sprites/115.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11CA4, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/water_splash.8bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11E2C, 0xDD @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/water_splash.bin.lz" .align 2 - .incbin "baserom.gba", 0xD11F0C, 0x5D @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/water_splash.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11F6C, 0x8C @ LZ, uncomp. size = 0x140 + .incbin "graphics/unused/basic_frame.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11FF8, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/basic_frame.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/basic_frame.bin.lz" + .align 2 gUnknown_08D1212C:: - .incbin "graphics/interface/battle_window.gbapal" + .incbin "graphics/battle_interface/window.gbapal" + + .align 2 gUnknown_08D1214C:: - .incbin "baserom.gba", 0xd1214c, 0x20 + .incbin "graphics/battle_interface/hpbar.gbapal" + + .align 2 gUnknown_08D1216C:: @ 8D1216C - .incbin "baserom.gba", 0xd1216c, 0x840 + .incbin "graphics/battle_interface/hpbar.4bpp" + .incbin "graphics/battle_interface/expbar.4bpp" + .incbin "graphics/battle_interface/status_psn.4bpp" + .incbin "graphics/battle_interface/status_par.4bpp" + .incbin "graphics/battle_interface/status_slp.4bpp" + .incbin "graphics/battle_interface/status_frz.4bpp" + .incbin "graphics/battle_interface/status_brn.4bpp" + .incbin "graphics/battle_interface/misc.4bpp" + .incbin "graphics/battle_interface/hpbar_anim.4bpp" + .incbin "graphics/battle_interface/misc_frameend.4bpp" + .align 2 Tiles_D129AC:: @ 8D129AC - .incbin "baserom.gba", 0xd129ac, 0x680 + .incbin "graphics/battle_interface/ball_display.4bpp" + + @ extra stuff + .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" + .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. + .incbin "graphics/battle_interface/status3.4bpp" + .incbin "graphics/battle_interface/status4.4bpp" + .incbin "graphics/unknown/unknown_D12FEC.4bpp" + .incbin "graphics/unknown/unknown_D1300C.4bpp" .align 2 gBattleAnimSpriteSheet_116:: @ 8D1302C @@ -1128,13 +1178,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD151C8, 0x912 @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/old_contest.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD15ADC, 0x104 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD15BE0, 0x183 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 @@ -1148,15 +1198,15 @@ gContestNumbers_UnusedPal:: .incbin "graphics/unused/numbers.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD16134, 0x100F @ LZ, uncomp. size = 0x4000 + .incbin "graphics/unused/old_contest_2.4bpp.lz" .align 2 gUnknown_08D17144:: @ 8D17144 - .incbin "baserom.gba", 0xD17144, 0x116 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest_2.gbapal.lz" @ the tilemap and palette for unused contest assets are used. however, these two files aren't old .align 2 gUnknown_08D1725C:: @ 8D1725C - .incbin "baserom.gba", 0xD1725C, 0x1C5 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest_2.bin.lz" .align 2 gUnknown_08D17424:: @ 8D17424 @@ -1173,47 +1223,47 @@ gUnknown_08D17C3C:: @ 8D17C3C .incbin "baserom.gba", 0xD17C3C, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08D17D6C:: @ 8D17D6C - .incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000 +gContestMiscGfx:: @ 8D17D6C + .incbin "graphics/contest/misc.4bpp.lz" .align 2 -gUnknown_08D18818:: @ 8D18818 - .incbin "baserom.gba", 0xD18818, 0xC59 @ LZ, uncomp. size = 0x2000 +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 - .incbin "graphics/misc/judge_symbols.4bpp.lz" + .incbin "graphics/contest/judge_symbols.4bpp.lz" .align 2 gContest3Pal:: - .incbin "graphics/misc/judge_symbols.gbapal.lz" + .incbin "graphics/contest/judge_symbols.gbapal.lz" .align 2 gTiles_8D1975C:: @ 8D1975C - .incbin "baserom.gba", 0x00d1975c, 0x20 + .incbin "graphics/contest/heart.4bpp" .align 2 gUnknown_08D1977C:: @ 8D1977C - .incbin "baserom.gba", 0xD1977C, 0xAD1 @ LZ, uncomp. size = 0x2400 + .incbin "graphics/contest/misc_2.4bpp.lz" .align 2 gUnknown_08D1A250:: @ 8D1A250 - .incbin "baserom.gba", 0xD1A250, 0x112 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" .align 2 gUnknown_08D1A364:: @ 8D1A364 - .incbin "baserom.gba", 0xD1A364, 0x129 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" .align 2 gUnknown_08D1A490:: @ 8D1A490 - .incbin "baserom.gba", 0xD1A490, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" .align 2 gUnknown_08D1A618:: @ 8D1A618 - .incbin "baserom.gba", 0xD1A618, 0xEA @ LZ, uncomp. size = 0x200 + .incbin "graphics/contest/misc_2.gbapal.lz" .align 2 gBattleAnimSpriteSheet_135:: @ 8D1A704 @@ -1276,10 +1326,10 @@ gBattleAnimSpriteSheet_142:: @ 8D1B1B8 .incbin "graphics/battle_anims/sprites/142.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B218, 0x9C @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_beatup.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B2B4, 0x1B @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/old_beatup.gbapal.lz" .align 2 gBattleAnimSpriteSheet_147:: @ 8D1B2D0 @@ -1398,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C060, 0x26 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1C088, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C0A0, 0x102 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unknown/unknown_D1C060.bin.lz" .align 2 gBattleAnimSpriteSheet_162:: @ 8D1C1A4 @@ -1472,11 +1522,11 @@ gBattleAnimSpritePalette_172:: @ 8D1C728 .align 2 gContestJudgeGfx:: - .incbin "graphics/misc/judge.4bpp.lz" + .incbin "graphics/contest/judge.4bpp.lz" .align 2 gContest2Pal:: @ 8D1CA1C - .incbin "graphics/misc/judge.gbapal.lz" + .incbin "graphics/contest/judge.gbapal.lz" .align 2 gBattleAnimSpriteSheet_001:: @ 8D1CA44 @@ -1504,24 +1554,24 @@ gBattleAnimBackgroundTilemap_00:: @ 8D1D1C0 .align 2 gUnknown_08D1D410:: @ 8D1D410 - .incbin "baserom.gba", 0xD1D410, 0x13A @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" .align 2 gUnknown_08D1D54C:: @ 8D1D54C - .incbin "baserom.gba", 0xD1D54C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" .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 @@ -1641,29 +1691,29 @@ gBattleAnimSpritePalette_186:: @ 8D1F508 .align 2 gBattleWindowLargeGfx:: - .incbin "graphics/interface/battle_window.4bpp.lz" + .incbin "graphics/battle_interface/window.4bpp.lz" .align 2 gBattleWindowSmallGfx:: - .incbin "graphics/interface/battle_window2.4bpp.lz" + .incbin "graphics/battle_interface/window2.4bpp.lz" .align 2 gBattleWindowSmall2Gfx:: - .incbin "graphics/interface/battle_window3.4bpp.lz" + .incbin "graphics/battle_interface/window3.4bpp.lz" .align 2 gBattleWindowSmall3Gfx:: - .incbin "graphics/interface/battle_window4.4bpp.lz" + .incbin "graphics/battle_interface/window4.4bpp.lz" .align 2 -gBattleWindowLarge2Gfx:: @ 8d1fc94 - .incbin "graphics/interface/battle_window5.4bpp.lz" +gBattleWindowLarge2Gfx:: + .incbin "graphics/battle_interface/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 @@ -1715,11 +1765,11 @@ gBattleAnimSpritePalette_193:: @ 8D209EC .align 2 gUnknown_08D20A14:: @ 8D20A14 - .incbin "baserom.gba", 0xD20A14, 0x1A @ LZ, uncomp. size = 0x60 + .incbin "graphics/battle_anims/masks/curse.4bpp.lz" .align 2 gUnknown_08D20A30:: @ 8D20A30 - .incbin "baserom.gba", 0xD20A30, 0xFD @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/curse.bin.lz" .align 2 gBattleAnimSpriteSheet_002:: @ 8D20B30 @@ -1822,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" @@ -1879,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 @@ -1927,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 +gBattleAnimBackgroundPalette_ScaryFace:: @ 8D24D7C + .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gUnknown_08D24DA4:: @ 8D24DA4 - .incbin "baserom.gba", 0xD24DA4, 0x22D @ LZ, uncomp. size = 0xA00 +gBattleAnimBackgroundImage_ScaryFace:: @ 8D24DA4 + .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 gBattleAnimSpritePalette_218:: @ 8D24FD4 @@ -2176,15 +2225,15 @@ gBattleAnimBackgroundTilemap_10:: @ 8D2A6E8 .align 2 gUnknown_08D2A9E0:: @ 8D2A9E0 - .incbin "baserom.gba", 0xD2A9E0, 0x9F @ LZ, uncomp. size = 0x280 + .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" .align 2 gUnknown_08D2AA80:: @ 8D2AA80 - .incbin "baserom.gba", 0xD2AA80, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" .align 2 gUnknown_08D2AA98:: @ 8D2AA98 - .incbin "baserom.gba", 0xD2AA98, 0x11B @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" .align 2 gBattleAnimBackgroundTilemap_12:: @ 8D2ABB4 @@ -2243,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 @@ -2287,60 +2336,60 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4 .incbin "graphics/battle_anims/sprites/243.gbapal.lz" .align 2 -gUnknown_08D2DACC:: @ 8D2DACC - .incbin "baserom.gba", 0xD2DACC, 0x20E @ LZ, uncomp. size = 0x800 +gBattleStatMask_Gfx:: @ 8D2DACC + .incbin "graphics/battle_anims/masks/stat.4bpp.lz" .align 2 -gUnknown_08D2DCDC:: @ 8D2DCDC - .incbin "baserom.gba", 0xD2DCDC, 0x11C @ LZ, uncomp. size = 0x800 +gBattleStatMask1_Tilemap:: @ 8D2DCDC + .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" .align 2 -gUnknown_08D2DDF8:: @ 8D2DDF8 - .incbin "baserom.gba", 0xD2DDF8, 0x11C @ LZ, uncomp. size = 0x800 +gBattleStatMask2_Tilemap:: @ 8D2DDF8 + .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" .align 2 -gUnknown_08D2DF14:: @ 8D2DF14 - .incbin "baserom.gba", 0xD2DF14, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask1_Pal:: @ 8D2DF14 + .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" .align 2 -gUnknown_08D2DF34:: @ 8D2DF34 - .incbin "baserom.gba", 0xD2DF34, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask2_Pal:: @ 8D2DF34 + .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" .align 2 -gUnknown_08D2DF54:: @ 8D2DF54 - .incbin "baserom.gba", 0xD2DF54, 0x1F @ LZ, uncomp. size = 0x20 +gBattleStatMask3_Pal:: @ 8D2DF54 + .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" .align 2 -gUnknown_08D2DF74:: @ 8D2DF74 - .incbin "baserom.gba", 0xD2DF74, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask4_Pal:: @ 8D2DF74 + .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" .align 2 -gUnknown_08D2DF94:: @ 8D2DF94 - .incbin "baserom.gba", 0xD2DF94, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask5_Pal:: @ 8D2DF94 + .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" .align 2 -gUnknown_08D2DFB4:: @ 8D2DFB4 - .incbin "baserom.gba", 0xD2DFB4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask6_Pal:: @ 8D2DFB4 + .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" .align 2 -gUnknown_08D2DFD4:: @ 8D2DFD4 - .incbin "baserom.gba", 0xD2DFD4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask7_Pal:: @ 8D2DFD4 + .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" .align 2 -gUnknown_08D2DFF4:: @ 8D2DFF4 - .incbin "baserom.gba", 0xD2DFF4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask8_Pal:: @ 8D2DFF4 + .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" .align 2 gUnknown_08D2E014:: @ 8D2E014 - .incbin "baserom.gba", 0xD2E014, 0x13A @ LZ, uncomp. size = 0x200 + .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" .align 2 gUnknown_08D2E150:: @ 8D2E150 - .incbin "baserom.gba", 0xD2E150, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" .align 2 gUnknown_08D2E170:: @ 8D2E170 - .incbin "baserom.gba", 0xD2E170, 0x11C @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" .align 2 gBattleAnimSpritePalette_245:: @ 8D2E28C @@ -2372,11 +2421,11 @@ gBattleAnimSpriteSheet_053:: @ 8D2EBDC .align 2 gUnknown_08D2EDFC:: @ 8D2EDFC - .incbin "baserom.gba", 0xD2EDFC, 0x4B @ LZ, uncomp. size = 0x1C0 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.4bpp.lz" .align 2 gUnknown_08D2EE48:: @ 8D2EE48 - .incbin "baserom.gba", 0xD2EE48, 0x106 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.bin.lz" .align 2 gBattleAnimSpriteSheet_248:: @ 8D2EF50 @@ -2477,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 @@ -2597,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 @@ -2737,14 +2786,14 @@ gBattleAnimSpriteSheet_261:: @ 8E67D6C .incbin "graphics/battle_anims/sprites/261.4bpp.lz" .align 2 -gUnknown_08E67ED8:: @ 8E67ED8 - .incbin "baserom.gba", 0xE67ED8, 0x17C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_SandstormBrew:: @ 8E67ED8 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" .align 2 -gUnknown_08E68054:: @ 8E68054 - .incbin "baserom.gba", 0xE68054, 0x52C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundImage_SandstormBrew:: @ 8E68054 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" -gUnknown_08E68580:: @ 8E68580 + .align 2 gBattleAnimSpritePalette_261:: @ 8E68580 .incbin "graphics/battle_anims/sprites/261.gbapal.lz" @@ -2778,13 +2827,15 @@ gBattleAnimSpritePalette_262:: @ 8E693DC .align 2 gContestNextTurnGfx:: - .incbin "graphics/misc/nextturn.4bpp.lz" + .incbin "graphics/contest/nextturn.4bpp.lz" -gUnknown_08E69478:: @ 8E69478 - .incbin "baserom.gba", 0x00e69478, 0x100 + .align 2 +gContestNextTurnNumbersGfx:: @ 8E69478 + .incbin "graphics/contest/nextturn_numbers.4bpp" -gUnknown_08E69578:: @ 8E69578 - .incbin "baserom.gba", 0x00e69578, 0x40 + .align 2 +gContestNextTurnRandomGfx:: @ 8E69578 + .incbin "graphics/contest/nextturn_random.4bpp" .align 2 gBattleAnimSpriteSheet_264:: @ 8E695B8 @@ -2808,14 +2859,15 @@ gBattleAnimSpritePalette_068:: @ 8E69628 .align 2 gContestApplauseGfx:: - .incbin "graphics/misc/applause.4bpp.lz" + .incbin "graphics/contest/applause.4bpp.lz" -gUnknown_08E6978C:: @ 8E6978C - .incbin "baserom.gba", 0x00e6978c, 0x80 + .align 2 +gContestApplauseMeterGfx:: @ 8E6978C + .incbin "graphics/contest/applause_meter.4bpp" .align 2 gContestPal:: - .incbin "graphics/misc/nextturn.gbapal" + .incbin "graphics/contest/nextturn.gbapal" .align 2 gBattleAnimSpriteSheet_272:: @ 8E6982C @@ -2874,16 +2926,16 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4 .incbin "graphics/battle_anims/sprites/280.gbapal.lz" .align 2 -gUnknown_08E6A704:: @ 8E6A704 - .incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundImageMuddyWater_Pal:: @ 8E6A704 + .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" .align 2 -gUnknown_08E6A728:: @ 8E6A728 - .incbin "baserom.gba", 0xE6A728, 0x2E @ LZ, uncomp. size = 0x80 +gEnemyMonShadow_Gfx:: @ 8E6A728 + .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" .align 2 -gUnknown_08E6A758:: @ 8E6A758 - .incbin "baserom.gba", 0xE6A758, 0x81 @ LZ, uncomp. size = 0x200 +gBattleGfx_BallStatusBar:: @ 8E6A758 + .incbin "graphics/battle_interface/bar.4bpp.lz" .align 2 gMonIcon_Egg:: @ 8E6A7DC @@ -2945,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gUnknown_08E6DE48:: @ 8E6DE48 - .incbin "baserom.gba", 0xE6DE48, 0x176 @ LZ, uncomp. size = 0x800 +gWeatherFog1Tilemap:: @ 8E6DE48 + .incbin "graphics/weather/fog1.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 @@ -2957,16 +3009,16 @@ gBattleAnimSpriteSheet_283:: @ 8E6DFDC .incbin "graphics/battle_anims/sprites/283.4bpp.lz" .align 2 -gUnknown_08E6E100:: @ 8E6E100 - .incbin "baserom.gba", 0xE6E100, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFacePlayer:: @ 8E6E100 + .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" .align 2 -gUnknown_08E6E2E4:: @ 8E6E2E4 - .incbin "baserom.gba", 0xE6E2E4, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceOpponent:: @ 8E6E2E4 + .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" .align 2 -gUnknown_08E6E4C8:: @ 8E6E4C8 - .incbin "baserom.gba", 0xE6E4C8, 0x1E2 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceContest:: @ 8E6E4C8 + .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" .align 2 gBattleAnimSpriteSheet_263:: @ 8E6E6AC @@ -3045,12 +3097,12 @@ gBattleAnimSpritePalette_285:: @ 8E6F5F8 .incbin "graphics/battle_anims/sprites/285.gbapal.lz" .align 2 -gUnknown_08E6F620:: @ 8E6F620 - .incbin "baserom.gba", 0xE6F620, 0x131D @ LZ, uncomp. size = 0x2000 +gBattleAnimBackgroundImage_Surf:: @ 8E6F620 + .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" .align 2 -gUnknown_08E70940:: @ 8E70940 - .incbin "baserom.gba", 0xE70940, 0x25 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundPalette_Surf:: @ 8E70940 + .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" .align 2 gUnknown_08E70968:: @ 8E70968 @@ -3077,37 +3129,38 @@ gBattleAnimSpritePalette_188:: @ 8E7133C .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 -gUnknown_08E71354:: @ 8E71354 - .incbin "baserom.gba", 0xE71354, 0x34C @ LZ, uncomp. size = 0xE80 +gPartyMenuMisc_Gfx:: @ 8E71354 + .incbin "graphics/interface/party_menu_misc.4bpp.lz" .align 2 -gUnknown_08E716A0:: @ 8E716A0 - .incbin "baserom.gba", 0xE716A0, 0xE7 @ LZ, uncomp. size = 0x160 +gPartyMenuMisc_Pal:: @ 8E716A0 + .incbin "graphics/interface/party_menu_misc.gbapal.lz" .align 2 -gUnknown_08E71788:: @ 8E71788 - .incbin "baserom.gba", 0xE71788, 0x10B @ LZ, uncomp. size = 0x800 +gPartyMenuMisc_Tilemap:: @ 8E71788 + .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 -gUnknown_08E71894:: @ 8E71894 - .incbin "baserom.gba", 0xE71894, 0x9D @ LZ, uncomp. size = 0x180 +gPartyMenuHpBar_Gfx:: @ 8E71894 + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" .align 2 -gUnknown_08E71934:: @ 8E71934 - .incbin "baserom.gba", 0xE71934, 0x3D9 @ LZ, uncomp. size = 0x1000 +gPartyMenuOrderText_Gfx:: @ 8E71934 + .incbin "graphics/interface/party_menu_ordertext.4bpp.lz" .align 2 -gUnknown_08E71D10:: @ 8E71D10 - .incbin "baserom.gba", 0xE71D10, 0x9D1 @ LZ, uncomp. size = 0x1700 +gMoveTypes_Gfx:: @ 8E71D10 + .incbin "graphics/types/move_types.4bpp.lz" .align 2 -gUnknown_08E726E4:: @ 8E726E4 - .incbin "baserom.gba", 0xE726E4, 0x67 @ LZ, uncomp. size = 0x60 +gMoveTypes_Pal:: @ 8E726E4 + .incbin "graphics/types/move_types.gbapal.lz" .align 2 gMenuSummaryGfx:: @ 8E7274C .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused. + .align 2 gMenuSummaryPal:: @ 8E72848 .incbin "graphics/interface/summary_frames.gbapal.lz" @@ -3120,19 +3173,20 @@ gStatusPal_Icons:: @ 8E72A50 .incbin "graphics/interface/status_icons.gbapal.lz" .align 2 -gUnknown_08E72A78:: @ 8E72A78 - .incbin "baserom.gba", 0xE72A78, 0x9F0 @ LZ, uncomp. size = 0x1B20 +gStatusScreen_Gfx:: @ 8E72A78 + .incbin "graphics/interface/status_screen.4bpp.lz" .align 2 -gUnknown_08E73468:: @ 8E73468 - .incbin "baserom.gba", 0xE73468, 0xA0 @ LZ, uncomp. size = 0xA0 +gStatusScreen_Pal:: @ 8E73468 + .incbin "graphics/interface/status_screen.gbapal.lz" + .align 2 gUnknown_08E73508:: @ 8E73508 - .incbin "baserom.gba", 0x00e73508, 0x800 + .incbin "baserom.gba", 0xE73508, 0x800 .align 2 -gUnknown_08E73D08:: @ 8E73D08 - .incbin "baserom.gba", 0xE73D08, 0x180 @ LZ, uncomp. size = 0x800 +gStatusScreen_Tilemap:: @ 8E73D08 + .incbin "graphics/interface/status_screen.bin.lz" gUnknown_08E73E88:: @ 8E73E88 .incbin "baserom.gba", 0x00e73e88, 0x800 @@ -3157,43 +3211,43 @@ gBagPalette:: @ 8E76700 .incbin "graphics/misc/bag.gbapal.lz" .align 2 -gUnknown_08E76728:: @ 8E76728 - .incbin "baserom.gba", 0xE76728, 0x86B @ LZ, uncomp. size = 0x2000 +gBagScreen_Gfx:: @ 8E76728 + .incbin "graphics/interface/bag_screen.4bpp.lz" .align 2 -gUnknown_08E76F94:: @ 8E76F94 - .incbin "baserom.gba", 0xE76F94, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenMale_Pal:: @ 8E76F94 + .incbin "graphics/interface/bag_screen_male.gbapal.lz" .align 2 -gUnknown_08E76FCC:: @ 8E76FCC - .incbin "baserom.gba", 0xE76FCC, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenFemale_Pal:: @ 8E76FCC + .incbin "graphics/interface/bag_screen_female.gbapal.lz" gUnknown_08E77004:: @ 8E77004 .incbin "baserom.gba", 0x00e77004, 0x800 .align 2 -gUnknown_08E77804:: @ 8E77804 - .incbin "baserom.gba", 0xE77804, 0xFA @ LZ, uncomp. size = 0x300 +gBuyMenuFrame_Gfx:: @ 8E77804 + .incbin "graphics/interface/mart_frame.4bpp.lz" .align 2 gMenuMoneyPal:: @ 8E77900 .incbin "graphics/interface/money.gbapal.lz" .align 2 -gUnknown_08E77928:: @ 8E77928 - .incbin "baserom.gba", 0xE77928, 0x134 @ LZ, uncomp. size = 0x800 +gBuyMenuFrame_Tilemap:: @ 8E77928 + .incbin "graphics/interface/mart_frame.bin.lz" .align 2 gMenuMoneyGfx:: @ 8E77A5C .incbin "graphics/interface/money.4bpp.lz" .align 2 -gUnknown_08E77AE4:: @ 8E77AE4 - .incbin "baserom.gba", 0xE77AE4, 0x23A @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Gfx:: @ 8E77AE4 + .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" .align 2 -gUnknown_08E77D20:: @ 8E77D20 - .incbin "baserom.gba", 0xE77D20, 0x6E @ LZ, uncomp. size = 0xC0 +gMenuPokeblock_Pal:: @ 8E77D20 + .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" .align 2 gMenuPokeblockDevice_Gfx:: @ 8E77D90 @@ -3204,80 +3258,80 @@ gMenuPokeblockDevice_Pal:: @ 8E78050 .incbin "graphics/interface/pokeblock_device.gbapal.lz" .align 2 -gUnknown_08E78078:: @ 8E78078 - .incbin "baserom.gba", 0xE78078, 0x150 @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Tilemap:: @ 8E78078 + .incbin "graphics/interface/pokeblock.bin.lz" .align 2 gPokeblock_Gfx:: - .incbin "graphics/misc/pokeblock.4bpp.lz" + .incbin "graphics/pokeblock/pokeblock.4bpp.lz" .align 2 -gUnknown_08E781E4:: - .incbin "baserom.gba", 0xE781E4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockRed_Pal:: + .incbin "graphics/pokeblock/red.gbapal.lz" .align 2 -gUnknown_08E781F8:: - .incbin "baserom.gba", 0xE781F8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlue_Pal:: + .incbin "graphics/pokeblock/blue.gbapal.lz" .align 2 -gUnknown_08E7820C:: - .incbin "baserom.gba", 0xE7820C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPink_Pal:: + .incbin "graphics/pokeblock/pink.gbapal.lz" .align 2 -gUnknown_08E78220:: - .incbin "baserom.gba", 0xE78220, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGreen_Pal:: + .incbin "graphics/pokeblock/green.gbapal.lz" .align 2 -gUnknown_08E78234:: - .incbin "baserom.gba", 0xE78234, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockYellow_Pal:: + .incbin "graphics/pokeblock/yellow.gbapal.lz" .align 2 -gUnknown_08E78248:: - .incbin "baserom.gba", 0xE78248, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPurple_Pal:: + .incbin "graphics/pokeblock/purple.gbapal.lz" .align 2 -gUnknown_08E7825C:: - .incbin "baserom.gba", 0xE7825C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockIndigo_Pal:: + .incbin "graphics/pokeblock/indigo.gbapal.lz" .align 2 -gUnknown_08E78270:: - .incbin "baserom.gba", 0xE78270, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBrown_Pal:: + .incbin "graphics/pokeblock/brown.gbapal.lz" .align 2 -gUnknown_08E78284:: - .incbin "baserom.gba", 0xE78284, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockLiteBlue_Pal:: + .incbin "graphics/pokeblock/liteblue.gbapal.lz" .align 2 -gUnknown_08E78298:: - .incbin "baserom.gba", 0xE78298, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockOlive_Pal:: + .incbin "graphics/pokeblock/olive.gbapal.lz" .align 2 -gUnknown_08E782ac:: - .incbin "baserom.gba", 0xE782AC, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGray_Pal:: + .incbin "graphics/pokeblock/gray.gbapal.lz" .align 2 -gUnknown_08E782c0:: - .incbin "baserom.gba", 0xE782C0, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlack_Pal:: + .incbin "graphics/pokeblock/black.gbapal.lz" .align 2 -gUnknown_08E782d4:: - .incbin "baserom.gba", 0xE782D4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockWhite_Pal:: + .incbin "graphics/pokeblock/white.gbapal.lz" .align 2 -gUnknown_08E782e8:: - .incbin "baserom.gba", 0xE782E8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGold_Pal:: + .incbin "graphics/pokeblock/gold.gbapal.lz" .align 2 gUnknown_08E782FC:: @ 8E782FC .incbin "baserom.gba", 0xE782FC, 0x100 @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E783FC:: @ 8E783FC - .incbin "baserom.gba", 0xE783FC, 0x43E @ LZ, uncomp. size = 0xC00 +gBerryCheck_Gfx:: @ 8E783FC + .incbin "graphics/interface/check_berry.4bpp.lz" .align 2 -gUnknown_08E7883C:: @ 8E7883C - .incbin "graphics/battle_transitions/vs.gbapal.lz" +gBerryCheck_Pal:: @ 8E7883C + .incbin "graphics/interface/check_berry.gbapal.lz" .align 2 gUnknown_08E788E4:: @ 8E788E4 @@ -3288,8 +3342,8 @@ gUnknown_08E78A84:: @ 8E78A84 .incbin "baserom.gba", 0xE78A84, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E78BB4:: @ 8E78BB4 - .incbin "baserom.gba", 0xE78BB4, 0x14C @ LZ, uncomp. size = 0x800 +gBerryCheckCircle_Gfx:: @ 8E78BB4 + .incbin "graphics/interface/check_berry_circle.4bpp.lz" @ 8E78D00 .include "data/graphics/berries/graphics.s" @@ -3318,27 +3372,29 @@ gBattleAnimSpritePalette_271:: @ 8E7EB24 gBattleAnimSpriteSheet_271:: @ 8E7EB3C .incbin "graphics/battle_anims/sprites/271.4bpp.lz" -gUnknown_08E7EB9C:: @ 8E7EB9C - .incbin "baserom.gba", 0xe7eb9c, 0x80 + .align 2 +gCableCarBG_Pal:: @ 8E7EB9C + .incbin "graphics/misc/cable_car_bg.gbapal" -Palette_08E7EC1C:: @ 8E7EC1C - .incbin "baserom.gba", 0xe7ec1c, 0x20 + .align 2 +gCableCar_Pal:: @ 8E7EC1C + .incbin "graphics/misc/cable_car.gbapal" .align 2 -gUnknown_08E7EC3C:: @ 8E7EC3C - .incbin "baserom.gba", 0xE7EC3C, 0x19D6 @ LZ, uncomp. size = 0x4000 +gCableCarBG_Gfx:: @ 8E7EC3C + .incbin "graphics/misc/cable_car_bg.4bpp.lz" .align 2 -gUnknown_08E80614:: @ 8E80614 - .incbin "baserom.gba", 0xE80614, 0x2FF @ LZ, uncomp. size = 0x800 +gCableCar_Gfx:: @ 8E80614 + .incbin "graphics/misc/cable_car.4bpp.lz" .align 2 -gUnknown_08E80914:: @ 8E80914 - .incbin "baserom.gba", 0xE80914, 0x30 @ LZ, uncomp. size = 0x40 +gCableCarDoor_Gfx:: @ 8E80914 + .incbin "graphics/misc/cable_car_door.4bpp.lz" .align 2 -gUnknown_08E80944:: @ 8E80944 - .incbin "baserom.gba", 0xE80944, 0x28 @ LZ, uncomp. size = 0x80 +gCableCarCord_Gfx:: @ 8E80944 + .incbin "graphics/misc/cable_car_cord.4bpp.lz" .align 2 gUnknown_08E8096C:: @ 8E8096C @@ -3562,10 +3618,11 @@ gNamingScreenLowerTextTiles:: @ 8E85778 gNamingScreenUpperTextTiles:: @ 8E857D8 .incbin "graphics/naming_screen/upper_text.4bpp" - .incbin "baserom.gba", 0x00e85838, 0x160 + .space 352 -gUnknown_08E85998:: @ 8E85998 - .incbin "baserom.gba", 0x00e85998, 0x800 + .align 2 +gNamingScreenMenu_Gfx:: @ 8E85998 + .incbin "graphics/naming_screen/menu.4bpp" .align 2 gNamingScreenPalettes:: @ 8E86198 @@ -3580,22 +3637,20 @@ gUnknown_08E86258:: @ 8E86258 .incbin "baserom.gba", 0x00e86258, 0x500 .align 2 -gUnknown_08E86758:: @ 8E86758 - .incbin "baserom.gba", 0xE86758, 0xD6E @ LZ, uncomp. size = 0x3000 +gPokedexMenu_Gfx:: @ 8E86758 + .incbin "graphics/pokedex/menu.4bpp.lz" .align 2 -gUnknown_08E874C8:: - .incbin "baserom.gba", 0xE874C8, 0x62C @ LZ, uncomp. size = 0x1F00 +gPokedexMenu2_Gfx:: @ 8E874C8 + .incbin "graphics/pokedex/menu2.4bpp.lz" .align 2 -gUnknown_08E87AF4:: - .incbin "baserom.gba", 0x00e87af4, 0x2 - -gUnknown_08E87AF6:: @ 8E87AF6 - .incbin "baserom.gba", 0x00e87af6, 0x60 +gPokedexMenu_Pal:: @ 8E87AF4 + .incbin "graphics/pokedex/menu1.gbapal" -gUnknown_08E87B56:: @ 8E87B56 - .incbin "baserom.gba", 0x00e87b56, 0x5e + .align 2 +gPokedexMenu2_Pal:: @ 8E87B54 + .incbin "graphics/pokedex/menu2.gbapal" .align 2 gAreaUnknownTiles:: @ 8E87BB4 @@ -3606,129 +3661,144 @@ gAreaUnknownPalette:: @ 8E87D90 .incbin "graphics/pokedex/area_unknown.gbapal" .align 2 -gUnknown_08E87DB0:: @ 8E87DB0 - .incbin "baserom.gba", 0xE87DB0, 0x528 @ LZ, uncomp. size = 0x1000 +gPokedexMenuSearch_Gfx:: @ 8E87DB0 + .incbin "graphics/pokedex/menu_search.4bpp.lz" .align 2 -gUnknown_08E882D8:: @ 8E882D8 - .incbin "baserom.gba", 0x00e882d8, 0x80 +gPokedexMenuSearch_Pal:: @ 8E882D8 + .incbin "graphics/pokedex/menu3.gbapal" .align 2 -gUnknown_08E88358:: @ 8E88358 - .incbin "baserom.gba", 0xE88358, 0x173 @ LZ, uncomp. size = 0x600 +gPokenavMainMenu_Gfx:: @ 8E88358 + .incbin "graphics/pokenav/mainmenu.4bpp.lz" .align 2 -gUnknown_08E884CC:: @ 8E884CC - .incbin "baserom.gba", 0xE884CC, 0x55A @ LZ, uncomp. size = 0x1400 +gPokenavMenuOptions_Gfx:: @ 8E884CC + .incbin "graphics/pokenav/menu_options.4bpp.lz" .align 2 -gUnknown_08E88A28:: @ 8E88A28 - .incbin "baserom.gba", 0x00e88a28, 0x20 +gPokenavMenuOptions1_Pal:: @ 8E88A28 + .incbin "graphics/pokenav/pokenav1.gbapal" -gUnknown_08E88A48:: @ 8E88A48 - .incbin "baserom.gba", 0xe88a48, 0x20 + .align 2 +gPokenavMenuOptions2_Pal:: @ 8E88A48 + .incbin "graphics/pokenav/pokenav2.gbapal" -Palette_E88A68:: @ 8E88A68 - .incbin "baserom.gba", 0xe88a68, 0x20 + .align 2 +gPokenavMenuOptions3_Pal:: @ 8E88A68 + .incbin "graphics/pokenav/pokenav3.gbapal" .align 2 -gUnknown_08E88A88:: @ 8E88A88 - .incbin "baserom.gba", 0xE88A88, 0x2C4 @ LZ, uncomp. size = 0xC00 +gPokenavHoennMapHeader_Gfx:: @ 8E88A88 + .incbin "graphics/pokenav/map_header.4bpp.lz" .align 2 -gUnknown_08E88D4C:: @ 8E88D4C - .incbin "baserom.gba", 0xE88D4C, 0x575 @ LZ, uncomp. size = 0x1200 +gPokenavHoennMapMisc_Gfx:: @ 8E88D4C + .incbin "graphics/pokenav/map_misc2.4bpp.lz" .align 2 -gUnknown_08E892C4:: @ 8E892C4 - .incbin "baserom.gba", 0xE892C4, 0x364 @ LZ, uncomp. size = 0x840 +gPokenavHoennMapSquares_Gfx:: @ 8E892C4 + .incbin "graphics/pokenav/map_squares.4bpp.lz" -gUnknown_08E89628:: @ 8E89628 - .incbin "baserom.gba", 0x00e89628, 0x20 + .align 2 +gPokenavHoennMap1_Pal:: @ 8E89628 + .incbin "graphics/pokenav/map_menu.gbapal" -gUnknown_08E89648:: @ 8E89648 + .align 2 +gPokenavHoennMapSquares_Pal:: @ 8E89648 .incbin "graphics/pokenav/map_squares.gbapal" .align 2 -gUnknown_08E89668:: @ 8E89668 - .incbin "baserom.gba", 0xE89668, 0x2EE @ LZ, uncomp. size = 0xC00 +gPokenavConditionMenu_Gfx:: @ 8E89668 + .incbin "graphics/pokenav/condition_menu.4bpp.lz" .align 2 -gUnknown_08E89958:: @ 8E89958 - .incbin "baserom.gba", 0x00e89958, 0x20 +gPokenavConditionMenu_Pal:: @ 8E89958 + .incbin "graphics/pokenav/condition1.gbapal" .align 2 -gUnknown_08E89978:: @ 8E89978 - .incbin "baserom.gba", 0xE89978, 0x15D @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuHeader_Gfx:: @ 8E89978 + .incbin "graphics/pokenav/condition_menu_header.4bpp.lz" .align 2 -gUnknown_08E89AD8:: @ 8E89AD8 - .incbin "baserom.gba", 0xE89AD8, 0x6E6 @ LZ, uncomp. size = 0xFA0 +gPokenavConditionView_Gfx:: @ 8E89AD8 + .incbin "graphics/pokenav/condition_view.4bpp.lz" .align 2 -gUnknown_08E8A1C0:: @ 8E8A1C0 - .incbin "baserom.gba", 0x00e8a1c0, 0x20 +gPokenavConditionMenu2_Pal:: @ 8E8A1C0 + .incbin "graphics/pokenav/condition2.gbapal" .align 2 -gUnknown_08E8A1E0:: @ 8E8A1E0 - .incbin "baserom.gba", 0xE8A1E0, 0x2B8 @ LZ, uncomp. size = 0x800 +gPokenavConditionMenuOptions_Gfx:: @ 8E8A1E0 + .incbin "graphics/pokenav/condition_menu_options.4bpp.lz" -gTiles_08E8A498:: @ 8E8A498 - .incbin "baserom.gba", 0xe8a498, 0x100 + .align 2 +gPokenavConditionMenuCancel_Gfx:: @ 8E8A498 + .incbin "graphics/pokenav/condition_cancel.4bpp" -PokenavContestPokeballPalette:: @ 8E8A598 - .incbin "graphics/pokenav/contest_pokeball.gbapal" + .align 2 +gPokenavConditionPokeball_Pal:: @ 8E8A598 + .incbin "graphics/pokenav/condition3.gbapal" -Palette_E8A5B8:: @ 8E8A5B8 - .incbin "baserom.gba", 0xe8a5b8, 0x20 + .align 2 +gPokenavCondition4_Pal:: @ 8E8A5B8 + .incbin "graphics/pokenav/condition4.gbapal" .align 2 -gUnknown_08E8A5D8:: @ 8E8A5D8 - .incbin "baserom.gba", 0xE8A5D8, 0x1EB @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuOptions2_Gfx:: @ 8E8A5D8 + .incbin "graphics/pokenav/condition_menu_options2.4bpp.lz" .align 2 -gUnknown_08E8A7C4:: @ 8E8A7C4 - .incbin "baserom.gba", 0xe8a7c4, 0x520 +gPokenavConditionMenuMisc_Gfx:: @ 8E8A7C4 + .incbin "graphics/pokenav/condition_menu_misc.4bpp" -Palette_E8ACE4:: @ 8E8ACE4 - .incbin "baserom.gba", 0xe8ace4, 0x20 + .align 2 +gPokenavCondition5_Pal:: @ 8E8ACE4 + .incbin "graphics/pokenav/condition5.gbapal" .align 2 -gUnknown_08E8AD04:: @ 8E8AD04 - .incbin "baserom.gba", 0xE8AD04, 0x4BE @ LZ, uncomp. size = 0x1800 +gPokenavConditionSearch_Gfx:: @ 8E8AD04 + .incbin "graphics/pokenav/condition_search.4bpp.lz" .align 2 -gUnknown_08E8B1C4:: @ 8E8B1C4 - .incbin "baserom.gba", 0x00e8b1c4, 0x20 +gPokenavCondition6_Pal:: @ 8E8B1C4 + .incbin "graphics/pokenav/condition6.gbapal" -gUnknown_08E8B1E4:: @ 8E8B1E4 - .incbin "baserom.gba", 0x00e8b1e4, 0x20 + .align 2 +gPokenavCondition7_Pal:: @ 8E8B1E4 + .incbin "graphics/pokenav/condition7.bin" @ another palette thats impossible to leave as native pal file due to 0xFFFF instead of 0x7FFF. .align 2 -gUnknown_08E8B204:: @ 8E8B204 - .incbin "baserom.gba", 0xE8B204, 0x19B @ LZ, uncomp. size = 0x600 +gPokenavTrainersEyesHeader_Gfx:: @ 8E8B204 + .incbin "graphics/pokenav/trainereyes.4bpp.lz" .align 2 -gUnknown_08E8B3A0:: @ 8E8B3A0 - .incbin "baserom.gba", 0xE8B3A0, 0x140 @ LZ, uncomp. size = 0x600 +gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0 + .incbin "graphics/pokenav/ribbons.4bpp.lz" -gUnknown_08E8B4E0:: @ 8E8B4E0 - .incbin "baserom.gba", 0x00e8b4e0, 0x1400 + .align 2 +gMenuTrainerCard_Gfx:: @ 8E8B4E0 + .incbin "graphics/misc/trainer_card.4bpp" -gUnknown_08E8C8E0:: - .incbin "baserom.gba", 0x00e8c8e0, 0x60 + .align 2 +gMenuTrainerCard0Star_Pal:: + .incbin "graphics/misc/trainer_card_0star.gbapal" -gUnknown_08E8C940:: - .incbin "baserom.gba", 0x00e8c940, 0x60 + .align 2 +gMenuTrainerCard1Star_Pal:: + .incbin "graphics/misc/trainer_card_1star.gbapal" -gUnknown_08E8C9A0:: - .incbin "baserom.gba", 0x00e8c9a0, 0x60 + .align 2 +gMenuTrainerCard2Star_Pal:: + .incbin "graphics/misc/trainer_card_2star.gbapal" -gUnknown_08E8CA00:: - .incbin "baserom.gba", 0x00e8ca00, 0x60 + .align 2 +gMenuTrainerCard3Star_Pal:: + .incbin "graphics/misc/trainer_card_3star.gbapal" -gUnknown_08E8CA60:: - .incbin "baserom.gba", 0x00e8ca60, 0x60 + .align 2 +gMenuTrainerCard4Star_Pal:: + .incbin "graphics/misc/trainer_card_4star.gbapal" gUnknown_08E8CAC0:: .incbin "baserom.gba", 0x00e8cac0, 0x500 @@ -3743,81 +3813,87 @@ gUnknown_08E8D9C0:: @ 8E8D9C0 .incbin "baserom.gba", 0x00e8d9c0, 0x500 .align 2 -gUnknown_08E8DEC0:: @ 8E8DEC0 - .incbin "baserom.gba", 0xE8DEC0, 0x226 @ LZ, uncomp. size = 0x5E0 +gPSSMenuHeader_Gfx:: @ 8E8DEC0 + .incbin "graphics/pokemon_storage/header.4bpp.lz" .align 2 -gUnknown_08E8E0E8:: @ 8E8E0E8 - .incbin "baserom.gba", 0x00e8e0e8, 0x20 - -gUnknown_08E8E108:: @ 8E8E108 - .incbin "baserom.gba", 0x00e8e108, 0x20 +gPSSMenu1_Pal:: @ 8E8E0E8 + .incbin "graphics/pokemon_storage/menu1.gbapal" .align 2 -gUnknown_08E8E128:: @ 8E8E128 - .incbin "baserom.gba", 0xE8E128, 0x119 @ LZ, uncomp. size = 0x500 +gPSSMenu2_Pal:: @ 8E8E108 + .incbin "graphics/pokemon_storage/menu2.bin" .align 2 -gUnknown_08E8E244:: @ 8E8E244 - .incbin "baserom.gba", 0xE8E244, 0x464 @ LZ, uncomp. size = 0xB60 +gPSSMenuHeader_Tilemap:: @ 8E8E128 + .incbin "graphics/pokemon_storage/header.bin.lz" -gUnknown_08E8E6A8:: @ 8E8E6A8 - .incbin "baserom.gba", 0x00e8e6a8, 0x20 + .align 2 +gPSSMenuMisc_Gfx:: @ 8E8E244 + .incbin "graphics/pokemon_storage/misc1.4bpp.lz" -gUnknown_08E8E6C8:: @ 8E8E6C8 - .incbin "baserom.gba", 0x00e8e6c8, 0x20 + .align 2 +gPSSMenu3_Pal:: @ 8E8E6A8 + .incbin "graphics/pokemon_storage/menu3.gbapal" .align 2 -gUnknown_08E8E6E8:: @ 8E8E6E8 - .incbin "baserom.gba", 0xE8E6E8, 0x1C5 @ LZ, uncomp. size = 0x800 +gPSSMenu4_Pal:: @ 8E8E6C8 + .incbin "graphics/pokemon_storage/menu4.gbapal" .align 2 -gUnknown_08E8E8B0:: @ 8E8E8B0 - .incbin "baserom.gba", 0xE8E8B0, 0x1C7 @ LZ, uncomp. size = 0x4A0 +gPSSMenuMisc_Tilemap:: @ 8E8E6E8 + .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 -gUnknown_08E8EA78:: @ 8E8EA78 - .incbin "baserom.gba", 0x00e8ea78, 0x20 +gHallOfFame_Gfx:: @ 8E8E8B0 + .incbin "graphics/misc/hof.4bpp.lz" .align 2 -gMenuWordGroup_Gfx:: @ 8E8EA98 - .incbin "graphics/interface/wordgroup.4bpp.lz" +gHallOfFame_Pal:: @ 8E8EA78 + .incbin "graphics/misc/hof.gbapal" .align 2 -gUnknown_08E8EE18:: @ 8E8EE18 - .incbin "baserom.gba", 0xE8EE18, 0x33D @ LZ, uncomp. size = 0x820 +gMenuWordGroupIndicator_Gfx:: @ 8E8EA98 + .incbin "graphics/interface/wordgroup_indicator.4bpp.lz" .align 2 -gMenuWordGroup_Pal:: @ 8E8F158 - .incbin "graphics/interface/wordgroup.gbapal" +gMenuWordGroupFrame_Gfx:: @ 8E8EE18 + .incbin "graphics/interface/wordgroup_frame.4bpp.lz" -gUnknown_08E8F178:: @ 8E8F178 - .incbin "baserom.gba", 0x00e8f178, 0x22 + .align 2 +gMenuWordGroupIndicator_Pal:: @ 8E8F158 + .incbin "graphics/interface/wordgroup_indicator.gbapal" -gUnknown_08E8F19A:: @ 8E8F19A - .incbin "baserom.gba", 0x00e8f19a, 0x6 + .align 2 +gMenuWordGroupFrame1_Pal:: @ 8E8F178 + .incbin "graphics/interface/wordgroup_pink.gbapal" -gUnknown_08E8F1A0:: @ 8E8F1A0 - .incbin "baserom.gba", 0x00e8f1a0, 0x18 + .align 2 +gMenuWordGroupFrame2_Pal:: @ 8E8F198 + .incbin "graphics/interface/wordgroup_blue.gbapal" .align 2 -gUnknown_08E8F1B8:: @ 8E8F1B8 - .incbin "baserom.gba", 0xE8F1B8, 0x649 @ LZ, uncomp. size = 0x1000 +gMiscClock_Gfx:: @ 8E8F1B8 + .incbin "graphics/misc/clock.4bpp.lz" .align 2 -gUnknown_08E8F804:: @ 8E8F804 - .incbin "graphics/misc/clock1.gbapal" +gMiscClockMale_Pal:: @ 8E8F804 + .incbin "graphics/misc/clock1.gbapal" @ male -gUnknown_08E8F824:: @ 8E8F824 - .incbin "graphics/misc/clock2.gbapal" + .align 2 +gMiscClockFemale_Pal:: @ 8E8F824 + .incbin "graphics/misc/clock2.gbapal" @ female .align 2 -gUnknown_08E8F844:: @ 8E8F844 - .incbin "baserom.gba", 0xE8F844, 0xBB3 @ LZ, uncomp. size = 0x1E00 +gSlotMachine_Gfx:: @ 8E8F844 + .incbin "graphics/slot_machine/slots.4bpp.lz" .align 2 -gUnknown_08E903F8:: @ 8E903F8 - .incbin "baserom.gba", 0x00e903f8, 0x220 +gBattleInterfaceStatusIcons_DynPal:: @ 8E903F8 + .incbin "graphics/battle_interface/status.gbapal" + + @ unused + .incbin "graphics/unused/arrow.4bpp" .align 2 gBerryBlenderMarubatsuTiles:: @ 8E90618 @@ -3837,13 +3913,15 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18 gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" - .incbin "baserom.gba", 0x00e91418, 0x200 + .incbin "graphics/unknown/unknown_E91418.bin" + + .space 0x1E0 .align 2 gBerryBlenderArrowTiles:: @ 8E91618 .incbin "graphics/berry_blender/arrow.4bpp" - .incbin "baserom.gba", 0x00e91e18, 0x2c0 + .space 0x2C0 .align 2 gBerryBlenderMiscPalette:: @ 8E920D8 @@ -3920,6 +3998,7 @@ gUnknown_08E964B8:: @ 8E964B8 gUnknown_08E966B8:: @ 8E966B8 .incbin "baserom.gba", 0x00e966b8, 0x20 + .align 2 gMonIconPalettes:: @ 8E966D8 .incbin "graphics/pokemon_icon_palettes/0.gbapal" .incbin "graphics/pokemon_icon_palettes/1.gbapal" @@ -3993,39 +4072,71 @@ gSlotMachineSpritePalette5:: @ 8E97768 gSlotMachineSpritePalette6:: @ 8E97788 .incbin "graphics/slot_machine/spr6.gbapal" + .align 2 gSlotMachineReelSymbol1Tiles:: .incbin "graphics/slot_machine/reel_symbols/1.4bpp" + + .align 2 gSlotMachineReelSymbol2Tiles:: .incbin "graphics/slot_machine/reel_symbols/2.4bpp" + + .align 2 gSlotMachineReelSymbol3Tiles:: .incbin "graphics/slot_machine/reel_symbols/3.4bpp" + + .align 2 gSlotMachineReelSymbol4Tiles:: .incbin "graphics/slot_machine/reel_symbols/4.4bpp" + + .align 2 gSlotMachineReelSymbol5Tiles:: .incbin "graphics/slot_machine/reel_symbols/5.4bpp" + + .align 2 gSlotMachineReelSymbol6Tiles:: .incbin "graphics/slot_machine/reel_symbols/6.4bpp" + + .align 2 gSlotMachineReelSymbol7Tiles:: .incbin "graphics/slot_machine/reel_symbols/7.4bpp" + .align 2 gSlotMachineNumber0Tiles:: .incbin "graphics/slot_machine/numbers/0.4bpp" + + .align 2 gSlotMachineNumber1Tiles:: .incbin "graphics/slot_machine/numbers/1.4bpp" + + .align 2 gSlotMachineNumber2Tiles:: .incbin "graphics/slot_machine/numbers/2.4bpp" + + .align 2 gSlotMachineNumber3Tiles:: .incbin "graphics/slot_machine/numbers/3.4bpp" + + .align 2 gSlotMachineNumber4Tiles:: .incbin "graphics/slot_machine/numbers/4.4bpp" + + .align 2 gSlotMachineNumber5Tiles:: .incbin "graphics/slot_machine/numbers/5.4bpp" + + .align 2 gSlotMachineNumber6Tiles:: .incbin "graphics/slot_machine/numbers/6.4bpp" + + .align 2 gSlotMachineNumber7Tiles:: .incbin "graphics/slot_machine/numbers/7.4bpp" + + .align 2 gSlotMachineNumber8Tiles:: .incbin "graphics/slot_machine/numbers/8.4bpp" + + .align 2 gSlotMachineNumber9Tiles:: .incbin "graphics/slot_machine/numbers/9.4bpp" @@ -4098,8 +4209,8 @@ gSpriteImage_8E99808:: @ 8E99808 .incbin "graphics/unknown_sprites/8E99808.4bpp" .align 2 -gUnknown_08E99848:: @ 8E99848 - .incbin "baserom.gba", 0xE99848, 0x766 @ LZ, uncomp. size = 0x3200 +gSlotMachineReelTimeLights_Gfx:: @ 8E99848 + .incbin "graphics/slot_machine/reel_time_lights.4bpp.lz" .align 2 gUnknown_08E99FB0:: @ 8E99FB0 @@ -4133,165 +4244,213 @@ gUnknown_08E9AC2C:: @ 8E9AC2C gUnknown_08E9AC4C:: @ 8E9AC4C .incbin "baserom.gba", 0xE9AC4C, 0x18F @ LZ, uncomp. size = 0x500 +@ text window frames + .align 2 -gUnknown_08E9ADDC:: - .incbin "baserom.gba", 0x00e9addc, 0x120 +gTextWindowFrame1_Gfx:: + .incbin "graphics/text_window/1.4bpp" -gUnknown_08E9AEFC:: - .incbin "baserom.gba", 0x00e9aefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: + .incbin "graphics/text_window/1.gbapal" -gUnknown_08E9AF1C:: - .incbin "baserom.gba", 0x00e9af1c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: + .incbin "graphics/text_window/2.4bpp" -gUnknown_08E9B03C:: - .incbin "baserom.gba", 0x00e9b03c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: + .incbin "graphics/text_window/2.gbapal" -gUnknown_08E9B05C:: - .incbin "baserom.gba", 0x00e9b05c, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: + .incbin "graphics/text_window/3.4bpp" -gUnknown_08E9B17C:: - .incbin "baserom.gba", 0x00e9b17c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: + .incbin "graphics/text_window/3.gbapal" -gUnknown_08E9B19C:: - .incbin "baserom.gba", 0x00e9b19c, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: + .incbin "graphics/text_window/4.4bpp" -gUnknown_08E9B2BC:: - .incbin "baserom.gba", 0x00e9b2bc, 0x20 + .align 2 +gTextWindowFrame4_Pal:: + .incbin "graphics/text_window/4.gbapal" -gUnknown_08E9B2DC:: - .incbin "baserom.gba", 0x00e9b2dc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: + .incbin "graphics/text_window/5.4bpp" -gUnknown_08E9B3FC:: - .incbin "baserom.gba", 0x00e9b3fc, 0x20 + .align 2 +gTextWindowFrame5_Pal:: + .incbin "graphics/text_window/5.gbapal" -gUnknown_08E9B41C:: - .incbin "baserom.gba", 0x00e9b41c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: + .incbin "graphics/text_window/6.4bpp" -gUnknown_08E9B53C:: - .incbin "baserom.gba", 0x00e9b53c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: + .incbin "graphics/text_window/6.gbapal" -gUnknown_08E9B55C:: - .incbin "baserom.gba", 0x00e9b55c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: + .incbin "graphics/text_window/7.4bpp" -gUnknown_08E9B67C:: - .incbin "baserom.gba", 0x00e9b67c, 0x20 + .align 2 +gTextWindowFrame7_Pal:: + .incbin "graphics/text_window/7.gbapal" -gUnknown_08E9B69C:: - .incbin "baserom.gba", 0x00e9b69c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: + .incbin "graphics/text_window/8.4bpp" -gUnknown_08E9B7BC:: - .incbin "baserom.gba", 0x00e9b7bc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: + .incbin "graphics/text_window/8.gbapal" -gUnknown_08E9B7DC:: - .incbin "baserom.gba", 0x00e9b7dc, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: + .incbin "graphics/text_window/9.4bpp" -gUnknown_08E9B8FC:: - .incbin "baserom.gba", 0x00e9b8fc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: + .incbin "graphics/text_window/9.gbapal" -gUnknown_08E9B91C:: - .incbin "baserom.gba", 0x00e9b91c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: + .incbin "graphics/text_window/10.4bpp" -gUnknown_08E9BA3C:: - .incbin "baserom.gba", 0x00e9ba3c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: + .incbin "graphics/text_window/10.gbapal" -gUnknown_08E9BA5C:: - .incbin "baserom.gba", 0x00e9ba5c, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: + .incbin "graphics/text_window/11.4bpp" -gUnknown_08E9BB7C:: - .incbin "baserom.gba", 0x00e9bb7c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: + .incbin "graphics/text_window/11.gbapal" -gUnknown_08E9BB9C:: - .incbin "baserom.gba", 0x00e9bb9c, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: + .incbin "graphics/text_window/12.4bpp" -gUnknown_08E9BCBC:: - .incbin "baserom.gba", 0x00e9bcbc, 0x20 + .align 2 +gTextWindowFrame12_Pal:: + .incbin "graphics/text_window/12.gbapal" -gUnknown_08E9BCDC:: - .incbin "baserom.gba", 0x00e9bcdc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: + .incbin "graphics/text_window/13.4bpp" -gUnknown_08E9BDFC:: - .incbin "baserom.gba", 0x00e9bdfc, 0x20 + .align 2 +gTextWindowFrame13_Pal:: + .incbin "graphics/text_window/13.gbapal" -gUnknown_08E9BE1C:: - .incbin "baserom.gba", 0x00e9be1c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: + .incbin "graphics/text_window/14.4bpp" -gUnknown_08E9BF3C:: - .incbin "baserom.gba", 0x00e9bf3c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: + .incbin "graphics/text_window/14.gbapal" -gUnknown_08E9BF5C:: - .incbin "baserom.gba", 0x00e9bf5c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: + .incbin "graphics/text_window/15.4bpp" -gUnknown_08E9C07C:: - .incbin "baserom.gba", 0x00e9c07c, 0x20 + .align 2 +gTextWindowFrame15_Pal:: + .incbin "graphics/text_window/15.gbapal" -gUnknown_08E9C09C:: - .incbin "baserom.gba", 0x00e9c09c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: + .incbin "graphics/text_window/16.4bpp" -gUnknown_08E9C1BC:: - .incbin "baserom.gba", 0x00e9c1bc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: + .incbin "graphics/text_window/16.gbapal" -gUnknown_08E9C1DC:: - .incbin "baserom.gba", 0x00e9c1dc, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: + .incbin "graphics/text_window/17.4bpp" -gUnknown_08E9C2FC:: - .incbin "baserom.gba", 0x00e9c2fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: + .incbin "graphics/text_window/17.gbapal" -gUnknown_08E9C31C:: - .incbin "baserom.gba", 0x00e9c31c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: + .incbin "graphics/text_window/18.4bpp" -gUnknown_08E9C43C:: - .incbin "baserom.gba", 0x00e9c43c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: + .incbin "graphics/text_window/18.gbapal" -gUnknown_08E9C45C:: - .incbin "baserom.gba", 0x00e9c45c, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: + .incbin "graphics/text_window/19.4bpp" -gUnknown_08E9C57C:: - .incbin "baserom.gba", 0x00e9c57c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: + .incbin "graphics/text_window/19.gbapal" -gUnknown_08E9C59C:: - .incbin "baserom.gba", 0x00e9c59c, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: + .incbin "graphics/text_window/20.4bpp" -gUnknown_08E9C6BC:: - .incbin "baserom.gba", 0x00e9c6bc, 0x20 + .align 2 +gTextWindowFrame20_Pal:: + .incbin "graphics/text_window/20.gbapal" .align 2 gUnknown_08E9C6DC:: @ 8E9C6DC .incbin "baserom.gba", 0xE9C6DC, 0xBC @ LZ, uncomp. size = 0x500 .align 2 -gUnknown_08E9C798:: @ 8E9C798 - .incbin "baserom.gba", 0xE9C798, 0x289 @ LZ, uncomp. size = 0x560 +gIntroCopyright_Gfx:: @ 8E9C798 + .incbin "graphics/intro/copyright.4bpp.lz" .align 2 -gUnknown_08E9CA24:: @ 8E9CA24 - .incbin "baserom.gba", 0x00e9ca24, 0x20 +gIntroCopyright_Pal:: @ 8E9CA24 + .incbin "graphics/intro/copyright.gbapal" -gUnknown_08E9CA44:: @ 8E9CA44 - .incbin "baserom.gba", 0xe9ca44, 0x500 + .align 2 +gIntroCopyright_Tilemap:: @ 8E9CA44 + .incbin "graphics/intro/copyright.bin" .align 2 gInterviewOutlineCursorTiles:: @ 8E9CF44 .incbin "graphics/misc/interview_outline_cursor.4bpp" .align 2 -Tiles_E9D644:: @ 8E9D644 - .incbin "baserom.gba", 0xE9D644, 0x265 @ LZ, uncomp. size = 0x520 +gTitleScreenPressStart_Gfx:: @ 8E9D644 + .incbin "graphics/title_screen/press_start.4bpp.lz" .align 2 -gTitleScreenLogoShinePalette:: +gTitleScreenLogoShinePalette:: @ E9D8E4 .incbin "graphics/title_screen/logo_shine.gbapal" + .align 2 gUnknown_08E9D8CC:: @ 8E9D8CC .ifdef SAPPHIRE .incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz" -gVersionTiles:: - .incbin "graphics/title_screen/sapphireversion.8bpp.lz" .else .incbin "graphics/title_screen/pokemon_ruby.8bpp.lz" + .endif + + .align 2 gVersionTiles:: + .ifdef SAPPHIRE + .incbin "graphics/title_screen/sapphireversion.8bpp.lz" + .else .incbin "graphics/title_screen/rubyversion.8bpp.lz" .endif + .align 2 gUnknown_08E9F624:: @ 8E9F624 .ifdef SAPPHIRE .incbin "graphics/title_screen/logo_sapphire.gbapal" @ for some reason, the sapphire palette is different even though the visible colors for the logo and version are not, weird @@ -4304,32 +4463,30 @@ gUnknown_08E9F7E4:: @ 8E9F7E4 .incbin "baserom.gba", 0xE9F7E4, 0x182 @ LZ, uncomp. size = 0x400 .align 2 -gPokenavContestArrowsPalette:: - .incbin "graphics/pokenav/contest_arrows.gbapal" +gPokenavArrowsPalette:: + .incbin "graphics/pokenav/arrows.gbapal" gUnknown_08E9F988:: @ 8E9F988 .incbin "baserom.gba", 0xe9f988, 0x20 -Tiles_E9F9A8:: @ 8E9F9A8 - .incbin "baserom.gba", 0xe9f9a8, 0x40 + .align 2 +gPokenavArrow_Gfx:: @ 8E9F9A8 + .incbin "graphics/pokenav/arrow2.4bpp" gUnknown_08E9F9E8:: @ 8E9F9E8 .incbin "baserom.gba", 0x00e9f9e8, 0x20 .align 2 -gUnknown_08E9FA08:: @ 8E9FA08 - .incbin "baserom.gba", 0xE9FA08, 0xF2 @ LZ, uncomp. size = 0x300 +gPokenavConditionSearch2_Gfx:: @ 8E9FA08 + .incbin "graphics/pokenav/condition_search2.4bpp.lz" .align 2 -gUnknown_08E9FAFC:: @ 8E9FAFC - .incbin "baserom.gba", 0x00e9fafc, 0x1c - -gUnknown_08E9FB18:: @ 8E9FB18 - .incbin "baserom.gba", 0x00e9fb18, 0x4 +gPokenavRibbonView_Pal:: @ 8E9FAFC + .incbin "graphics/pokenav/ribbon_view.pal.bin" .align 2 -gUnknown_08E9FB1C:: @ 8E9FB1C - .incbin "baserom.gba", 0xE9FB1C, 0x83 @ LZ, uncomp. size = 0x160 +gPokenavRibbonView_Gfx:: @ 8E9FB1C + .incbin "graphics/pokenav/ribbon_view.4bpp.lz" .align 2 gUnknown_08E9FBA0:: @ 8E9FBA0 @@ -4358,11 +4515,12 @@ gUnknown_08E9FF58:: @ 8E9FF58 .incbin "baserom.gba", 0xE9FF58, 0xCF @ LZ, uncomp. size = 0x640 .align 2 -gUnknown_08EA0028:: @ 8EA0028 - .incbin "baserom.gba", 0x00ea0028, 0xe0 +gPokenavRibbonPokeView_Gfx:: @ 8EA0028 + .incbin "graphics/pokenav/ribbon_pokeview.4bpp" -gUnknown_08EA0108:: @ 8EA0108 - .incbin "baserom.gba", 0x00ea0108, 0x1c0 + .align 2 +gTextWindowMainFrame_Gfx:: @ 8EA0108 + .incbin "graphics/text_window/main.4bpp" .align 2 gUnknown_08EA02C8:: @ 8EA02C8 @@ -4390,24 +4548,28 @@ gTradeMonBoxTilemap:: @ 8EA1DC8 gUnknown_08EA1DEC:: @ 8EA1DEC .incbin "graphics/trade/selected_mon.4bpp" - .incbin "baserom.gba", 0x00ea25ec, 0x20 + .incbin "graphics/unknown/unknown_EA25EC.bin" .align 2 -gUnknown_08EA260C:: @ 8EA260C - .incbin "baserom.gba", 0xEA260C, 0x436 @ LZ, uncomp. size = 0xB40 +gCreditsCopyrightEnd_Gfx:: @ 8EA260C + .incbin "graphics/misc/end_copyright.4bpp.lz" .align 2 -gUnknown_08EA2A44:: @ 8EA2A44 - .incbin "baserom.gba", 0x00ea2a44, 0x200 +gDecoration10000_Gfx:: @ 8EA2A44 + .incbin "graphics/misc/decoration_10000.4bpp" + .align 2 gFont3LatinGlyphs:: @ 8EA2C44 .incbin "graphics/fonts/font3_lat.4bpp" + .align 2 gFont4LatinGlyphs:: @ 8EA6BC4 .incbin "graphics/fonts/font4_lat.4bpp" + .align 2 gFont3JapaneseGlyphs:: @ 8EA8744 .incbin "graphics/fonts/font3_jpn.4bpp" + .align 2 gFont4JapaneseGlyphs:: @ 8EAC6C4 .incbin "graphics/fonts/font4_jpn.4bpp" 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/sandstorm_brew.bin b/graphics/battle_anims/backgrounds/sandstorm_brew.bin Binary files differnew file mode 100755 index 000000000..64e6d8584 --- /dev/null +++ b/graphics/battle_anims/backgrounds/sandstorm_brew.bin diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.png b/graphics/battle_anims/backgrounds/sandstorm_brew.png Binary files differnew file mode 100755 index 000000000..87d5d41ea --- /dev/null +++ b/graphics/battle_anims/backgrounds/sandstorm_brew.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/backgrounds/scary_face_contest.bin b/graphics/battle_anims/backgrounds/scary_face_contest.bin Binary files differnew file mode 100755 index 000000000..e2d1e3a99 --- /dev/null +++ b/graphics/battle_anims/backgrounds/scary_face_contest.bin diff --git a/graphics/battle_anims/backgrounds/scary_face_opponent.bin b/graphics/battle_anims/backgrounds/scary_face_opponent.bin Binary files differnew file mode 100755 index 000000000..dfaaf5f2f --- /dev/null +++ b/graphics/battle_anims/backgrounds/scary_face_opponent.bin diff --git a/graphics/battle_anims/backgrounds/scary_face_player.bin b/graphics/battle_anims/backgrounds/scary_face_player.bin Binary files differnew file mode 100755 index 000000000..690305126 --- /dev/null +++ b/graphics/battle_anims/backgrounds/scary_face_player.bin diff --git a/graphics/battle_anims/backgrounds/water.pal b/graphics/battle_anims/backgrounds/water.pal new file mode 100755 index 000000000..ee7a7b6e2 --- /dev/null +++ b/graphics/battle_anims/backgrounds/water.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 +98 90 255 +115 106 255 +197 197 255 +238 238 255 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/water.png b/graphics/battle_anims/backgrounds/water.png Binary files differnew file mode 100755 index 000000000..7740f99f8 --- /dev/null +++ b/graphics/battle_anims/backgrounds/water.png diff --git a/graphics/battle_anims/backgrounds/water_muddy.pal b/graphics/battle_anims/backgrounds/water_muddy.pal new file mode 100644 index 000000000..0cb7218d9 --- /dev/null +++ b/graphics/battle_anims/backgrounds/water_muddy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 49 0 +148 74 32 +164 106 65 +180 131 106 +197 164 139 +213 189 180 +230 222 213 +255 255 255 +148 74 32 +164 106 65 +197 164 139 +230 222 213 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/cure_bubbles.bin b/graphics/battle_anims/masks/cure_bubbles.bin Binary files differnew file mode 100755 index 000000000..fa2f572b6 --- /dev/null +++ b/graphics/battle_anims/masks/cure_bubbles.bin diff --git a/graphics/battle_anims/masks/cure_bubbles.pal b/graphics/battle_anims/masks/cure_bubbles.pal new file mode 100755 index 000000000..2868f2479 --- /dev/null +++ b/graphics/battle_anims/masks/cure_bubbles.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 255 255 +123 255 255 +57 255 255 +57 205 238 +57 156 230 +57 106 213 +65 57 205 +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_anims/masks/cure_bubbles.png b/graphics/battle_anims/masks/cure_bubbles.png Binary files differnew file mode 100755 index 000000000..aa7f7b1f2 --- /dev/null +++ b/graphics/battle_anims/masks/cure_bubbles.png diff --git a/graphics/battle_anims/masks/curse.bin b/graphics/battle_anims/masks/curse.bin Binary files differnew file mode 100755 index 000000000..1e9623948 --- /dev/null +++ b/graphics/battle_anims/masks/curse.bin diff --git a/graphics/battle_anims/masks/curse.png b/graphics/battle_anims/masks/curse.png Binary files differnew file mode 100755 index 000000000..03979ee8d --- /dev/null +++ b/graphics/battle_anims/masks/curse.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/masks/metal_shine.pal b/graphics/battle_anims/masks/metal_shine.pal new file mode 100755 index 000000000..019a17c3f --- /dev/null +++ b/graphics/battle_anims/masks/metal_shine.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 172 255 +255 255 255 +164 148 139 +98 131 41 +123 156 65 +148 180 90 +172 205 115 +197 230 139 +222 255 164 +82 172 0 +98 180 24 +123 197 49 +148 213 74 +172 222 98 +197 238 123 +222 255 148 diff --git a/graphics/battle_anims/masks/metal_shine.png b/graphics/battle_anims/masks/metal_shine.png Binary files differnew file mode 100755 index 000000000..a9c5a952c --- /dev/null +++ b/graphics/battle_anims/masks/metal_shine.png diff --git a/graphics/battle_anims/masks/morning_sun.bin b/graphics/battle_anims/masks/morning_sun.bin Binary files differnew file mode 100755 index 000000000..cfa7b8069 --- /dev/null +++ b/graphics/battle_anims/masks/morning_sun.bin diff --git a/graphics/battle_anims/masks/morning_sun.pal b/graphics/battle_anims/masks/morning_sun.pal new file mode 100755 index 000000000..08249a43c --- /dev/null +++ b/graphics/battle_anims/masks/morning_sun.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 246 246 +189 238 238 +156 230 238 +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/battle_anims/masks/morning_sun.png b/graphics/battle_anims/masks/morning_sun.png Binary files differnew file mode 100755 index 000000000..c10b02782 --- /dev/null +++ b/graphics/battle_anims/masks/morning_sun.png diff --git a/graphics/battle_anims/masks/stat.png b/graphics/battle_anims/masks/stat.png Binary files differnew file mode 100755 index 000000000..0a6014ccd --- /dev/null +++ b/graphics/battle_anims/masks/stat.png diff --git a/graphics/battle_anims/masks/stat1.pal b/graphics/battle_anims/masks/stat1.pal new file mode 100755 index 000000000..d4128a31f --- /dev/null +++ b/graphics/battle_anims/masks/stat1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 255 205 +189 255 164 +156 255 123 +115 222 90 +74 197 57 +32 172 24 +0 148 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_anims/masks/stat2.pal b/graphics/battle_anims/masks/stat2.pal new file mode 100755 index 000000000..434b06e8d --- /dev/null +++ b/graphics/battle_anims/masks/stat2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 189 +255 255 123 +255 255 57 +255 189 41 +255 131 32 +255 65 16 +255 8 8 +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_anims/masks/stat3.pal b/graphics/battle_anims/masks/stat3.pal new file mode 100755 index 000000000..784e5c640 --- /dev/null +++ b/graphics/battle_anims/masks/stat3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +238 222 246 +222 189 246 +205 156 246 +197 123 246 +197 123 246 +164 90 213 +131 57 180 +106 24 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat4.pal b/graphics/battle_anims/masks/stat4.pal new file mode 100755 index 000000000..2868f2479 --- /dev/null +++ b/graphics/battle_anims/masks/stat4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 255 255 +123 255 255 +57 255 255 +57 205 238 +57 156 230 +57 106 213 +65 57 205 +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_anims/masks/stat5.pal b/graphics/battle_anims/masks/stat5.pal new file mode 100755 index 000000000..4991b1bd7 --- /dev/null +++ b/graphics/battle_anims/masks/stat5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +230 230 230 +205 205 205 +180 180 189 +164 164 164 +139 139 148 +115 115 123 +98 98 106 +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_anims/masks/stat6.pal b/graphics/battle_anims/masks/stat6.pal new file mode 100755 index 000000000..f647ff4b3 --- /dev/null +++ b/graphics/battle_anims/masks/stat6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 246 230 +156 246 213 +106 246 197 +57 246 180 +32 213 148 +16 180 123 +0 148 98 +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_anims/masks/stat7.pal b/graphics/battle_anims/masks/stat7.pal new file mode 100644 index 000000000..4935eba7c --- /dev/null +++ b/graphics/battle_anims/masks/stat7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 8 8 +255 65 16 +255 131 32 +255 189 41 +255 255 57 +255 255 123 +255 255 189 +255 255 255 +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_anims/masks/stat8.pal b/graphics/battle_anims/masks/stat8.pal new file mode 100644 index 000000000..ab1758e37 --- /dev/null +++ b/graphics/battle_anims/masks/stat8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 148 0 +32 172 24 +74 197 57 +115 222 90 +156 255 123 +189 255 164 +222 255 205 +255 255 255 +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_anims/masks/stat_tilemap_1.bin b/graphics/battle_anims/masks/stat_tilemap_1.bin Binary files differnew file mode 100755 index 000000000..1b65e515a --- /dev/null +++ b/graphics/battle_anims/masks/stat_tilemap_1.bin diff --git a/graphics/battle_anims/masks/stat_tilemap_2.bin b/graphics/battle_anims/masks/stat_tilemap_2.bin new file mode 100755 index 000000000..eb336cb74 --- /dev/null +++ b/graphics/battle_anims/masks/stat_tilemap_2.bin @@ -0,0 +1 @@ +$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567$%&'$%&'$%&'$%&'$%&'$%&'$%&'$%&'45674567456745674567456745674567
\ No newline at end of file diff --git a/graphics/battle_anims/masks/unknown_D2EDFC.bin b/graphics/battle_anims/masks/unknown_D2EDFC.bin Binary files differnew file mode 100755 index 000000000..712c1ee12 --- /dev/null +++ b/graphics/battle_anims/masks/unknown_D2EDFC.bin diff --git a/graphics/battle_anims/masks/unknown_D2EDFC.png b/graphics/battle_anims/masks/unknown_D2EDFC.png Binary files differnew file mode 100755 index 000000000..d0b372cbb --- /dev/null +++ b/graphics/battle_anims/masks/unknown_D2EDFC.png 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_interface/ball_display.png b/graphics/battle_interface/ball_display.png Binary files differnew file mode 100755 index 000000000..0c49d7ac4 --- /dev/null +++ b/graphics/battle_interface/ball_display.png diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png Binary files differnew file mode 100755 index 000000000..5473d53df --- /dev/null +++ b/graphics/battle_interface/ball_display_unused_extra.png diff --git a/graphics/battle_interface/bar.png b/graphics/battle_interface/bar.png Binary files differnew file mode 100755 index 000000000..b947a7803 --- /dev/null +++ b/graphics/battle_interface/bar.png diff --git a/graphics/battle_interface/enemy_mon_shadow.png b/graphics/battle_interface/enemy_mon_shadow.png Binary files differnew file mode 100755 index 000000000..3db333a92 --- /dev/null +++ b/graphics/battle_interface/enemy_mon_shadow.png diff --git a/graphics/battle_interface/expbar.png b/graphics/battle_interface/expbar.png Binary files differnew file mode 100755 index 000000000..b54dbe600 --- /dev/null +++ b/graphics/battle_interface/expbar.png diff --git a/graphics/battle_interface/hpbar.pal b/graphics/battle_interface/hpbar.pal new file mode 100755 index 000000000..ea646bb82 --- /dev/null +++ b/graphics/battle_interface/hpbar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +57 57 57 +255 255 255 +213 205 189 +131 131 139 +74 65 90 +82 106 90 +255 180 123 +246 148 115 +222 106 90 +115 255 172 +90 213 131 +255 230 57 +205 172 8 +255 90 57 +172 65 74 diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png Binary files differnew file mode 100755 index 000000000..f3a0314e4 --- /dev/null +++ b/graphics/battle_interface/hpbar.png diff --git a/graphics/battle_interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim.png Binary files differnew file mode 100755 index 000000000..9e7564234 --- /dev/null +++ b/graphics/battle_interface/hpbar_anim.png diff --git a/graphics/battle_interface/misc.png b/graphics/battle_interface/misc.png Binary files differnew file mode 100755 index 000000000..6456ebe5c --- /dev/null +++ b/graphics/battle_interface/misc.png diff --git a/graphics/battle_interface/misc_frameend.png b/graphics/battle_interface/misc_frameend.png Binary files differnew file mode 100755 index 000000000..630f44242 --- /dev/null +++ b/graphics/battle_interface/misc_frameend.png diff --git a/graphics/battle_interface/status.pal b/graphics/battle_interface/status.pal new file mode 100644 index 000000000..034c52bfb --- /dev/null +++ b/graphics/battle_interface/status.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 98 197 +189 189 24 +164 164 139 +139 180 230 +230 115 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +0 255 0 +0 0 255 +255 255 255 diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png Binary files differnew file mode 100755 index 000000000..97a344ae3 --- /dev/null +++ b/graphics/battle_interface/status2.png diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png Binary files differnew file mode 100755 index 000000000..3e5989d05 --- /dev/null +++ b/graphics/battle_interface/status3.png diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png Binary files differnew file mode 100755 index 000000000..d9769ad28 --- /dev/null +++ b/graphics/battle_interface/status4.png diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png Binary files differnew file mode 100755 index 000000000..0de1e3ad2 --- /dev/null +++ b/graphics/battle_interface/status_brn.png diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png Binary files differnew file mode 100755 index 000000000..3e1d534b5 --- /dev/null +++ b/graphics/battle_interface/status_frz.png diff --git a/graphics/battle_interface/status_par.png b/graphics/battle_interface/status_par.png Binary files differnew file mode 100755 index 000000000..177d4eb5b --- /dev/null +++ b/graphics/battle_interface/status_par.png diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png Binary files differnew file mode 100755 index 000000000..95869e572 --- /dev/null +++ b/graphics/battle_interface/status_psn.png diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png Binary files differnew file mode 100755 index 000000000..b0eb5a250 --- /dev/null +++ b/graphics/battle_interface/status_slp.png diff --git a/graphics/interface/battle_window.pal b/graphics/battle_interface/window.pal index bc8e8f2bc..bc8e8f2bc 100755 --- a/graphics/interface/battle_window.pal +++ b/graphics/battle_interface/window.pal diff --git a/graphics/interface/battle_window.png b/graphics/battle_interface/window.png Binary files differindex 2117967ec..2117967ec 100755 --- a/graphics/interface/battle_window.png +++ b/graphics/battle_interface/window.png diff --git a/graphics/interface/battle_window2.png b/graphics/battle_interface/window2.png Binary files differindex ac084b2e5..ac084b2e5 100755 --- a/graphics/interface/battle_window2.png +++ b/graphics/battle_interface/window2.png diff --git a/graphics/interface/battle_window3.png b/graphics/battle_interface/window3.png Binary files differindex f45e2f714..f45e2f714 100755 --- a/graphics/interface/battle_window3.png +++ b/graphics/battle_interface/window3.png diff --git a/graphics/interface/battle_window4.png b/graphics/battle_interface/window4.png Binary files differindex a366186cf..a366186cf 100755 --- a/graphics/interface/battle_window4.png +++ b/graphics/battle_interface/window4.png diff --git a/graphics/interface/battle_window5.png b/graphics/battle_interface/window5.png Binary files differindex e48f380a4..e48f380a4 100755 --- a/graphics/interface/battle_window5.png +++ b/graphics/battle_interface/window5.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/misc/applause.png b/graphics/contest/applause.png Binary files differindex 32b1748a0..32b1748a0 100755 --- a/graphics/misc/applause.png +++ b/graphics/contest/applause.png diff --git a/graphics/contest/applause_meter.png b/graphics/contest/applause_meter.png Binary files differnew file mode 100755 index 000000000..8a4fce8c0 --- /dev/null +++ b/graphics/contest/applause_meter.png diff --git a/graphics/contest/audience.png b/graphics/contest/audience.png Binary files differnew file mode 100755 index 000000000..59f8d0add --- /dev/null +++ b/graphics/contest/audience.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/contest/heart.png b/graphics/contest/heart.png Binary files differnew file mode 100755 index 000000000..bd1ede8fc --- /dev/null +++ b/graphics/contest/heart.png diff --git a/graphics/misc/judge.pal b/graphics/contest/judge.pal index e62f2abd3..e62f2abd3 100755 --- a/graphics/misc/judge.pal +++ b/graphics/contest/judge.pal diff --git a/graphics/misc/judge.png b/graphics/contest/judge.png Binary files differindex c4dcf520b..c4dcf520b 100755 --- a/graphics/misc/judge.png +++ b/graphics/contest/judge.png diff --git a/graphics/misc/judge_symbols.pal b/graphics/contest/judge_symbols.pal index 3eeaa1128..3eeaa1128 100755 --- a/graphics/misc/judge_symbols.pal +++ b/graphics/contest/judge_symbols.pal diff --git a/graphics/misc/judge_symbols.png b/graphics/contest/judge_symbols.png Binary files differindex 7669fb88b..7669fb88b 100755 --- a/graphics/misc/judge_symbols.png +++ b/graphics/contest/judge_symbols.png diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png Binary files differnew file mode 100755 index 000000000..536924daf --- /dev/null +++ b/graphics/contest/misc.png diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal new file mode 100755 index 000000000..869aef9e1 --- /dev/null +++ b/graphics/contest/misc_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 106 115 +255 57 57 +205 32 0 +246 213 0 +255 123 98 +156 180 90 +164 148 57 +90 106 139 +180 172 82 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +24 57 205 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 197 255 +255 139 255 +213 0 139 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +180 255 197 +148 255 164 +65 172 57 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 255 164 +246 213 0 +230 106 0 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 139 230 +255 139 230 +255 49 156 +255 255 0 +255 255 0 +189 172 0 +41 49 90 +41 49 90 +0 0 0 +197 123 131 +255 255 255 +230 246 255 +205 238 255 +180 238 255 +156 230 255 +139 230 255 +255 205 230 +255 255 139 +255 230 255 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 172 197 +255 172 172 +255 180 148 +255 189 123 +255 197 98 +255 205 82 +156 156 156 +156 156 156 +156 156 156 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 222 255 +106 230 222 +49 238 189 +0 255 156 +0 255 156 +82 255 98 +164 255 49 +255 255 0 +255 172 16 +255 90 32 +255 8 57 +230 57 106 +205 115 156 +180 164 205 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png Binary files differnew file mode 100755 index 000000000..44a4a8295 --- /dev/null +++ b/graphics/contest/misc_2.png diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/misc_2_tilemap_1.bin Binary files differnew file mode 100755 index 000000000..197e88cee --- /dev/null +++ b/graphics/contest/misc_2_tilemap_1.bin diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin Binary files differnew file mode 100755 index 000000000..b31126836 --- /dev/null +++ b/graphics/contest/misc_2_tilemap_2.bin diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/misc_2_tilemap_3.bin new file mode 100755 index 000000000..5055ab79e --- /dev/null +++ b/graphics/contest/misc_2_tilemap_3.bin @@ -0,0 +1 @@ +`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtppttppttfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptppttpptt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrtppttppttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttppttppttdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtppttppttfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptppttpptt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrtppttppttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttppttppttdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrt
\ No newline at end of file diff --git a/graphics/misc/nextturn.pal b/graphics/contest/nextturn.pal index 05991c79e..05991c79e 100755 --- a/graphics/misc/nextturn.pal +++ b/graphics/contest/nextturn.pal diff --git a/graphics/misc/nextturn.png b/graphics/contest/nextturn.png Binary files differindex 747c4b5a7..747c4b5a7 100755 --- a/graphics/misc/nextturn.png +++ b/graphics/contest/nextturn.png diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png Binary files differnew file mode 100755 index 000000000..4386f822d --- /dev/null +++ b/graphics/contest/nextturn_numbers.png diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png Binary files differnew file mode 100755 index 000000000..b92003823 --- /dev/null +++ b/graphics/contest/nextturn_random.png diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png Binary files differnew file mode 100755 index 000000000..86b824bce --- /dev/null +++ b/graphics/interface/bag_screen.png diff --git a/graphics/interface/bag_screen_female.pal b/graphics/interface/bag_screen_female.pal new file mode 100755 index 000000000..d5d99e115 --- /dev/null +++ b/graphics/interface/bag_screen_female.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +57 49 57 +156 65 106 +98 41 65 +255 230 172 +255 197 90 +255 32 32 +230 123 139 +164 49 115 +189 156 90 +0 0 0 +98 98 115 +255 255 255 +90 0 123 +164 164 164 +123 123 123 +98 98 115 +57 49 57 +156 65 106 +98 41 65 +255 230 172 +255 197 90 +0 0 0 +230 123 139 +164 49 115 +106 180 213 +255 148 180 diff --git a/graphics/interface/bag_screen_male.pal b/graphics/interface/bag_screen_male.pal new file mode 100755 index 000000000..49c4879bd --- /dev/null +++ b/graphics/interface/bag_screen_male.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 230 172 +255 197 90 +255 32 32 +106 180 213 +41 123 164 +189 156 90 +0 0 0 +98 98 115 +255 255 255 +90 0 123 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 230 172 +255 197 90 +0 0 0 +106 180 213 +41 123 164 +255 0 0 +255 148 180 diff --git a/graphics/battle_transitions/vs.pal b/graphics/interface/check_berry.pal index f4f6cb4e3..f4f6cb4e3 100755 --- a/graphics/battle_transitions/vs.pal +++ b/graphics/interface/check_berry.pal diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png Binary files differnew file mode 100755 index 000000000..8a4ea695a --- /dev/null +++ b/graphics/interface/check_berry.png diff --git a/graphics/interface/check_berry_circle.png b/graphics/interface/check_berry_circle.png Binary files differnew file mode 100755 index 000000000..38f2ae26b --- /dev/null +++ b/graphics/interface/check_berry_circle.png diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png Binary files differnew file mode 100755 index 000000000..d4e79fdae --- /dev/null +++ b/graphics/interface/hpbar_anim.png diff --git a/graphics/interface/mart_frame.bin b/graphics/interface/mart_frame.bin Binary files differnew file mode 100755 index 000000000..e9bc3eaa7 --- /dev/null +++ b/graphics/interface/mart_frame.bin diff --git a/graphics/interface/mart_frame.png b/graphics/interface/mart_frame.png Binary files differnew file mode 100755 index 000000000..a776e789a --- /dev/null +++ b/graphics/interface/mart_frame.png diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png Binary files differnew file mode 100755 index 000000000..f15757958 --- /dev/null +++ b/graphics/interface/numbers1.png diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png Binary files differnew file mode 100755 index 000000000..4ddf364bf --- /dev/null +++ b/graphics/interface/numbers2.png diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png Binary files differnew file mode 100755 index 000000000..5860ada9b --- /dev/null +++ b/graphics/interface/party_menu_hpbar.png diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin Binary files differnew file mode 100755 index 000000000..3b3bcc57a --- /dev/null +++ b/graphics/interface/party_menu_misc.bin diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_misc.pal new file mode 100755 index 000000000..4bc706a6b --- /dev/null +++ b/graphics/interface/party_menu_misc.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +123 156 115 +255 255 255 +106 106 106 +0 0 0 +65 205 255 +0 139 189 +49 189 238 +255 156 148 +189 90 82 +222 123 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 156 115 +32 16 24 +139 32 24 +82 24 49 +74 123 98 +65 98 57 +82 65 74 +32 16 24 +0 0 0 +0 0 0 +255 255 255 +123 156 115 +0 0 0 +0 0 0 +0 0 0 +98 49 164 +123 156 115 +255 115 49 +139 32 24 +82 24 49 +74 123 98 +65 98 57 +82 65 74 +32 16 24 +0 0 0 +0 0 0 +255 255 255 +123 156 115 +0 0 0 +0 0 0 +0 0 0 +164 115 246 +123 156 115 +65 49 57 +189 189 189 +255 255 255 +131 180 172 +57 164 172 +49 139 139 +65 49 57 +115 139 123 +131 180 172 +57 164 172 +49 139 139 +82 106 90 +255 180 123 +246 148 115 +222 106 90 +123 156 115 +65 49 57 +189 189 189 +255 255 255 +205 205 106 +197 189 41 +156 156 32 +65 49 57 +255 123 57 +205 205 106 +197 189 41 +156 156 32 +82 106 90 +74 65 90 +115 255 172 +90 213 131 +123 156 115 +65 49 57 +189 189 189 +255 255 255 +205 156 156 +189 123 123 +148 106 106 +65 49 57 +255 123 57 +205 156 156 +189 123 123 +148 106 106 +82 106 90 +74 65 90 +255 230 57 +205 172 8 +123 156 115 +255 115 49 +189 189 189 +255 255 255 +164 238 131 +115 213 65 +123 156 98 +238 115 49 +0 0 0 +255 131 65 +255 131 65 +255 131 65 +82 106 90 +74 65 90 +255 90 57 +172 65 74 +123 156 115 +255 115 49 +189 189 189 +255 255 255 +172 230 246 +123 213 222 +74 164 164 +238 115 49 +0 0 0 +255 131 65 +255 131 65 +255 131 65 +74 65 90 +255 90 57 +57 57 57 +172 238 148 +123 156 115 +255 115 49 +189 189 189 +255 255 255 +246 246 148 +246 238 65 +213 213 32 +238 115 49 +0 0 0 +255 131 65 +255 131 65 +255 131 65 +74 65 90 +255 90 57 +57 57 57 +172 238 148 +123 156 115 +255 115 49 +189 189 189 +255 255 255 +255 213 222 +255 180 189 +213 148 139 +238 115 49 +0 0 0 +255 131 65 +255 131 65 +255 131 65 +74 65 90 +255 90 57 +57 57 57 +172 238 148 +123 156 115 +255 255 156 +189 189 189 +255 255 255 +164 238 131 +115 213 65 +123 156 98 +255 255 0 +0 0 0 +255 255 189 +255 255 230 +255 255 230 +74 65 90 +255 90 57 +57 57 57 +172 238 148 diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png Binary files differnew file mode 100755 index 000000000..6ca98493b --- /dev/null +++ b/graphics/interface/party_menu_misc.png diff --git a/graphics/interface/party_menu_ordertext.png b/graphics/interface/party_menu_ordertext.png Binary files differnew file mode 100755 index 000000000..003af36d0 --- /dev/null +++ b/graphics/interface/party_menu_ordertext.png diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin Binary files differnew file mode 100755 index 000000000..232df0fdb --- /dev/null +++ b/graphics/interface/pokeblock.bin diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal new file mode 100755 index 000000000..ef58ae778 --- /dev/null +++ b/graphics/interface/pokeblock_case_frame.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +123 205 189 +238 246 255 +213 230 255 +255 0 0 +115 131 238 +90 90 98 +123 180 189 +131 131 164 +0 0 0 +0 0 0 +197 197 197 +205 65 24 +255 123 90 +255 180 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +238 246 255 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +106 139 189 +148 213 255 +180 238 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 238 238 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +205 90 172 +255 156 197 +255 197 213 +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 +106 180 115 +148 246 98 +205 255 139 +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 +180 180 49 +246 230 49 +255 255 148 +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 +148 148 139 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png Binary files differnew file mode 100755 index 000000000..646636365 --- /dev/null +++ b/graphics/interface/pokeblock_case_frame.png diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin Binary files differnew file mode 100755 index 000000000..745f3d2de --- /dev/null +++ b/graphics/interface/status_screen.bin diff --git a/graphics/interface/status_screen.pal b/graphics/interface/status_screen.pal new file mode 100755 index 000000000..61cd08f0c --- /dev/null +++ b/graphics/interface/status_screen.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +74 65 57 +255 255 255 +222 230 246 +213 213 189 +246 255 255 +115 106 98 +246 74 16 +222 82 41 +205 90 65 +180 106 90 +164 115 115 +189 172 238 +164 156 189 +148 131 139 +106 90 82 +0 0 0 +74 65 57 +255 255 255 +148 82 65 +197 131 106 +255 246 205 +115 106 98 +65 189 189 +82 164 164 +98 148 139 +123 131 123 +139 115 98 +238 172 131 +213 148 115 +189 123 98 +164 98 82 +0 0 0 +74 65 57 +255 255 255 +172 180 172 +205 205 197 +246 255 238 +115 106 98 +255 189 0 +197 164 24 +148 148 57 +90 131 90 +41 115 123 +123 230 164 +131 189 131 +74 148 115 +41 115 123 +0 0 0 +74 65 57 +255 255 255 +0 0 0 +0 0 0 +246 255 246 +115 106 98 +164 230 41 +148 205 65 +131 180 90 +115 156 115 +98 131 139 +172 222 222 +139 172 213 +106 123 205 +82 82 197 +0 0 0 +74 65 57 +123 131 65 +156 172 82 +213 213 189 +255 255 255 +238 213 65 +197 189 74 +246 246 156 +230 230 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 98 90 diff --git a/graphics/interface/status_screen.png b/graphics/interface/status_screen.png Binary files differnew file mode 100755 index 000000000..3024a035c --- /dev/null +++ b/graphics/interface/status_screen.png diff --git a/graphics/interface/wordgroup.pal b/graphics/interface/wordgroup_blue.pal index 0d067c9e2..0d067c9e2 100755..100644 --- a/graphics/interface/wordgroup.pal +++ b/graphics/interface/wordgroup_blue.pal diff --git a/graphics/interface/wordgroup_frame.png b/graphics/interface/wordgroup_frame.png Binary files differnew file mode 100644 index 000000000..71a26aab4 --- /dev/null +++ b/graphics/interface/wordgroup_frame.png diff --git a/graphics/interface/wordgroup_indicator.pal b/graphics/interface/wordgroup_indicator.pal new file mode 100644 index 000000000..0d067c9e2 --- /dev/null +++ b/graphics/interface/wordgroup_indicator.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +156 230 255 +98 197 246 +82 148 197 +172 246 213 +139 230 180 +90 164 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/interface/wordgroup.png b/graphics/interface/wordgroup_indicator.png Binary files differindex 9cf90dbf1..9cf90dbf1 100755..100644 --- a/graphics/interface/wordgroup.png +++ b/graphics/interface/wordgroup_indicator.png diff --git a/graphics/interface/wordgroup_pink.pal b/graphics/interface/wordgroup_pink.pal new file mode 100644 index 000000000..9efe6e1c6 --- /dev/null +++ b/graphics/interface/wordgroup_pink.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +255 213 213 +246 180 180 +213 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/intro/copyright.bin b/graphics/intro/copyright.bin Binary files differnew file mode 100644 index 000000000..367991ff7 --- /dev/null +++ b/graphics/intro/copyright.bin diff --git a/graphics/intro/copyright.pal b/graphics/intro/copyright.pal new file mode 100644 index 000000000..4219d4394 --- /dev/null +++ b/graphics/intro/copyright.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 32 32 +24 57 57 +49 82 82 +82 106 106 +106 131 131 +139 156 156 +164 180 180 +197 205 205 +222 230 230 +255 255 255 diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png Binary files differnew file mode 100644 index 000000000..23d6dc2b4 --- /dev/null +++ b/graphics/intro/copyright.png diff --git a/graphics/misc/cable_car.pal b/graphics/misc/cable_car.pal new file mode 100755 index 000000000..64985f6da --- /dev/null +++ b/graphics/misc/cable_car.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +164 222 222 +98 139 139 +139 180 180 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +139 205 246 +98 172 238 +255 255 148 +238 213 82 +213 172 16 +180 106 0 +139 65 0 diff --git a/graphics/misc/cable_car.png b/graphics/misc/cable_car.png Binary files differnew file mode 100755 index 000000000..67f581fb9 --- /dev/null +++ b/graphics/misc/cable_car.png diff --git a/graphics/misc/cable_car_bg.pal b/graphics/misc/cable_car_bg.pal new file mode 100755 index 000000000..d543b4cce --- /dev/null +++ b/graphics/misc/cable_car_bg.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +0 0 0 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +255 230 139 +238 205 123 +222 189 115 +205 172 106 +189 156 98 +180 139 90 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +189 255 148 +156 222 98 +131 197 74 +106 164 49 +82 115 24 +57 82 0 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +213 238 255 +189 230 255 +164 222 255 +139 213 255 +115 205 255 +98 205 255 +197 205 222 +189 189 197 +180 164 164 +156 131 131 +131 90 90 +123 65 65 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +197 205 246 +172 189 238 +156 172 238 +131 156 230 +115 139 230 +98 123 230 +65 74 106 +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/misc/cable_car_bg.png b/graphics/misc/cable_car_bg.png Binary files differnew file mode 100755 index 000000000..f268ea990 --- /dev/null +++ b/graphics/misc/cable_car_bg.png diff --git a/graphics/misc/cable_car_cord.png b/graphics/misc/cable_car_cord.png Binary files differnew file mode 100755 index 000000000..b8176d3ca --- /dev/null +++ b/graphics/misc/cable_car_cord.png diff --git a/graphics/misc/cable_car_door.png b/graphics/misc/cable_car_door.png Binary files differnew file mode 100755 index 000000000..a61b3f504 --- /dev/null +++ b/graphics/misc/cable_car_door.png diff --git a/graphics/misc/clock.png b/graphics/misc/clock.png Binary files differnew file mode 100644 index 000000000..28780c1d1 --- /dev/null +++ b/graphics/misc/clock.png diff --git a/graphics/misc/decoration_10000.png b/graphics/misc/decoration_10000.png Binary files differnew file mode 100644 index 000000000..b9ee418f3 --- /dev/null +++ b/graphics/misc/decoration_10000.png diff --git a/graphics/misc/end_copyright.png b/graphics/misc/end_copyright.png Binary files differnew file mode 100644 index 000000000..57fc6114a --- /dev/null +++ b/graphics/misc/end_copyright.png diff --git a/graphics/misc/hof.pal b/graphics/misc/hof.pal new file mode 100644 index 000000000..b4fffc172 --- /dev/null +++ b/graphics/misc/hof.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 213 230 +255 32 32 +255 180 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 +65 65 65 +255 255 255 diff --git a/graphics/misc/hof.png b/graphics/misc/hof.png Binary files differnew file mode 100644 index 000000000..b60489544 --- /dev/null +++ b/graphics/misc/hof.png diff --git a/graphics/misc/trainer_card.png b/graphics/misc/trainer_card.png Binary files differnew file mode 100644 index 000000000..915ecdca2 --- /dev/null +++ b/graphics/misc/trainer_card.png diff --git a/graphics/misc/trainer_card_0star.pal b/graphics/misc/trainer_card_0star.pal new file mode 100644 index 000000000..f49b7f2c5 --- /dev/null +++ b/graphics/misc/trainer_card_0star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 255 255 +230 255 222 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +180 230 156 +148 238 131 +131 222 115 +82 172 74 +106 189 255 +205 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 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_1star.pal b/graphics/misc/trainer_card_1star.pal new file mode 100644 index 000000000..62c51c91f --- /dev/null +++ b/graphics/misc/trainer_card_1star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 255 246 +213 238 230 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +189 213 205 +148 180 164 +106 148 123 +65 115 90 +106 189 255 +205 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 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_2star.pal b/graphics/misc/trainer_card_2star.pal new file mode 100644 index 000000000..bacce54f5 --- /dev/null +++ b/graphics/misc/trainer_card_2star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 230 213 +205 156 90 +180 131 65 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +230 189 139 +205 156 115 +180 131 82 +156 106 41 +106 189 255 +205 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 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_3star.pal b/graphics/misc/trainer_card_3star.pal new file mode 100644 index 000000000..21f3d83eb --- /dev/null +++ b/graphics/misc/trainer_card_3star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 255 +230 230 238 +189 189 197 +156 156 156 +156 106 41 +41 57 65 +57 106 139 +65 139 197 +230 230 238 +189 189 197 +156 156 156 +123 123 123 +106 189 255 +205 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 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_4star.pal b/graphics/misc/trainer_card_4star.pal new file mode 100644 index 000000000..4e1d56b54 --- /dev/null +++ b/graphics/misc/trainer_card_4star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 222 +246 238 172 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +246 230 139 +230 213 49 +213 197 57 +156 115 57 +106 189 255 +205 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 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png Binary files differnew file mode 100755 index 000000000..aae121e3e --- /dev/null +++ b/graphics/naming_screen/menu.png diff --git a/graphics/pokeblock/black.pal b/graphics/pokeblock/black.pal new file mode 100644 index 000000000..2cb591a70 --- /dev/null +++ b/graphics/pokeblock/black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 131 74 +41 41 41 +98 98 98 +148 148 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 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/blue.pal b/graphics/pokeblock/blue.pal new file mode 100644 index 000000000..8295c79e8 --- /dev/null +++ b/graphics/pokeblock/blue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 106 189 +148 148 255 +180 180 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 diff --git a/graphics/pokeblock/brown.pal b/graphics/pokeblock/brown.pal new file mode 100644 index 000000000..c936322bb --- /dev/null +++ b/graphics/pokeblock/brown.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 0 0 +172 65 65 +197 123 123 +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/pokeblock/gold.pal b/graphics/pokeblock/gold.pal new file mode 100644 index 000000000..c975554d1 --- /dev/null +++ b/graphics/pokeblock/gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 197 49 +246 230 164 +255 238 197 +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/pokeblock/gray.pal b/graphics/pokeblock/gray.pal new file mode 100644 index 000000000..0bd5c4d7c --- /dev/null +++ b/graphics/pokeblock/gray.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 148 +189 189 189 +205 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 +0 0 0 diff --git a/graphics/pokeblock/green.pal b/graphics/pokeblock/green.pal new file mode 100644 index 000000000..984ba41ea --- /dev/null +++ b/graphics/pokeblock/green.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 106 0 +49 164 49 +90 230 90 +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/pokeblock/indigo.pal b/graphics/pokeblock/indigo.pal new file mode 100644 index 000000000..4a57b8bde --- /dev/null +++ b/graphics/pokeblock/indigo.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 74 +0 0 106 +65 65 172 +123 123 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 diff --git a/graphics/pokeblock/liteblue.pal b/graphics/pokeblock/liteblue.pal new file mode 100644 index 000000000..e3a70c8be --- /dev/null +++ b/graphics/pokeblock/liteblue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 139 189 +148 213 255 +180 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 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/olive.pal b/graphics/pokeblock/olive.pal new file mode 100644 index 000000000..e7599fc1e --- /dev/null +++ b/graphics/pokeblock/olive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +115 180 106 +148 246 98 +205 255 139 +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/pokeblock/pink.pal b/graphics/pokeblock/pink.pal new file mode 100644 index 000000000..7eb09a598 --- /dev/null +++ b/graphics/pokeblock/pink.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 90 172 +255 156 197 +255 197 213 +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/misc/pokeblock.png b/graphics/pokeblock/pokeblock.png Binary files differindex fd24e0621..fd24e0621 100755..100644 --- a/graphics/misc/pokeblock.png +++ b/graphics/pokeblock/pokeblock.png diff --git a/graphics/pokeblock/purple.pal b/graphics/pokeblock/purple.pal new file mode 100644 index 000000000..2b6f8ad43 --- /dev/null +++ b/graphics/pokeblock/purple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +164 0 164 +197 41 197 +255 131 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 diff --git a/graphics/pokeblock/red.pal b/graphics/pokeblock/red.pal new file mode 100644 index 000000000..a347854a9 --- /dev/null +++ b/graphics/pokeblock/red.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 65 24 +255 123 90 +255 180 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 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/white.pal b/graphics/pokeblock/white.pal new file mode 100644 index 000000000..c1d00b93a --- /dev/null +++ b/graphics/pokeblock/white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 222 +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 diff --git a/graphics/pokeblock/yellow.pal b/graphics/pokeblock/yellow.pal new file mode 100644 index 000000000..518042d9f --- /dev/null +++ b/graphics/pokeblock/yellow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +180 180 49 +246 230 49 +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 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png Binary files differnew file mode 100755 index 000000000..dd8ab63a7 --- /dev/null +++ b/graphics/pokedex/menu.png diff --git a/graphics/pokedex/menu1.pal b/graphics/pokedex/menu1.pal new file mode 100755 index 000000000..9850d59b0 --- /dev/null +++ b/graphics/pokedex/menu1.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +255 32 32 +49 82 213 +16 41 172 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +255 32 32 +49 82 213 +16 41 172 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/menu2.pal b/graphics/pokedex/menu2.pal new file mode 100755 index 000000000..da71fe5ba --- /dev/null +++ b/graphics/pokedex/menu2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +123 131 0 +255 255 255 +255 131 255 +255 74 189 +255 16 123 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +255 32 32 +49 82 213 +16 41 172 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +189 0 0 +90 164 0 +57 106 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png Binary files differnew file mode 100755 index 000000000..27de53df0 --- /dev/null +++ b/graphics/pokedex/menu2.png diff --git a/graphics/pokedex/menu3.pal b/graphics/pokedex/menu3.pal new file mode 100755 index 000000000..101b62b41 --- /dev/null +++ b/graphics/pokedex/menu3.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +123 131 0 +0 0 0 +0 0 0 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +156 230 0 +57 115 0 +255 32 32 +131 32 32 +172 156 139 +82 82 57 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +0 0 0 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +41 115 0 +32 49 32 +139 0 0 +16 0 0 +172 156 139 +82 82 57 +0 0 0 +0 0 0 +123 131 0 +0 0 0 +0 0 0 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +172 156 139 +82 82 57 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +0 0 0 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +172 156 139 +82 82 57 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/menu_search.png b/graphics/pokedex/menu_search.png Binary files differnew file mode 100755 index 000000000..d1c4ae466 --- /dev/null +++ b/graphics/pokedex/menu_search.png diff --git a/graphics/pokemon_storage/header.bin b/graphics/pokemon_storage/header.bin new file mode 100644 index 000000000..6c4c46090 --- /dev/null +++ b/graphics/pokemon_storage/header.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/graphics/pokemon_storage/header.png b/graphics/pokemon_storage/header.png Binary files differnew file mode 100644 index 000000000..f302ea41f --- /dev/null +++ b/graphics/pokemon_storage/header.png diff --git a/graphics/pokemon_storage/menu1.pal b/graphics/pokemon_storage/menu1.pal new file mode 100644 index 000000000..cf814577e --- /dev/null +++ b/graphics/pokemon_storage/menu1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 90 57 +255 255 255 +115 115 123 +205 123 197 +222 222 246 +90 189 238 +164 164 180 +98 98 115 +0 0 0 +82 82 90 +189 238 98 +164 222 74 +164 230 74 +180 230 115 +148 205 57 +148 148 172 diff --git a/graphics/pokemon_storage/menu2.bin b/graphics/pokemon_storage/menu2.bin Binary files differnew file mode 100644 index 000000000..ad8e8ef8b --- /dev/null +++ b/graphics/pokemon_storage/menu2.bin diff --git a/graphics/pokemon_storage/menu3.pal b/graphics/pokemon_storage/menu3.pal new file mode 100644 index 000000000..fbfbcd3cf --- /dev/null +++ b/graphics/pokemon_storage/menu3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 0 0 +131 74 98 +82 65 74 +189 82 74 +131 180 156 +123 156 115 +0 123 255 +123 189 255 +41 90 164 +172 238 148 +255 255 255 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon_storage/menu4.pal b/graphics/pokemon_storage/menu4.pal new file mode 100644 index 000000000..ee7ac07e1 --- /dev/null +++ b/graphics/pokemon_storage/menu4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 197 255 +255 255 255 +148 148 172 +115 115 123 +82 82 90 +180 230 115 +189 238 98 +148 205 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 diff --git a/graphics/pokemon_storage/misc1.bin b/graphics/pokemon_storage/misc1.bin new file mode 100644 index 000000000..0a2bcaf7f --- /dev/null +++ b/graphics/pokemon_storage/misc1.bin @@ -0,0 +1 @@ +@#A#A#A#A#A#A#A#A#A#A#B#w3x3y3z3{3|3}3~33@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#333333333@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#333333333@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#333333333@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#K#L#L#M#C#D#D#E#@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#N#O#O#P#F#A#A#G#@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#Q#R#R#S#H#I#I#J#@@@@@@@@@@@@@#K#L#L#M#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#N#O#O#P#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#Q#R#R#S#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#@@@@B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#A#A#A#A#A#B#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#T#U#V#W#X#Y#@@@@@@@@@@@@@@@@@@@@@#A#A#A#A#A#Z#[#\#]#^#_#@@@@@@@@@@@@@@@@@@@@`#a#a#a#a#a#a#a#a#b#b#c#@@@@@@@@@@@@@@@@@@@@d#e#f#g#h#i#j#k#l#m#m#m#@@@@@@@@@@@@@@@@@@@@n#o#p#q#r#s#t#u#v#m#m#m#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
\ No newline at end of file diff --git a/graphics/pokemon_storage/misc1.png b/graphics/pokemon_storage/misc1.png Binary files differnew file mode 100644 index 000000000..e2906d6af --- /dev/null +++ b/graphics/pokemon_storage/misc1.png diff --git a/graphics/pokenav/arrow2.png b/graphics/pokenav/arrow2.png Binary files differnew file mode 100644 index 000000000..f971ebb5c --- /dev/null +++ b/graphics/pokenav/arrow2.png diff --git a/graphics/pokenav/contest_arrows.pal b/graphics/pokenav/arrows.pal index 5761a94e5..5761a94e5 100755..100644 --- a/graphics/pokenav/contest_arrows.pal +++ b/graphics/pokenav/arrows.pal diff --git a/graphics/pokenav/contest_arrows.png b/graphics/pokenav/arrows.png Binary files differindex 61282edc4..61282edc4 100755..100644 --- a/graphics/pokenav/contest_arrows.png +++ b/graphics/pokenav/arrows.png diff --git a/graphics/pokenav/condition1.pal b/graphics/pokenav/condition1.pal new file mode 100644 index 000000000..702fcbbf5 --- /dev/null +++ b/graphics/pokenav/condition1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +123 123 131 +205 205 197 +156 156 156 +82 82 74 +172 172 172 +197 180 255 +106 82 222 +82 65 164 +98 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/condition2.pal b/graphics/pokenav/condition2.pal new file mode 100644 index 000000000..19d9d2195 --- /dev/null +++ b/graphics/pokenav/condition2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 98 115 +131 131 148 +131 156 255 +189 180 197 +115 230 115 +222 238 255 +255 156 98 +246 255 255 +255 213 180 +255 246 57 +255 255 180 +213 255 189 +255 222 255 +255 172 213 +189 222 246 diff --git a/graphics/pokenav/contest_pokeball.pal b/graphics/pokenav/condition3.pal index 67350adee..67350adee 100755..100644 --- a/graphics/pokenav/contest_pokeball.pal +++ b/graphics/pokenav/condition3.pal diff --git a/graphics/pokenav/condition4.pal b/graphics/pokenav/condition4.pal new file mode 100644 index 000000000..5a31bb028 --- /dev/null +++ b/graphics/pokenav/condition4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 139 +123 123 156 +246 255 255 +106 106 123 +0 0 8 +246 115 82 +255 123 90 +156 172 164 +246 189 131 +255 197 139 +222 246 230 +230 255 222 +238 246 246 +255 255 255 +0 98 98 +0 0 0 diff --git a/graphics/pokenav/condition5.pal b/graphics/pokenav/condition5.pal new file mode 100644 index 000000000..f37881bec --- /dev/null +++ b/graphics/pokenav/condition5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 255 255 +82 82 74 +180 0 0 +246 65 41 +255 148 90 +255 255 255 +0 0 0 +0 0 0 +255 255 255 +82 82 74 +148 255 98 +32 197 106 +74 139 57 +255 238 98 +246 197 49 +230 148 0 diff --git a/graphics/pokenav/condition6.pal b/graphics/pokenav/condition6.pal new file mode 100644 index 000000000..84a168b49 --- /dev/null +++ b/graphics/pokenav/condition6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 230 0 +255 255 255 +82 82 74 +255 148 90 +255 65 32 +180 0 0 +197 180 255 +106 82 222 +82 65 164 +255 172 164 +246 106 106 +205 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/condition7.bin b/graphics/pokenav/condition7.bin Binary files differnew file mode 100644 index 000000000..1d621df35 --- /dev/null +++ b/graphics/pokenav/condition7.bin diff --git a/graphics/pokenav/condition_cancel.png b/graphics/pokenav/condition_cancel.png Binary files differnew file mode 100644 index 000000000..db4734b15 --- /dev/null +++ b/graphics/pokenav/condition_cancel.png diff --git a/graphics/pokenav/condition_menu.png b/graphics/pokenav/condition_menu.png Binary files differnew file mode 100644 index 000000000..8b682223e --- /dev/null +++ b/graphics/pokenav/condition_menu.png diff --git a/graphics/pokenav/condition_menu_header.png b/graphics/pokenav/condition_menu_header.png Binary files differnew file mode 100644 index 000000000..1a9c07273 --- /dev/null +++ b/graphics/pokenav/condition_menu_header.png diff --git a/graphics/pokenav/condition_menu_misc.png b/graphics/pokenav/condition_menu_misc.png Binary files differnew file mode 100644 index 000000000..3c87c867e --- /dev/null +++ b/graphics/pokenav/condition_menu_misc.png diff --git a/graphics/pokenav/condition_menu_options.png b/graphics/pokenav/condition_menu_options.png Binary files differnew file mode 100644 index 000000000..588c3b92f --- /dev/null +++ b/graphics/pokenav/condition_menu_options.png diff --git a/graphics/pokenav/condition_menu_options2.png b/graphics/pokenav/condition_menu_options2.png Binary files differnew file mode 100644 index 000000000..f17160c56 --- /dev/null +++ b/graphics/pokenav/condition_menu_options2.png diff --git a/graphics/pokenav/condition_search2.pal b/graphics/pokenav/condition_search2.pal new file mode 100644 index 000000000..a5a556515 --- /dev/null +++ b/graphics/pokenav/condition_search2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 65 +49 65 74 +106 115 123 +255 255 255 +90 123 164 +98 172 230 +197 222 255 +148 156 205 +156 164 205 +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/pokenav/condition_search2.png b/graphics/pokenav/condition_search2.png Binary files differnew file mode 100644 index 000000000..d4c25f5c8 --- /dev/null +++ b/graphics/pokenav/condition_search2.png diff --git a/graphics/pokenav/condition_search_beauty.png b/graphics/pokenav/condition_search_beauty.png Binary files differnew file mode 100644 index 000000000..8201ee306 --- /dev/null +++ b/graphics/pokenav/condition_search_beauty.png diff --git a/graphics/pokenav/condition_search_cancel.png b/graphics/pokenav/condition_search_cancel.png Binary files differnew file mode 100644 index 000000000..9a612fff0 --- /dev/null +++ b/graphics/pokenav/condition_search_cancel.png diff --git a/graphics/pokenav/condition_search_cool.png b/graphics/pokenav/condition_search_cool.png Binary files differnew file mode 100644 index 000000000..edf1a8770 --- /dev/null +++ b/graphics/pokenav/condition_search_cool.png diff --git a/graphics/pokenav/condition_search_cute.png b/graphics/pokenav/condition_search_cute.png Binary files differnew file mode 100644 index 000000000..0551a1c1a --- /dev/null +++ b/graphics/pokenav/condition_search_cute.png diff --git a/graphics/pokenav/condition_search_smart.png b/graphics/pokenav/condition_search_smart.png Binary files differnew file mode 100644 index 000000000..bae400440 --- /dev/null +++ b/graphics/pokenav/condition_search_smart.png diff --git a/graphics/pokenav/condition_search_tough.png b/graphics/pokenav/condition_search_tough.png Binary files differnew file mode 100644 index 000000000..85c0d107c --- /dev/null +++ b/graphics/pokenav/condition_search_tough.png diff --git a/graphics/pokenav/condition_view.png b/graphics/pokenav/condition_view.png Binary files differnew file mode 100644 index 000000000..d41c5794b --- /dev/null +++ b/graphics/pokenav/condition_view.png diff --git a/graphics/pokenav/mainmenu.png b/graphics/pokenav/mainmenu.png Binary files differnew file mode 100644 index 000000000..7908457cd --- /dev/null +++ b/graphics/pokenav/mainmenu.png diff --git a/graphics/pokenav/map_header.png b/graphics/pokenav/map_header.png Binary files differnew file mode 100644 index 000000000..0b7d73130 --- /dev/null +++ b/graphics/pokenav/map_header.png diff --git a/graphics/pokenav/map_menu.pal b/graphics/pokenav/map_menu.pal new file mode 100644 index 000000000..67111078c --- /dev/null +++ b/graphics/pokenav/map_menu.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 98 0 +255 255 255 +246 197 49 +255 238 98 +189 148 0 +197 197 205 +238 238 230 +246 148 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +148 148 148 diff --git a/graphics/pokenav/map_misc2.png b/graphics/pokenav/map_misc2.png Binary files differnew file mode 100644 index 000000000..1118afaf8 --- /dev/null +++ b/graphics/pokenav/map_misc2.png diff --git a/graphics/pokenav/map_squares.png b/graphics/pokenav/map_squares.png Binary files differnew file mode 100644 index 000000000..fb73235ff --- /dev/null +++ b/graphics/pokenav/map_squares.png diff --git a/graphics/pokenav/menu_condition.png b/graphics/pokenav/menu_condition.png Binary files differnew file mode 100644 index 000000000..e4d8f064f --- /dev/null +++ b/graphics/pokenav/menu_condition.png diff --git a/graphics/pokenav/menu_eyes.png b/graphics/pokenav/menu_eyes.png Binary files differnew file mode 100644 index 000000000..bbc0869c1 --- /dev/null +++ b/graphics/pokenav/menu_eyes.png diff --git a/graphics/pokenav/menu_hoennmap.png b/graphics/pokenav/menu_hoennmap.png Binary files differnew file mode 100644 index 000000000..06f7f5e7f --- /dev/null +++ b/graphics/pokenav/menu_hoennmap.png diff --git a/graphics/pokenav/menu_off.png b/graphics/pokenav/menu_off.png Binary files differnew file mode 100644 index 000000000..8a753d0f1 --- /dev/null +++ b/graphics/pokenav/menu_off.png diff --git a/graphics/pokenav/menu_ribbons.png b/graphics/pokenav/menu_ribbons.png Binary files differnew file mode 100644 index 000000000..5426e24bb --- /dev/null +++ b/graphics/pokenav/menu_ribbons.png diff --git a/graphics/pokenav/contest_pokeball.png b/graphics/pokenav/pokeball.png Binary files differindex 9eb7d9165..9eb7d9165 100755..100644 --- a/graphics/pokenav/contest_pokeball.png +++ b/graphics/pokenav/pokeball.png diff --git a/graphics/pokenav/pokenav1.pal b/graphics/pokenav/pokenav1.pal new file mode 100644 index 000000000..bdcd626cf --- /dev/null +++ b/graphics/pokenav/pokenav1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 74 +255 255 255 +230 148 0 +246 197 49 +255 238 98 +32 197 106 +74 139 57 +106 82 222 +82 57 156 +255 65 32 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/pokenav2.pal b/graphics/pokenav/pokenav2.pal new file mode 100644 index 000000000..31491563b --- /dev/null +++ b/graphics/pokenav/pokenav2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 74 +123 123 131 +156 156 156 +205 205 197 +255 255 255 +32 197 106 +74 139 57 +106 82 222 +82 57 156 +246 106 106 +205 74 65 +230 148 0 +246 197 49 +255 238 98 +0 0 0 diff --git a/graphics/pokenav/pokenav3.pal b/graphics/pokenav/pokenav3.pal new file mode 100644 index 000000000..ee6ab364c --- /dev/null +++ b/graphics/pokenav/pokenav3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 255 255 +255 255 255 +123 123 131 +205 205 197 +156 156 156 +82 82 74 +148 255 98 +32 197 106 +74 139 57 +172 172 172 +255 172 164 +246 106 106 +205 74 65 +197 180 255 +106 82 222 +82 57 156 diff --git a/graphics/pokenav/ribbon_pokeview.png b/graphics/pokenav/ribbon_pokeview.png Binary files differnew file mode 100644 index 000000000..28e85a1a6 --- /dev/null +++ b/graphics/pokenav/ribbon_pokeview.png diff --git a/graphics/pokenav/ribbon_view.pal.bin b/graphics/pokenav/ribbon_view.pal.bin Binary files differnew file mode 100644 index 000000000..bd41bf59c --- /dev/null +++ b/graphics/pokenav/ribbon_view.pal.bin diff --git a/graphics/pokenav/ribbon_view.pal.bin.bak b/graphics/pokenav/ribbon_view.pal.bin.bak Binary files differnew file mode 100644 index 000000000..387706554 --- /dev/null +++ b/graphics/pokenav/ribbon_view.pal.bin.bak diff --git a/graphics/pokenav/ribbon_view.png b/graphics/pokenav/ribbon_view.png Binary files differnew file mode 100644 index 000000000..267a6add6 --- /dev/null +++ b/graphics/pokenav/ribbon_view.png diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png Binary files differnew file mode 100644 index 000000000..75ec59d25 --- /dev/null +++ b/graphics/pokenav/ribbons.png diff --git a/graphics/pokenav/contest_sparkle.pal b/graphics/pokenav/sparkle.pal index 114155fe4..114155fe4 100755..100644 --- a/graphics/pokenav/contest_sparkle.pal +++ b/graphics/pokenav/sparkle.pal diff --git a/graphics/pokenav/contest_sparkle.png b/graphics/pokenav/sparkle.png Binary files differindex 5949b376e..5949b376e 100755..100644 --- a/graphics/pokenav/contest_sparkle.png +++ b/graphics/pokenav/sparkle.png diff --git a/graphics/pokenav/trainereyes.png b/graphics/pokenav/trainereyes.png Binary files differnew file mode 100644 index 000000000..250b4c27e --- /dev/null +++ b/graphics/pokenav/trainereyes.png diff --git a/graphics/slot_machine/reel_time_lights.png b/graphics/slot_machine/reel_time_lights.png Binary files differnew file mode 100644 index 000000000..8295aeca2 --- /dev/null +++ b/graphics/slot_machine/reel_time_lights.png diff --git a/graphics/slot_machine/slots.png b/graphics/slot_machine/slots.png Binary files differnew file mode 100644 index 000000000..291f467c3 --- /dev/null +++ b/graphics/slot_machine/slots.png diff --git a/graphics/text_window/1.pal b/graphics/text_window/1.pal new file mode 100644 index 000000000..08c365c84 --- /dev/null +++ b/graphics/text_window/1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 98 +41 49 49 +74 74 106 +115 106 131 +98 98 148 +115 115 172 +139 139 205 +172 189 172 +222 213 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png Binary files differnew file mode 100644 index 000000000..5d8020eff --- /dev/null +++ b/graphics/text_window/1.png diff --git a/graphics/text_window/10.pal b/graphics/text_window/10.pal new file mode 100644 index 000000000..7ba0c53b6 --- /dev/null +++ b/graphics/text_window/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +255 180 131 +255 49 0 +255 131 82 +205 115 0 +164 123 49 +131 98 24 +172 139 65 +255 164 8 +189 180 123 +222 213 156 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png Binary files differnew file mode 100644 index 000000000..4295c681c --- /dev/null +++ b/graphics/text_window/10.png diff --git a/graphics/text_window/11.pal b/graphics/text_window/11.pal new file mode 100644 index 000000000..449263e0f --- /dev/null +++ b/graphics/text_window/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +106 115 115 +32 57 205 +82 131 230 +131 156 222 +164 180 230 +189 205 238 +222 230 246 +0 0 0 +180 106 189 +213 148 238 +222 180 238 +238 213 246 +255 255 255 +74 65 82 diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png Binary files differnew file mode 100644 index 000000000..a0e576fce --- /dev/null +++ b/graphics/text_window/11.png diff --git a/graphics/text_window/12.pal b/graphics/text_window/12.pal new file mode 100644 index 000000000..efb2c1ec3 --- /dev/null +++ b/graphics/text_window/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +74 74 106 +148 90 164 +115 131 65 +156 189 32 +205 246 0 +238 213 74 +255 230 148 +255 148 57 +98 115 123 +123 156 139 +156 205 156 +205 49 57 +255 255 255 +74 65 82 diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png Binary files differnew file mode 100644 index 000000000..c41f18a6d --- /dev/null +++ b/graphics/text_window/12.png diff --git a/graphics/text_window/13.pal b/graphics/text_window/13.pal new file mode 100644 index 000000000..59540758f --- /dev/null +++ b/graphics/text_window/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +180 189 180 +222 213 222 +255 0 255 +255 0 255 +123 115 90 +205 172 115 +238 205 139 +32 74 172 +90 205 213 +74 115 197 +255 0 255 +255 0 255 +255 255 255 +74 65 82 diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png Binary files differnew file mode 100644 index 000000000..d401f030d --- /dev/null +++ b/graphics/text_window/13.png diff --git a/graphics/text_window/14.pal b/graphics/text_window/14.pal new file mode 100644 index 000000000..492f7de72 --- /dev/null +++ b/graphics/text_window/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +106 74 16 +180 189 180 +222 213 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 123 57 +205 172 106 +230 180 115 +230 189 115 +238 205 131 +255 230 164 +255 255 255 +74 65 82 diff --git a/graphics/text_window/14.png b/graphics/text_window/14.png Binary files differnew file mode 100644 index 000000000..8a03bcbf4 --- /dev/null +++ b/graphics/text_window/14.png diff --git a/graphics/text_window/15.pal b/graphics/text_window/15.pal new file mode 100644 index 000000000..8c1141e05 --- /dev/null +++ b/graphics/text_window/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +172 123 156 +106 90 115 +82 98 156 +189 156 213 +205 180 222 +222 205 230 +238 230 238 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +255 255 255 +74 65 82 diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png Binary files differnew file mode 100644 index 000000000..919dcf9da --- /dev/null +++ b/graphics/text_window/15.png diff --git a/graphics/text_window/16.pal b/graphics/text_window/16.pal new file mode 100644 index 000000000..8b827a70f --- /dev/null +++ b/graphics/text_window/16.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 57 197 +32 41 115 +246 246 49 +123 123 49 +255 74 65 +156 41 32 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png Binary files differnew file mode 100644 index 000000000..e2f98ae84 --- /dev/null +++ b/graphics/text_window/16.png diff --git a/graphics/text_window/17.pal b/graphics/text_window/17.pal new file mode 100644 index 000000000..627af66d5 --- /dev/null +++ b/graphics/text_window/17.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +106 115 115 +180 180 180 +82 98 156 +197 180 172 +205 197 189 +222 213 213 +238 230 230 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +197 197 197 +255 255 246 +74 65 82 diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png Binary files differnew file mode 100644 index 000000000..382fa11d9 --- /dev/null +++ b/graphics/text_window/17.png diff --git a/graphics/text_window/18.pal b/graphics/text_window/18.pal new file mode 100644 index 000000000..e523123c7 --- /dev/null +++ b/graphics/text_window/18.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 164 +189 148 8 +255 189 0 +255 230 0 +255 255 148 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png Binary files differnew file mode 100644 index 000000000..cd065e426 --- /dev/null +++ b/graphics/text_window/18.png diff --git a/graphics/text_window/19.pal b/graphics/text_window/19.pal new file mode 100644 index 000000000..4615c7881 --- /dev/null +++ b/graphics/text_window/19.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +180 189 180 +222 213 222 +98 131 57 +255 123 82 +222 98 49 +164 49 16 +238 255 164 +238 213 131 +255 0 255 +197 255 123 +164 213 82 +131 189 65 +255 255 255 +74 65 82 diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png Binary files differnew file mode 100644 index 000000000..d33a1b613 --- /dev/null +++ b/graphics/text_window/19.png diff --git a/graphics/text_window/2.pal b/graphics/text_window/2.pal new file mode 100644 index 000000000..ac32c4606 --- /dev/null +++ b/graphics/text_window/2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +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 +255 255 255 +74 65 82 diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png Binary files differnew file mode 100644 index 000000000..5e89b4116 --- /dev/null +++ b/graphics/text_window/2.png diff --git a/graphics/text_window/20.pal b/graphics/text_window/20.pal new file mode 100644 index 000000000..a7f9e1fbd --- /dev/null +++ b/graphics/text_window/20.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +255 213 255 +255 180 222 +131 82 24 +255 131 131 +238 65 65 +156 213 156 +106 164 106 +49 106 49 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/20.png b/graphics/text_window/20.png Binary files differnew file mode 100644 index 000000000..662ae45e3 --- /dev/null +++ b/graphics/text_window/20.png diff --git a/graphics/text_window/3.pal b/graphics/text_window/3.pal new file mode 100644 index 000000000..3c5120d11 --- /dev/null +++ b/graphics/text_window/3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 246 +255 123 115 +222 74 65 +106 49 41 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png Binary files differnew file mode 100644 index 000000000..b7af18de7 --- /dev/null +++ b/graphics/text_window/3.png diff --git a/graphics/text_window/4.pal b/graphics/text_window/4.pal new file mode 100644 index 000000000..c8e024332 --- /dev/null +++ b/graphics/text_window/4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +57 74 74 +106 123 123 +156 172 172 +205 222 222 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/4.png b/graphics/text_window/4.png Binary files differnew file mode 100644 index 000000000..c33ed48af --- /dev/null +++ b/graphics/text_window/4.png diff --git a/graphics/text_window/5.pal b/graphics/text_window/5.pal new file mode 100644 index 000000000..5d81802e2 --- /dev/null +++ b/graphics/text_window/5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +222 213 222 +0 222 255 +123 57 0 +230 123 0 +255 255 41 +0 106 0 +0 172 0 +115 255 41 +139 0 0 +205 49 0 +255 189 0 +0 0 180 +0 106 213 +255 255 255 +74 65 82 diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png Binary files differnew file mode 100644 index 000000000..515bb02e2 --- /dev/null +++ b/graphics/text_window/5.png diff --git a/graphics/text_window/6.pal b/graphics/text_window/6.pal new file mode 100644 index 000000000..3bb5b2006 --- /dev/null +++ b/graphics/text_window/6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 180 238 +82 115 115 +148 189 156 +0 41 0 +90 115 106 +115 148 131 +98 74 41 +189 205 197 +115 90 57 +65 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/6.png b/graphics/text_window/6.png Binary files differnew file mode 100644 index 000000000..a0be4e49d --- /dev/null +++ b/graphics/text_window/6.png diff --git a/graphics/text_window/7.pal b/graphics/text_window/7.pal new file mode 100644 index 000000000..142d57bc8 --- /dev/null +++ b/graphics/text_window/7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +139 49 49 +172 57 57 +205 65 65 +230 74 74 +255 82 82 +189 106 106 +255 131 131 +164 156 156 +213 197 197 +238 230 230 +222 213 213 +0 0 0 +0 0 0 +255 255 255 +74 65 82 diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png Binary files differnew file mode 100644 index 000000000..fd8df61c1 --- /dev/null +++ b/graphics/text_window/7.png diff --git a/graphics/text_window/8.pal b/graphics/text_window/8.pal new file mode 100644 index 000000000..4d80d0f89 --- /dev/null +++ b/graphics/text_window/8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +82 189 0 +139 246 41 +156 115 41 +131 98 24 +172 139 65 +246 98 131 +255 156 180 +255 246 0 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png Binary files differnew file mode 100644 index 000000000..480751a02 --- /dev/null +++ b/graphics/text_window/8.png diff --git a/graphics/text_window/9.pal b/graphics/text_window/9.pal new file mode 100644 index 000000000..b0e3b49e6 --- /dev/null +++ b/graphics/text_window/9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 98 +41 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 246 255 +90 131 189 +115 156 213 +156 197 255 +197 238 255 +180 189 180 +222 213 222 +255 255 255 +74 65 82 diff --git a/graphics/text_window/9.png b/graphics/text_window/9.png Binary files differnew file mode 100644 index 000000000..2b8b5bd54 --- /dev/null +++ b/graphics/text_window/9.png diff --git a/graphics/text_window/main.png b/graphics/text_window/main.png Binary files differnew file mode 100644 index 000000000..b41a0f799 --- /dev/null +++ b/graphics/text_window/main.png diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png Binary files differnew file mode 100644 index 000000000..b38a4b58d --- /dev/null +++ b/graphics/title_screen/press_start.png diff --git a/graphics/types/bug.png b/graphics/types/bug.png Binary files differnew file mode 100755 index 000000000..c11629b21 --- /dev/null +++ b/graphics/types/bug.png diff --git a/graphics/types/contest_beauty.png b/graphics/types/contest_beauty.png Binary files differnew file mode 100755 index 000000000..b52fe3ca4 --- /dev/null +++ b/graphics/types/contest_beauty.png diff --git a/graphics/types/contest_cool.png b/graphics/types/contest_cool.png Binary files differnew file mode 100755 index 000000000..813e91f80 --- /dev/null +++ b/graphics/types/contest_cool.png diff --git a/graphics/types/contest_cute.png b/graphics/types/contest_cute.png Binary files differnew file mode 100755 index 000000000..ece852a9d --- /dev/null +++ b/graphics/types/contest_cute.png diff --git a/graphics/types/contest_smart.png b/graphics/types/contest_smart.png Binary files differnew file mode 100755 index 000000000..8e0d903f1 --- /dev/null +++ b/graphics/types/contest_smart.png diff --git a/graphics/types/contest_tough.png b/graphics/types/contest_tough.png Binary files differnew file mode 100755 index 000000000..a76e9cba4 --- /dev/null +++ b/graphics/types/contest_tough.png diff --git a/graphics/types/dark.png b/graphics/types/dark.png Binary files differnew file mode 100755 index 000000000..3380297da --- /dev/null +++ b/graphics/types/dark.png diff --git a/graphics/types/dragon.png b/graphics/types/dragon.png Binary files differnew file mode 100755 index 000000000..908073260 --- /dev/null +++ b/graphics/types/dragon.png diff --git a/graphics/types/electric.png b/graphics/types/electric.png Binary files differnew file mode 100755 index 000000000..84db710b6 --- /dev/null +++ b/graphics/types/electric.png diff --git a/graphics/types/fight.png b/graphics/types/fight.png Binary files differnew file mode 100755 index 000000000..6431c9bba --- /dev/null +++ b/graphics/types/fight.png diff --git a/graphics/types/fire.png b/graphics/types/fire.png Binary files differnew file mode 100755 index 000000000..f6db950c8 --- /dev/null +++ b/graphics/types/fire.png diff --git a/graphics/types/flying.png b/graphics/types/flying.png Binary files differnew file mode 100755 index 000000000..144d0010b --- /dev/null +++ b/graphics/types/flying.png diff --git a/graphics/types/ghost.png b/graphics/types/ghost.png Binary files differnew file mode 100755 index 000000000..5820fe93a --- /dev/null +++ b/graphics/types/ghost.png diff --git a/graphics/types/grass.png b/graphics/types/grass.png Binary files differnew file mode 100755 index 000000000..6d3e870ca --- /dev/null +++ b/graphics/types/grass.png diff --git a/graphics/types/ground.png b/graphics/types/ground.png Binary files differnew file mode 100755 index 000000000..2872b1367 --- /dev/null +++ b/graphics/types/ground.png diff --git a/graphics/types/ice.png b/graphics/types/ice.png Binary files differnew file mode 100755 index 000000000..a611d1f4a --- /dev/null +++ b/graphics/types/ice.png diff --git a/graphics/types/move_types_1.pal b/graphics/types/move_types_1.pal new file mode 100755 index 000000000..951aa69cb --- /dev/null +++ b/graphics/types/move_types_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 213 49 +246 131 49 +197 49 41 +230 197 106 +189 164 57 +139 106 49 +255 255 123 +172 172 123 +222 222 197 +115 90 74 +74 65 57 +189 189 213 +0 0 0 +131 123 115 +255 255 255 diff --git a/graphics/types/move_types_2.pal b/graphics/types/move_types_2.pal new file mode 100755 index 000000000..08dcea47c --- /dev/null +++ b/graphics/types/move_types_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 197 255 +172 148 246 +115 90 156 +106 148 246 +156 222 222 +213 255 238 +74 57 82 +255 90 139 +255 197 180 +148 98 98 +164 65 164 +222 131 189 +148 148 164 +131 123 115 +255 255 255 diff --git a/graphics/types/move_types_3.pal b/graphics/types/move_types_3.pal new file mode 100755 index 000000000..4db37235b --- /dev/null +++ b/graphics/types/move_types_3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +197 255 98 +123 205 82 +90 131 65 +115 57 255 +74 57 148 +189 164 255 +172 189 32 +222 230 49 +123 148 16 +106 164 148 +115 205 180 +32 106 98 +0 0 0 +131 123 115 +255 255 255 diff --git a/graphics/types/mystery.png b/graphics/types/mystery.png Binary files differnew file mode 100755 index 000000000..a2ea01d55 --- /dev/null +++ b/graphics/types/mystery.png diff --git a/graphics/types/normal.png b/graphics/types/normal.png Binary files differnew file mode 100755 index 000000000..608a1f9c9 --- /dev/null +++ b/graphics/types/normal.png diff --git a/graphics/types/poison.png b/graphics/types/poison.png Binary files differnew file mode 100755 index 000000000..2fab1ad53 --- /dev/null +++ b/graphics/types/poison.png diff --git a/graphics/types/psychic.png b/graphics/types/psychic.png Binary files differnew file mode 100755 index 000000000..98f70406e --- /dev/null +++ b/graphics/types/psychic.png diff --git a/graphics/types/rock.png b/graphics/types/rock.png Binary files differnew file mode 100755 index 000000000..e95b2a8ef --- /dev/null +++ b/graphics/types/rock.png diff --git a/graphics/types/steel.png b/graphics/types/steel.png Binary files differnew file mode 100755 index 000000000..b952031fd --- /dev/null +++ b/graphics/types/steel.png diff --git a/graphics/types/water.png b/graphics/types/water.png Binary files differnew file mode 100755 index 000000000..19ae3ebe3 --- /dev/null +++ b/graphics/types/water.png diff --git a/graphics/unused/unknown_3D7D8C.png b/graphics/unknown/unknown_3D7D8C.png Binary files differindex c4a27b929..c4a27b929 100644 --- a/graphics/unused/unknown_3D7D8C.png +++ b/graphics/unknown/unknown_3D7D8C.png diff --git a/graphics/unused/unknown_3D810C.bin b/graphics/unknown/unknown_3D810C.bin Binary files differindex dc2990b0a..dc2990b0a 100644 --- a/graphics/unused/unknown_3D810C.bin +++ b/graphics/unknown/unknown_3D810C.bin diff --git a/graphics/unknown/unknown_D04388.png b/graphics/unknown/unknown_D04388.png Binary files differnew file mode 100755 index 000000000..0b2ae80f9 --- /dev/null +++ b/graphics/unknown/unknown_D04388.png diff --git a/graphics/unknown/unknown_D07B68.pal b/graphics/unknown/unknown_D07B68.pal new file mode 100755 index 000000000..ca77648e6 --- /dev/null +++ b/graphics/unknown/unknown_D07B68.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 0 +255 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 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_D07B68.png b/graphics/unknown/unknown_D07B68.png Binary files differnew file mode 100755 index 000000000..d36afa64d --- /dev/null +++ b/graphics/unknown/unknown_D07B68.png diff --git a/graphics/unknown/unknown_D07B68_2.pal b/graphics/unknown/unknown_D07B68_2.pal new file mode 100755 index 000000000..44f4b55d6 --- /dev/null +++ b/graphics/unknown/unknown_D07B68_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/unknown_D0CFAC.bin b/graphics/unknown/unknown_D0CFAC.bin Binary files differnew file mode 100755 index 000000000..4b6b2b106 --- /dev/null +++ b/graphics/unknown/unknown_D0CFAC.bin diff --git a/graphics/unknown/unknown_D0CFD0.bin b/graphics/unknown/unknown_D0CFD0.bin Binary files differnew file mode 100755 index 000000000..25fc33a73 --- /dev/null +++ b/graphics/unknown/unknown_D0CFD0.bin diff --git a/graphics/unknown/unknown_D0CFF4.bin b/graphics/unknown/unknown_D0CFF4.bin Binary files differnew file mode 100755 index 000000000..5b81e0216 --- /dev/null +++ b/graphics/unknown/unknown_D0CFF4.bin diff --git a/graphics/unknown/unknown_D0D070.bin b/graphics/unknown/unknown_D0D070.bin Binary files differnew file mode 100755 index 000000000..15379a9ce --- /dev/null +++ b/graphics/unknown/unknown_D0D070.bin diff --git a/graphics/unknown/unknown_D0D2B4.bin b/graphics/unknown/unknown_D0D2B4.bin Binary files differnew file mode 100755 index 000000000..d42729b58 --- /dev/null +++ b/graphics/unknown/unknown_D0D2B4.bin diff --git a/graphics/unknown/unknown_D12FEC.png b/graphics/unknown/unknown_D12FEC.png Binary files differnew file mode 100755 index 000000000..96c49a992 --- /dev/null +++ b/graphics/unknown/unknown_D12FEC.png diff --git a/graphics/unknown/unknown_D1300C.png b/graphics/unknown/unknown_D1300C.png Binary files differnew file mode 100755 index 000000000..0c077dd0b --- /dev/null +++ b/graphics/unknown/unknown_D1300C.png diff --git a/graphics/unknown/unknown_D1C060.bin b/graphics/unknown/unknown_D1C060.bin Binary files differnew file mode 100755 index 000000000..e4776cba4 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.bin diff --git a/graphics/unknown/unknown_D1C060.pal b/graphics/unknown/unknown_D1C060.pal new file mode 100755 index 000000000..0b2590f44 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 255 255 +0 65 148 +148 65 148 +255 255 0 +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 diff --git a/graphics/unknown/unknown_D1C060.png b/graphics/unknown/unknown_D1C060.png Binary files differnew file mode 100755 index 000000000..2371241d7 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.png diff --git a/graphics/unknown/unknown_E91418.bin b/graphics/unknown/unknown_E91418.bin Binary files differnew file mode 100644 index 000000000..21a2f1dd0 --- /dev/null +++ b/graphics/unknown/unknown_E91418.bin diff --git a/graphics/unknown/unknown_EA25EC.bin b/graphics/unknown/unknown_EA25EC.bin Binary files differnew file mode 100644 index 000000000..481183cbd --- /dev/null +++ b/graphics/unknown/unknown_EA25EC.bin diff --git a/graphics/unused/.gitignore b/graphics/unused/.gitignore new file mode 100644 index 000000000..7138daa26 --- /dev/null +++ b/graphics/unused/.gitignore @@ -0,0 +1 @@ +redyellowgreen_frame.bin diff --git a/graphics/unused/arrow.png b/graphics/unused/arrow.png Binary files differnew file mode 100644 index 000000000..98cf5b731 --- /dev/null +++ b/graphics/unused/arrow.png diff --git a/graphics/unused/basic_frame.bin b/graphics/unused/basic_frame.bin Binary files differnew file mode 100755 index 000000000..8e83eb9f5 --- /dev/null +++ b/graphics/unused/basic_frame.bin diff --git a/graphics/unused/basic_frame.pal b/graphics/unused/basic_frame.pal new file mode 100755 index 000000000..70ff9b632 --- /dev/null +++ b/graphics/unused/basic_frame.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 123 164 +205 205 205 +255 255 255 +164 164 164 +0 0 0 +172 0 0 +222 0 0 +197 74 0 +255 24 0 +205 164 106 +255 222 164 +255 131 0 +255 255 255 +123 238 90 +131 172 246 diff --git a/graphics/unused/basic_frame.png b/graphics/unused/basic_frame.png Binary files differnew file mode 100755 index 000000000..132671581 --- /dev/null +++ b/graphics/unused/basic_frame.png diff --git a/graphics/unused/battle_anim_023.pal b/graphics/unused/battle_anim_023.pal new file mode 100755 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/blank_frame.bin b/graphics/unused/blank_frame.bin Binary files differnew file mode 100755 index 000000000..e9784eb4c --- /dev/null +++ b/graphics/unused/blank_frame.bin diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin Binary files differnew file mode 100755 index 000000000..d5c3b6600 --- /dev/null +++ b/graphics/unused/blue_frame.bin diff --git a/graphics/unused/color_frames.pal b/graphics/unused/color_frames.pal new file mode 100755 index 000000000..56bf2a29c --- /dev/null +++ b/graphics/unused/color_frames.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 255 255 +106 123 164 +205 205 205 +255 255 255 +164 164 164 +0 0 0 +172 0 0 +222 0 0 +197 74 0 +255 24 0 +205 164 106 +255 222 164 +255 131 0 +255 255 255 +123 238 90 +131 172 246 diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png Binary files differnew file mode 100755 index 000000000..9270879eb --- /dev/null +++ b/graphics/unused/color_frames.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/green_frame.bin b/graphics/unused/green_frame.bin Binary files differnew file mode 100755 index 000000000..b381235d9 --- /dev/null +++ b/graphics/unused/green_frame.bin diff --git a/graphics/unused/line_sketch.pal b/graphics/unused/line_sketch.pal new file mode 100755 index 000000000..dc1d51763 --- /dev/null +++ b/graphics/unused/line_sketch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 255 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 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png Binary files differnew file mode 100755 index 000000000..fdfc8d771 --- /dev/null +++ b/graphics/unused/line_sketch.png diff --git a/graphics/unused/line_sketch_2.bin b/graphics/unused/line_sketch_2.bin Binary files differnew file mode 100755 index 000000000..e68d116a3 --- /dev/null +++ b/graphics/unused/line_sketch_2.bin diff --git a/graphics/unused/line_sketch_2.png b/graphics/unused/line_sketch_2.png Binary files differnew file mode 100755 index 000000000..cb70b3d83 --- /dev/null +++ b/graphics/unused/line_sketch_2.png diff --git a/graphics/unused/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png Binary files differnew file mode 100755 index 000000000..bd6cc8530 --- /dev/null +++ b/graphics/unused/metronome_hand_small.png diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png Binary files differnew file mode 100755 index 000000000..af89e55a0 --- /dev/null +++ b/graphics/unused/music_notes.png diff --git a/graphics/unused/old.png b/graphics/unused/old.png Binary files differdeleted file mode 100755 index 523f8fa9f..000000000 --- a/graphics/unused/old.png +++ /dev/null diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png Binary files differnew file mode 100755 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 100755 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 100755 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 100755 index 000000000..aae3307e7 --- /dev/null +++ b/graphics/unused/old_battle_interface_tilemap.bin diff --git a/graphics/unused/old_beatup.pal b/graphics/unused/old_beatup.pal new file mode 100755 index 000000000..31c43515e --- /dev/null +++ b/graphics/unused/old_beatup.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +0 0 0 +82 82 82 +164 164 164 +255 255 255 +213 213 164 +180 172 82 +148 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 diff --git a/graphics/unused/old_beatup.png b/graphics/unused/old_beatup.png Binary files differnew file mode 100755 index 000000000..e2a0561e2 --- /dev/null +++ b/graphics/unused/old_beatup.png diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png Binary files differnew file mode 100755 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 100755 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 100755 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 100755 index 000000000..aa15ea36e --- /dev/null +++ b/graphics/unused/old_charmap.bin diff --git a/graphics/unused/old_charmap.pal b/graphics/unused/old_charmap.pal new file mode 100755 index 000000000..cbcd5de4d --- /dev/null +++ b/graphics/unused/old_charmap.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +24 0 0 +41 0 0 +255 255 255 +0 0 0 +255 255 255 +255 65 0 +0 0 0 +255 0 0 +255 24 0 +255 65 0 +255 98 0 +255 131 0 +255 180 0 +255 222 0 +255 255 255 diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png Binary files differnew file mode 100755 index 000000000..b5ea6e803 --- /dev/null +++ b/graphics/unused/old_charmap.png diff --git a/graphics/unused/old_contest.bin b/graphics/unused/old_contest.bin Binary files differnew file mode 100755 index 000000000..da6f4652e --- /dev/null +++ b/graphics/unused/old_contest.bin diff --git a/graphics/unused/old_contest.pal b/graphics/unused/old_contest.pal new file mode 100755 index 000000000..69fde2000 --- /dev/null +++ b/graphics/unused/old_contest.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +197 197 197 +148 148 148 +74 65 82 +0 255 0 +0 255 0 +65 74 123 +139 123 131 +82 82 197 +189 82 74 +131 74 98 +74 74 131 +131 139 222 +106 164 164 +0 0 0 +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 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +172 172 148 +213 213 189 +230 230 213 +189 189 172 +238 238 222 +197 197 180 +0 0 0 +156 156 131 +197 197 189 +139 139 131 +98 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 106 156 +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 +148 148 156 +131 139 156 +123 131 156 +131 123 164 +123 115 164 +0 0 0 +115 106 156 +255 255 255 +205 156 255 +172 148 197 +230 222 246 +139 131 172 +213 189 238 +0 0 0 +238 238 230 +189 172 197 +222 213 213 +189 172 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 131 +213 131 90 +255 189 172 +197 98 74 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +164 238 98 +131 205 90 +213 255 148 +98 197 49 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +115 205 255 +115 180 205 +156 238 255 +49 98 148 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +0 0 0 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +74 65 82 +255 255 255 +222 222 222 +172 172 197 +255 0 0 +0 0 255 +255 255 0 +0 197 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 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 +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 +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_contest_2.bin b/graphics/unused/old_contest_2.bin Binary files differnew file mode 100755 index 000000000..06836cc19 --- /dev/null +++ b/graphics/unused/old_contest_2.bin diff --git a/graphics/unused/old_contest_2.pal b/graphics/unused/old_contest_2.pal new file mode 100755 index 000000000..3fb174790 --- /dev/null +++ b/graphics/unused/old_contest_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +197 197 197 +148 148 148 +74 65 82 +0 255 0 +0 255 0 +65 74 123 +139 123 131 +82 82 197 +189 82 74 +131 74 98 +74 74 131 +131 139 222 +106 164 164 +0 0 0 +115 123 156 +90 65 57 +148 197 106 +123 98 65 +131 123 49 +222 189 148 +164 131 106 +115 164 82 +164 148 57 +90 106 139 +180 172 82 +82 139 49 +255 230 189 +222 131 41 +246 246 222 +205 148 115 +255 106 115 +255 57 57 +156 0 0 +164 222 255 +106 148 255 +49 82 255 +255 255 115 +246 222 65 +230 106 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 255 115 +246 222 90 +238 189 65 +238 164 41 +230 131 16 +230 106 0 +255 41 0 +255 148 82 +255 255 164 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 131 106 +197 24 16 +164 222 255 +106 148 255 +49 82 255 +255 197 255 +255 139 255 +213 0 139 +148 255 164 +65 205 57 +246 222 65 +230 106 0 +255 255 255 +65 74 106 +65 74 106 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +213 255 213 +156 222 148 +222 255 230 +123 189 115 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +0 172 255 +0 0 0 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 255 255 +0 0 0 +0 0 0 +0 0 0 +65 0 0 +123 0 0 +189 0 0 +255 8 0 +255 65 0 +255 123 0 +255 189 0 +255 255 0 +255 255 123 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_contest_2_1.png b/graphics/unused/old_contest_2_1.png Binary files differnew file mode 100755 index 000000000..67b81de2d --- /dev/null +++ b/graphics/unused/old_contest_2_1.png diff --git a/graphics/unused/old_contest_2_2.png b/graphics/unused/old_contest_2_2.png Binary files differnew file mode 100755 index 000000000..a33a8c324 --- /dev/null +++ b/graphics/unused/old_contest_2_2.png diff --git a/graphics/unused/old_contest_classes.png b/graphics/unused/old_contest_classes.png Binary files differnew file mode 100755 index 000000000..c2e7b5e29 --- /dev/null +++ b/graphics/unused/old_contest_classes.png diff --git a/graphics/unused/old_contest_floor.png b/graphics/unused/old_contest_floor.png Binary files differnew file mode 100755 index 000000000..94877b921 --- /dev/null +++ b/graphics/unused/old_contest_floor.png diff --git a/graphics/unused/old_contest_frame_1.png b/graphics/unused/old_contest_frame_1.png Binary files differnew file mode 100755 index 000000000..28eaae905 --- /dev/null +++ b/graphics/unused/old_contest_frame_1.png diff --git a/graphics/unused/old_contest_frame_2.png b/graphics/unused/old_contest_frame_2.png Binary files differnew file mode 100755 index 000000000..c8b20408c --- /dev/null +++ b/graphics/unused/old_contest_frame_2.png diff --git a/graphics/unused/old_contest_meter.png b/graphics/unused/old_contest_meter.png Binary files differnew file mode 100755 index 000000000..606208b1f --- /dev/null +++ b/graphics/unused/old_contest_meter.png diff --git a/graphics/unused/old_contest_numbers.png b/graphics/unused/old_contest_numbers.png Binary files differnew file mode 100755 index 000000000..98c145976 --- /dev/null +++ b/graphics/unused/old_contest_numbers.png diff --git a/graphics/unused/old_contest_symbols.png b/graphics/unused/old_contest_symbols.png Binary files differnew file mode 100755 index 000000000..87cac733e --- /dev/null +++ b/graphics/unused/old_contest_symbols.png diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal new file mode 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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/unused/red_frame.bin b/graphics/unused/red_frame.bin Binary files differnew file mode 100755 index 000000000..5090b1b84 --- /dev/null +++ b/graphics/unused/red_frame.bin 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 diff --git a/graphics/unused/unknown_D021BC.bin b/graphics/unused/unknown_D021BC.bin Binary files differdeleted file mode 100755 index 9d7c14a2d..000000000 --- a/graphics/unused/unknown_D021BC.bin +++ /dev/null diff --git a/graphics/unused/unknown_D023E8.bin b/graphics/unused/unknown_D023E8.bin Binary files differdeleted file mode 100755 index 58efd7d3e..000000000 --- a/graphics/unused/unknown_D023E8.bin +++ /dev/null diff --git a/graphics/unused/water_splash.bin b/graphics/unused/water_splash.bin Binary files differnew file mode 100755 index 000000000..059347fa7 --- /dev/null +++ b/graphics/unused/water_splash.bin diff --git a/graphics/unused/water_splash.pal b/graphics/unused/water_splash.pal new file mode 100755 index 000000000..ada1391df --- /dev/null +++ b/graphics/unused/water_splash.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +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 +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 +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 +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/water_splash.png b/graphics/unused/water_splash.png Binary files differnew file mode 100755 index 000000000..a8439a050 --- /dev/null +++ b/graphics/unused/water_splash.png diff --git a/graphics/unused/yellow_frame.bin b/graphics/unused/yellow_frame.bin Binary files differnew file mode 100755 index 000000000..30ba3ed01 --- /dev/null +++ b/graphics/unused/yellow_frame.bin diff --git a/graphics/weather/fog1.bin b/graphics/weather/fog1.bin Binary files differnew file mode 100755 index 000000000..1f9d53f95 --- /dev/null +++ b/graphics/weather/fog1.bin @@ -5,10 +5,19 @@ PSSGFXDIR := graphics/pokemon_storage MISCGFXDIR := graphics/misc PKNAVGFXDIR := graphics/pokenav UNKNOWNGFXDIR := graphics/unknown +UNUSEDGFXDIR := graphics/unused REELGFXDIR := graphics/slot_machine ROULGFXDIR := graphics/roulette BTLANMSPRGFXDIR := graphics/battle_anims/sprites PICFRAMEGFXDIR := graphics/picture_frame +CONTESTGFXDIR := graphics/contest +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +TITLEGFXDIR := graphics/title_screen + +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 $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ @@ -163,5 +172,80 @@ $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/15 $(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png $(GFX) $< $@ -num_tiles 86 -$(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png +$(CONTESTGFXDIR)/nextturn.4bpp: $(CONTESTGFXDIR)/nextturn.png $(GFX) $< $@ -num_tiles 8 + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp >$@ + +$(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 $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp >$@ + +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp + @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@ + +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin + @cat $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin >$@ + +$(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png + $(GFX) $< $@ -num_tiles 353 + +$(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_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 >$@ + +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp + @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 + +$(BATTRANSGFXDIR)/vs_frame.4bpp: $(BATTRANSGFXDIR)/vs_frame.png + $(GFX) $< $@ -num_tiles 16 + +$(MENUGFXDIR)/party_menu_misc.4bpp: $(MENUGFXDIR)/party_menu_misc.png + $(GFX) $< $@ -num_tiles 116 + +$(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 $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal >$@ + +$(MENUGFXDIR)/status_screen.4bpp: $(MENUGFXDIR)/status_screen.png + $(GFX) $< $@ -num_tiles 217 + +$(PKNAVGFXDIR)/menu_options.4bpp: $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp + @cat $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp >$@ + +$(PKNAVGFXDIR)/condition_menu_misc.4bpp: $(PKNAVGFXDIR)/condition_menu_misc.png + $(GFX) $< $@ -num_tiles 41 + +$(PKNAVGFXDIR)/condition_search.4bpp: $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp + @cat $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp >$@ + +$(PSSGFXDIR)/header.4bpp: $(PSSGFXDIR)/header.png + $(GFX) $< $@ -num_tiles 47 + +$(PSSGFXDIR)/misc1.4bpp: $(PSSGFXDIR)/misc1.png + $(GFX) $< $@ -num_tiles 91 + +$(MISCGFXDIR)/hof.4bpp: $(MISCGFXDIR)/hof.png + $(GFX) $< $@ -num_tiles 37 + +$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png + $(GFX) $< $@ -num_tiles 65 + +$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png + $(GFX) $< $@ -num_tiles 43 + +$(TITLEGFXDIR)/press_start.4bpp: $(TITLEGFXDIR)/press_start.png + $(GFX) $< $@ -num_tiles 41 + +$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png + $(GFX) $< $@ -num_tiles 90 |
