diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-04 01:13:38 -0400 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-08-03 22:13:38 -0700 |
| commit | ad15d310b2660623f997710e8f2a676ba3b526b7 (patch) | |
| tree | d4e10f091eb5c886de3364c5529ce445e35198e9 | |
| parent | 809a9812a28070d35bb759c66b08244e9e41964b (diff) | |
More gfx/pal and data2 work (#27)
93 files changed, 2337 insertions, 379 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 90f529a97..46374cb4d 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -45541,14 +45541,14 @@ _080672E2: bx r1 thumb_func_end s76_close_picture_box - thumb_func_start sub_80672E8 -sub_80672E8: @ 80672E8 + thumb_func_start s77_showcontestwinner +s77_showcontestwinner: @ 80672E8 push {lr} ldr r1, [r0, 0x8] ldrb r2, [r1] adds r1, 0x1 str r1, [r0, 0x8] - cmp r2, 0 + cmp r2, 0 @ Last Master Rank Contest winner beq _080672FC adds r0, r2, 0 bl sub_8106630 @@ -45558,7 +45558,7 @@ _080672FC: movs r0, 0x1 pop {r1} bx r1 - thumb_func_end sub_80672E8 + thumb_func_end s77_showcontestwinner thumb_func_start sub_806730C sub_806730C: @ 806730C @@ -58712,9 +58712,9 @@ _0806D7DC: .4byte gUnknown_08E71894 _0806D7E0: .4byte 0x06006000 _0806D7E4: .4byte gUnknown_08E71934 _0806D7E8: .4byte 0x06006180 -_0806D7EC: .4byte gUnknown_08E72860 +_0806D7EC: .4byte gStatusGfx_Icons _0806D7F0: .4byte 0x06007180 -_0806D7F4: .4byte gUnknown_08E72A50 +_0806D7F4: .4byte gStatusPal_Icons thumb_func_end sub_806D718 thumb_func_start sub_806D7F8 diff --git a/asm/rom5.s b/asm/rom5.s index 8466afe23..e23b9da24 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -105409,7 +105409,7 @@ sub_80AE858: @ 80AE858 bx r1 .align 2, 0 _080AE8A0: .4byte gUnknown_083CA4BC -_080AE8A4: .4byte gUnknown_08D1CA1C +_080AE8A4: .4byte gContest2Pal _080AE8A8: .4byte gSpriteTemplate_83CA4A4 _080AE8AC: .4byte 0x02020004 _080AE8B0: .4byte SpriteCallbackDummy @@ -115016,7 +115016,7 @@ _080B3214: .4byte gUnknown_08E77804 _080B3218: .4byte 0x06007c00 _080B321C: .4byte gUnknown_08E77928 _080B3220: .4byte 0x02018000 -_080B3224: .4byte gUnknown_08E77900 +_080B3224: .4byte gMenuMoneyPal _080B3228: .4byte gWindowConfig_81E6DFC _080B322C: .4byte 0x03000708 _080B3230: .4byte 0x02025734 @@ -266166,6 +266166,8 @@ _080FC79C: .4byte sub_808AD58 thumb_func_start sub_80FC7A0 sub_80FC7A0: @ 80FC7A0 +@ This routine appears to handle contest winners' portraits. +@ It's called during execution of S77_showcontestwinner. push {lr} ldr r2, _080FC7E8 ldr r1, [r0, 0x4] @@ -266195,7 +266197,7 @@ sub_80FC7A0: @ 80FC7A0 subs r0, 0x2 cmp r0, 0x22 bls _080FC7DC - b _080FC928 + b _quit_080FC928 _080FC7DC: lsls r0, 2 ldr r1, _080FC808 @@ -266214,87 +266216,97 @@ _080FC804: .4byte 0x03005df4 _080FC808: .4byte _080FC80C .align 2, 0 _080FC80C: - .4byte _080FC898 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC8F8 - .4byte _080FC928 - .4byte _080FC89E - .4byte _080FC8A4 - .4byte _080FC8B8 - .4byte _080FC8CA - .4byte _080FC928 - .4byte _080FC8E0 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC8E6 - .4byte _080FC8C4 - .4byte _080FC8EC - .4byte _080FC8F2 - .4byte _080FC928 - .4byte _080FC928 - .4byte _080FC904 -_080FC898: + .4byte _080FC898 @ 00 + .4byte _quit_080FC928 @ 01 + .4byte _quit_080FC928 @ 02 + .4byte _quit_080FC928 @ 03 + .4byte _080FC8F8 @ 04 + .4byte _quit_080FC928 @ 05 + .4byte _080FC89E @ 06 + .4byte _080FC8A4 @ 07 + .4byte _080FC8B8 @ 08 + .4byte _080FC8CA @ 09 + .4byte _quit_080FC928 @ 0a + .4byte _080FC8E0 @ 0b + .4byte _quit_080FC928 @ 0c + .4byte _quit_080FC928 @ 0d + .4byte _quit_080FC928 @ 0e + .4byte _quit_080FC928 @ 0f + .4byte _quit_080FC928 @ 10 + .4byte _quit_080FC928 @ 11 + .4byte _quit_080FC928 @ 12 + .4byte _quit_080FC928 @ 13 + .4byte _quit_080FC928 @ 14 + .4byte _quit_080FC928 @ 15 + .4byte _quit_080FC928 @ 16 + .4byte _quit_080FC928 @ 17 + .4byte _quit_080FC928 @ 18 + .4byte _quit_080FC928 @ 19 + .4byte _quit_080FC928 @ 1a + .4byte _quit_080FC928 @ 1b + .4byte _080FC8E6 @ 1c + .4byte _080FC8C4 @ 1d + .4byte _080FC8EC @ 1e + .4byte _080FC8F2 @ 1f + .4byte _quit_080FC928 @ 20 + .4byte _quit_080FC928 @ 21 + .4byte _080FC904 @ 22 +_080FC898: @ Cuteness bl sub_80FCAA4 - b _080FC928 + b _quit_080FC928 + _080FC89E: bl sub_80FCB5C - b _080FC928 -_080FC8A4: + b _quit_080FC928 + +_080FC8A4: @ Coolness bl sub_80FCD54 ldr r0, _080FC8B4 ldrb r0, [r0] bl sub_80FCC18 - b _080FC928 + b _quit_080FC928 .align 2, 0 _080FC8B4: .4byte 0x03005e00 + _080FC8B8: bl sub_80FCD54 bl sub_80FCEA4 bl sub_80FCCBC _080FC8C4: bl sub_80FCEA4 - b _080FC928 + b _quit_080FC928 + _080FC8CA: bl sub_80FCD54 bl sub_80FD06C bl sub_80FD06C bl sub_80FD114 bl sub_80FCCBC - b _080FC928 -_080FC8E0: + b _quit_080FC928 + +_080FC8E0: @ Beauty bl sub_80FCF3C - b _080FC928 + b _quit_080FC928 + _080FC8E6: bl sub_80FCD54 - b _080FC928 + b _quit_080FC928 + _080FC8EC: bl sub_80FD06C - b _080FC928 + b _quit_080FC928 + _080FC8F2: bl sub_80FD114 - b _080FC928 -_080FC8F8: + b _quit_080FC928 + +_080FC8F8: @ Toughness bl sub_80FCAC4 movs r0, 0x3 bl sub_80FC92C - b _080FC928 -_080FC904: + b _quit_080FC928 + +_080FC904: @ Smartness bl sub_80FCD54 bl sub_80FD06C bl sub_80FD114 @@ -266305,7 +266317,7 @@ _080FC904: bl sub_80FC92C movs r0, 0x4 bl sub_80FC9E4 -_080FC928: +_quit_080FC928: pop {r0} bx r0 thumb_func_end sub_80FC7A0 @@ -267450,6 +267462,7 @@ _080FD1C4: .4byte 0x03005df0 thumb_func_start sub_80FD1C8 sub_80FD1C8: @ 80FD1C8 +@ Cuteness contest sketch mod push {r4-r7,lr} mov r7, r10 mov r6, r9 diff --git a/data/data1.s b/data/data1.s index 2abcce8f9..a811a294e 100644 --- a/data/data1.s +++ b/data/data1.s @@ -4,34 +4,627 @@ .section script_data, "aw", %progbits gUnknown_081D6BBC:: @ 81D6BBC - .incbin "baserom.gba", 0x001d6bbc, 0x388 + .4byte Unknown_081D6F14 + .4byte Unknown_081D6F81 + .4byte Unknown_081D6FF0 + .4byte Unknown_081D6FFB + .4byte Unknown_081D7069 + .4byte Unknown_081D7074 + .4byte Unknown_081D707F + .4byte Unknown_081D708A + .4byte Unknown_081D710A + .4byte Unknown_081D7173 + .4byte Unknown_081D718B + .4byte Unknown_081D7196 + .4byte Unknown_081D6F14 + .4byte Unknown_081D71A1 + .4byte Unknown_081D6F14 + .4byte Unknown_081D6F14 + .4byte Unknown_081D71AC + .4byte Unknown_081D6F14 + .4byte Unknown_081D71F5 + .4byte Unknown_081D7200 + .4byte Unknown_081D720B + .4byte Unknown_081D6F14 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7216 + .4byte Unknown_081D7221 + .4byte Unknown_081D7286 + .4byte Unknown_081D7297 + .4byte Unknown_081D72AB + .4byte Unknown_081D72C5 + .4byte Unknown_081D72ED + .4byte Unknown_081D73B1 + .4byte Unknown_081D73C6 + .4byte Unknown_081D73D1 + .4byte Unknown_081D73F4 + .4byte Unknown_081D747D + .4byte Unknown_081D7488 + .4byte Unknown_081D7491 + .4byte Unknown_081D749C + .4byte Unknown_081D74E4 + .4byte Unknown_081D7515 + .4byte Unknown_081D7596 + .4byte Unknown_081D75AD + .4byte Unknown_081D75DC + .4byte Unknown_081D6F14 + .4byte Unknown_081D760D + .4byte Unknown_081D7625 + .4byte Unknown_081D7676 + .4byte Unknown_081D7689 + .4byte Unknown_081D76A6 + .4byte Unknown_081D76BF + .4byte Unknown_081D770C + .4byte Unknown_081D7717 + .4byte Unknown_081D7722 + .4byte Unknown_081D772D + .4byte Unknown_081D7738 + .4byte Unknown_081D6F14 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7743 + .4byte Unknown_081D7756 + .4byte Unknown_081D7761 + .4byte Unknown_081D776C + .4byte Unknown_081D6F14 + .4byte Unknown_081D7777 + .4byte Unknown_081D6F14 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7782 + .4byte Unknown_081D7795 + .4byte Unknown_081D77F6 + .4byte Unknown_081D7873 + .4byte Unknown_081D787E + .4byte Unknown_081D7889 + .4byte Unknown_081D7894 + .4byte Unknown_081D789F + .4byte Unknown_081D78AA + .4byte Unknown_081D6F14 + .4byte Unknown_081D78B5 + .4byte Unknown_081D78DD + .4byte Unknown_081D78E8 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7900 + .4byte Unknown_081D7943 + .4byte Unknown_081D7961 + .4byte Unknown_081D7988 + .4byte Unknown_081D79AE + .4byte Unknown_081D79C2 + .4byte Unknown_081D79E9 + .4byte Unknown_081D79FB + .4byte Unknown_081D7A17 + .4byte Unknown_081D7A2F + .4byte Unknown_081D7A47 + .4byte Unknown_081D7A5D + .4byte Unknown_081D7A79 + .4byte Unknown_081D7AB0 + .4byte Unknown_081D7AEA + .4byte Unknown_081D7AFF + .4byte Unknown_081D7B21 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7B40 + .4byte Unknown_081D7B82 + .4byte Unknown_081D7B93 + .4byte Unknown_081D7B99 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7BB5 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7BFA + .4byte Unknown_081D7CC1 + .4byte Unknown_081D7CCC + .4byte Unknown_081D7CF4 + .4byte Unknown_081D7D2E + .4byte Unknown_081D7D3B + .4byte Unknown_081D6F14 + .4byte Unknown_081D7DFD + .4byte Unknown_081D7E10 + .4byte Unknown_081D7E25 + .4byte Unknown_081D7E3D + .4byte Unknown_081D7E7E + .4byte Unknown_081D7DFD + .4byte Unknown_081D7E87 + .4byte Unknown_081D7EA2 + .4byte Unknown_081D7F00 + .4byte Unknown_081D7F1F + .4byte Unknown_081D7F3B + .4byte Unknown_081D7F49 + .4byte Unknown_081D7F3B + .4byte Unknown_081D7F55 + .4byte Unknown_081D7F5E + .4byte Unknown_081D7F69 + .4byte Unknown_081D7F7C + .4byte Unknown_081D6F14 + .4byte Unknown_081D7FA9 + .4byte Unknown_081D7FB4 + .4byte Unknown_081D6F14 + .4byte Unknown_081D7FE3 + .4byte Unknown_081D7FE3 + .4byte Unknown_081D7FE3 + .4byte Unknown_081D7FF0 + .4byte Unknown_081D7FF6 + .4byte Unknown_081D800E + .4byte Unknown_081D8017 + .4byte Unknown_081D8022 + .4byte Unknown_081D802D + .4byte Unknown_081D6F14 + .4byte Unknown_081D8038 + .4byte Unknown_081D805A + .4byte Unknown_081D806F + .4byte Unknown_081D8085 + .4byte Unknown_081D80D4 + .4byte Unknown_081D80F9 + .4byte Unknown_081D817D + .4byte Unknown_081D8194 + .4byte Unknown_081D81B3 + .4byte Unknown_081D81C9 + .4byte Unknown_081D821F + .4byte Unknown_081D8233 + .4byte Unknown_081D826E + .4byte Unknown_081D82C5 + .4byte Unknown_081D8370 + .4byte Unknown_081D8392 + .4byte Unknown_081D83C3 + .4byte Unknown_081D83FA + .4byte Unknown_081D841A + .4byte Unknown_081D842D + .4byte Unknown_081D846F + .4byte Unknown_081D6F14 + .4byte Unknown_081D848C + .4byte Unknown_081D8495 + .4byte Unknown_081D84B1 + .4byte Unknown_081D850F + .4byte Unknown_081D8583 + .4byte Unknown_081D8626 + .4byte Unknown_081D8640 + .4byte Unknown_081D8652 + .4byte Unknown_081D867C + .4byte Unknown_081D868D + .4byte Unknown_081D869A + .4byte Unknown_081D86AB + .4byte Unknown_081D86C7 + .4byte Unknown_081D86DC + .4byte Unknown_081D870A + .4byte Unknown_081D8726 + .4byte Unknown_081D8736 + .4byte Unknown_081D874D + .4byte Unknown_081D8762 + .4byte Unknown_081D876D + .4byte Unknown_081D8782 + .4byte Unknown_081D8797 + .4byte Unknown_081D879D + .4byte Unknown_081D87EE + .4byte Unknown_081D8847 + .4byte Unknown_081D8852 + .4byte Unknown_081D888D + .4byte Unknown_081D8893 + .4byte Unknown_081D88AF + .4byte Unknown_081D88C4 + .4byte Unknown_081D88DB + .4byte Unknown_081D88F0 + .4byte Unknown_081D8908 + .4byte Unknown_081D8918 + .4byte Unknown_081D891E + .4byte Unknown_081D8929 + .4byte Unknown_081D7069 + .4byte Unknown_081D89D7 + .4byte Unknown_081D89EE + .4byte Unknown_081D89F9 + .4byte Unknown_081D89FF + .4byte Unknown_081D8A0A + .4byte Unknown_081D8A91 + .4byte Unknown_081D8AF5 + .4byte Unknown_081D8B03 + .4byte Unknown_081D6FF0 + .4byte Unknown_081D89D7 + .4byte Unknown_081D8B67 + .4byte Unknown_081D8BDF + .4byte Unknown_081D8C43 +Unknown_081D6F14: + .incbin "baserom.gba", 0x001d6f14, 0x8 + .4byte Unknown_081D6F3A + .incbin "baserom.gba", 0x001d6f20, 0x7 + .4byte Unknown_081D6F3A + .incbin "baserom.gba", 0x001d6f2b, 0xF +Unknown_081D6F3A: + .2byte 0x100 + .4byte Unknown_081D6F72 + .incbin "baserom.gba", 0x001d6f40, 0x4 gUnknown_081D6F44:: @ 81D6F44 .incbin "baserom.gba", 0x001d6f44, 0x1e gUnknown_081D6F62:: @ 81D6F62 - .incbin "baserom.gba", 0x001d6f62, 0x12 + .incbin "baserom.gba", 0x001d6f62, 0x10 +Unknown_081D6F72: + .incbin "baserom.gba", 0x001d6f72, 0x2 gUnknown_081D6F74:: @ 81D6F74 - .incbin "baserom.gba", 0x001d6f74, 0x271 + .incbin "baserom.gba", 0x001d6f74, 0xD +Unknown_081D6F81: @ 81D6F81 + .incbin "baserom.gba", 0x001d6f81, 0x6F +Unknown_081D6FF0: @ 81D6FF0 + .incbin "baserom.gba", 0x001d6ff0, 0xB +Unknown_081D6FFB: @ 81D6FFB + .incbin "baserom.gba", 0x001d6ffb, 0x6E +Unknown_081D7069: @ 81D7069 + .incbin "baserom.gba", 0x001d7069, 0xB +Unknown_081D7074: @ 81D7074 + .incbin "baserom.gba", 0x001d7074, 0xB +Unknown_081D707F: @ 81D707F + .incbin "baserom.gba", 0x001d707f, 0xB +Unknown_081D708A: @ 81D708A + .incbin "baserom.gba", 0x001d708a, 0x80 +Unknown_081D710A: @ 81D710A + .incbin "baserom.gba", 0x001d710a, 0x69 +Unknown_081D7173: @ 81D7173 + .incbin "baserom.gba", 0x001d7173, 0x18 +Unknown_081D718B: @ 81D718B + .incbin "baserom.gba", 0x001d718b, 0xB +Unknown_081D7196: @ 81D7196 + .incbin "baserom.gba", 0x001d7196, 0xB +Unknown_081D71A1: @ 81D71A1 + .incbin "baserom.gba", 0x001d71a1, 0xB +Unknown_081D71AC: @ 81D71AC + .incbin "baserom.gba", 0x001d71ac, 0x39 gUnknown_081D71E5:: @ 81D71E5 - .incbin "baserom.gba", 0x001d71e5, 0x91 + .incbin "baserom.gba", 0x001d71e5, 0x10 +Unknown_081D71F5: @ 81D71F5 + .incbin "baserom.gba", 0x001d71f5, 0xB +Unknown_081D7200: @ 81D7200 + .incbin "baserom.gba", 0x001d7200, 0xB +Unknown_081D720B: @ 81D720B + .incbin "baserom.gba", 0x001d720b, 0xB +Unknown_081D7216: @ 81D7216 + .incbin "baserom.gba", 0x001d7216, 0xB +Unknown_081D7221: @ 81D7221 + .incbin "baserom.gba", 0x001d7221, 0x55 gUnknown_081D7276:: @ 81D7276 - .incbin "baserom.gba", 0x001d7276, 0x6e0 + .incbin "baserom.gba", 0x001d7276, 0x10 +Unknown_081D7286: @ 81D7286 + .incbin "baserom.gba", 0x001d7286, 0x11 +Unknown_081D7297: @ 81D7297 + .incbin "baserom.gba", 0x001d7297, 0x14 +Unknown_081D72AB: @ 81D72AB + .incbin "baserom.gba", 0x001d72ab, 0x1A +Unknown_081D72C5: @ 81D72C5 + .incbin "baserom.gba", 0x001d72c5, 0x28 +Unknown_081D72ED: @ 81D72ED + .incbin "baserom.gba", 0x001d72ed, 0xC4 +Unknown_081D73B1: @ 81D73B1 + .incbin "baserom.gba", 0x001d73b1, 0x15 +Unknown_081D73C6: @ 81D73C6 + .incbin "baserom.gba", 0x001d73c6, 0xB +Unknown_081D73D1: @ 81D73D1 + .incbin "baserom.gba", 0x001d73d1, 0x23 +Unknown_081D73F4: @ 81D73F4 + .incbin "baserom.gba", 0x001d73f4, 0x89 +Unknown_081D747D: @ 81D747D + .incbin "baserom.gba", 0x001d747d, 0xB +Unknown_081D7488: @ 81D7488 + .incbin "baserom.gba", 0x001d7488, 0x9 +Unknown_081D7491: @ 81D7491 + .incbin "baserom.gba", 0x001d7491, 0xB +Unknown_081D749C: @ 81D749C + .incbin "baserom.gba", 0x001d749c, 0x48 +Unknown_081D74E4: @ 81D74E4 + .incbin "baserom.gba", 0x001d74e4, 0x31 +Unknown_081D7515: @ 81D7515 + .incbin "baserom.gba", 0x001d7515, 0x81 +Unknown_081D7596: @ 81D7596 + .incbin "baserom.gba", 0x001d7596, 0x17 +Unknown_081D75AD: @ 81D75AD + .incbin "baserom.gba", 0x001d75ad, 0x2F +Unknown_081D75DC: @ 81D75DC + .incbin "baserom.gba", 0x001d75dc, 0x31 +Unknown_081D760D: @ 81D760D + .incbin "baserom.gba", 0x001d760d, 0x18 +Unknown_081D7625: @ 81D7625 + .incbin "baserom.gba", 0x001d7625, 0x51 +Unknown_081D7676: @ 81D7676 + .incbin "baserom.gba", 0x001d7676, 0x13 +Unknown_081D7689: @ 81D7689 + .incbin "baserom.gba", 0x001d7689, 0x1D +Unknown_081D76A6: @ 81D76A6 + .incbin "baserom.gba", 0x001d76a6, 0x19 +Unknown_081D76BF: @ 81D76BF + .incbin "baserom.gba", 0x001d76bf, 0x4D +Unknown_081D770C: @ 81D770C + .incbin "baserom.gba", 0x001d770c, 0xB +Unknown_081D7717: @ 81D7717 + .incbin "baserom.gba", 0x001d7717, 0xB +Unknown_081D7722: @ 81D7722 + .incbin "baserom.gba", 0x001d7722, 0xB +Unknown_081D772D: @ 81D772D + .incbin "baserom.gba", 0x001d772d, 0xB +Unknown_081D7738: @ 81D7738 + .incbin "baserom.gba", 0x001d7738, 0xB +Unknown_081D7743: @ 81D7743 + .incbin "baserom.gba", 0x001d7743, 0x13 +Unknown_081D7756: @ 81D7756 + .incbin "baserom.gba", 0x001d7756, 0xB +Unknown_081D7761: @ 81D7761 + .incbin "baserom.gba", 0x001d7761, 0xB +Unknown_081D776C: @ 81D776C + .incbin "baserom.gba", 0x001d776c, 0xB +Unknown_081D7777: @ 81D7777 + .incbin "baserom.gba", 0x001d7777, 0xB +Unknown_081D7782: @ 81D7782 + .incbin "baserom.gba", 0x001d7782, 0x13 +Unknown_081D7795: @ 81D7795 + .incbin "baserom.gba", 0x001d7795, 0x61 +Unknown_081D77F6: @ 81D77F6 + .incbin "baserom.gba", 0x001d77f6, 0x7D +Unknown_081D7873: @ 81D7873 + .incbin "baserom.gba", 0x001d7873, 0xB +Unknown_081D787E: @ 81D787E + .incbin "baserom.gba", 0x001d787e, 0xB +Unknown_081D7889: @ 81D7889 + .incbin "baserom.gba", 0x001d7889, 0xB +Unknown_081D7894: @ 81D7894 + .incbin "baserom.gba", 0x001d7894, 0xB +Unknown_081D789F: @ 81D789F + .incbin "baserom.gba", 0x001d789f, 0xB +Unknown_081D78AA: @ 81D78AA + .incbin "baserom.gba", 0x001d78aa, 0xB +Unknown_081D78B5: @ 81D78B5 + .incbin "baserom.gba", 0x001d78b5, 0x28 +Unknown_081D78DD: @ 81D78DD + .incbin "baserom.gba", 0x001d78dd, 0xB +Unknown_081D78E8: @ 81D78E8 + .incbin "baserom.gba", 0x001d78e8, 0x18 +Unknown_081D7900: @ 81D7900 + .incbin "baserom.gba", 0x001d7900, 0x43 +Unknown_081D7943: @ 81D7943 + .incbin "baserom.gba", 0x001d7943, 0x13 gUnknown_081D7956:: @ 81D7956 - .incbin "baserom.gba", 0x001d7956, 0xa45 + .incbin "baserom.gba", 0x001d7956, 0xB +Unknown_081D7961: @ 81D7961 + .incbin "baserom.gba", 0x001d7961, 0x27 +Unknown_081D7988: @ 81D7988 + .incbin "baserom.gba", 0x001d7988, 0x26 +Unknown_081D79AE: @ 81D79AE + .incbin "baserom.gba", 0x001d79ae, 0x14 +Unknown_081D79C2: @ 81D79C2 + .incbin "baserom.gba", 0x001d79c2, 0x27 +Unknown_081D79E9: @ 81D79E9 + .incbin "baserom.gba", 0x001d79e9, 0x12 +Unknown_081D79FB: @ 81D79FB + .incbin "baserom.gba", 0x001d79fb, 0x1C +Unknown_081D7A17: @ 81D7A17 + .incbin "baserom.gba", 0x001d7a17, 0x18 +Unknown_081D7A2F: @ 81D7A2F + .incbin "baserom.gba", 0x001d7a2f, 0x18 +Unknown_081D7A47: @ 81D7A47 + .incbin "baserom.gba", 0x001d7a47, 0x16 +Unknown_081D7A5D: @ 81D7A5D + .incbin "baserom.gba", 0x001d7a5d, 0x1C +Unknown_081D7A79: @ 81D7A79 + .incbin "baserom.gba", 0x001d7a79, 0x37 +Unknown_081D7AB0: @ 81D7AB0 + .incbin "baserom.gba", 0x001d7ab0, 0x3A +Unknown_081D7AEA: @ 81D7AEA + .incbin "baserom.gba", 0x001d7aea, 0x15 +Unknown_081D7AFF: @ 81D7AFF + .incbin "baserom.gba", 0x001d7aff, 0x22 +Unknown_081D7B21: @ 81D7B21 + .incbin "baserom.gba", 0x001d7b21, 0x1F +Unknown_081D7B40: @ 81D7B40 + .incbin "baserom.gba", 0x001d7b40, 0x42 +Unknown_081D7B82: @ 81D7B82 + .incbin "baserom.gba", 0x001d7b82, 0x11 +Unknown_081D7B93: @ 81D7B93 + .incbin "baserom.gba", 0x001d7b93, 0x6 +Unknown_081D7B99: @ 81D7B99 + .incbin "baserom.gba", 0x001d7b99, 0x1C +Unknown_081D7BB5: @ 81D7BB5 + .incbin "baserom.gba", 0x001d7bb5, 0x45 +Unknown_081D7BFA: @ 81D7BFA + .incbin "baserom.gba", 0x001d7bfa, 0xC7 +Unknown_081D7CC1: @ 81D7CC1 + .incbin "baserom.gba", 0x001d7cc1, 0xB +Unknown_081D7CCC: @ 81D7CCC + .incbin "baserom.gba", 0x001d7ccc, 0x28 +Unknown_081D7CF4: @ 81D7CF4 + .incbin "baserom.gba", 0x001d7cf4, 0x3A +Unknown_081D7D2E: @ 81D7D2E + .incbin "baserom.gba", 0x001d7d2e, 0xD +Unknown_081D7D3B: @ 81D7D3B + .incbin "baserom.gba", 0x001d7d3b, 0xC2 +Unknown_081D7DFD: @ 81D7DFD + .incbin "baserom.gba", 0x001d7dfd, 0x13 +Unknown_081D7E10: @ 81D7E10 + .incbin "baserom.gba", 0x001d7e10, 0x15 +Unknown_081D7E25: @ 81D7E25 + .incbin "baserom.gba", 0x001d7e25, 0x18 +Unknown_081D7E3D: @ 81D7E3D + .incbin "baserom.gba", 0x001d7e3d, 0x41 +Unknown_081D7E7E: @ 81D7E7E + .incbin "baserom.gba", 0x001d7e7e, 0x9 +Unknown_081D7E87: @ 81D7E87 + .incbin "baserom.gba", 0x001d7e87, 0x1B +Unknown_081D7EA2: @ 81D7EA2 + .incbin "baserom.gba", 0x001d7ea2, 0x5E +Unknown_081D7F00: @ 81D7F00 + .incbin "baserom.gba", 0x001d7f00, 0x1F +Unknown_081D7F1F: @ 81D7F1F + .incbin "baserom.gba", 0x001d7f1f, 0x1C +Unknown_081D7F3B: @ 81D7F3B + .incbin "baserom.gba", 0x001d7f3b, 0xE +Unknown_081D7F49: @ 81D7F49 + .incbin "baserom.gba", 0x001d7f49, 0xC +Unknown_081D7F55: @ 81D7F55 + .incbin "baserom.gba", 0x001d7f55, 0x9 +Unknown_081D7F5E: @ 81D7F5E + .incbin "baserom.gba", 0x001d7f5e, 0xB +Unknown_081D7F69: @ 81D7F69 + .incbin "baserom.gba", 0x001d7f69, 0x13 +Unknown_081D7F7C: @ 81D7F7C + .incbin "baserom.gba", 0x001d7f7c, 0x2D +Unknown_081D7FA9: @ 81D7FA9 + .incbin "baserom.gba", 0x001d7fa9, 0xB +Unknown_081D7FB4: @ 81D7FB4 + .incbin "baserom.gba", 0x001d7fb4, 0x2F +Unknown_081D7FE3: @ 81D7FE3 + .incbin "baserom.gba", 0x001d7fe3, 0xD +Unknown_081D7FF0: @ 81D7FF0 + .incbin "baserom.gba", 0x001d7ff0, 0x6 +Unknown_081D7FF6: @ 81D7FF6 + .incbin "baserom.gba", 0x001d7ff6, 0x18 +Unknown_081D800E: @ 81D800E + .incbin "baserom.gba", 0x001d800e, 0x9 +Unknown_081D8017: @ 81D8017 + .incbin "baserom.gba", 0x001d8017, 0xB +Unknown_081D8022: @ 81D8022 + .incbin "baserom.gba", 0x001d8022, 0xB +Unknown_081D802D: @ 81D802D + .incbin "baserom.gba", 0x001d802d, 0xB +Unknown_081D8038: @ 81D8038 + .incbin "baserom.gba", 0x001d8038, 0x22 +Unknown_081D805A: @ 81D805A + .incbin "baserom.gba", 0x001d805a, 0x15 +Unknown_081D806F: @ 81D806F + .incbin "baserom.gba", 0x001d806f, 0x16 +Unknown_081D8085: @ 81D8085 + .incbin "baserom.gba", 0x001d8085, 0x4F +Unknown_081D80D4: @ 81D80D4 + .incbin "baserom.gba", 0x001d80d4, 0x25 +Unknown_081D80F9: @ 81D80F9 + .incbin "baserom.gba", 0x001d80f9, 0x84 +Unknown_081D817D: @ 81D817D + .incbin "baserom.gba", 0x001d817d, 0x17 +Unknown_081D8194: @ 81D8194 + .incbin "baserom.gba", 0x001d8194, 0x1F +Unknown_081D81B3: @ 81D81B3 + .incbin "baserom.gba", 0x001d81b3, 0x16 +Unknown_081D81C9: @ 81D81C9 + .incbin "baserom.gba", 0x001d81c9, 0x56 +Unknown_081D821F: @ 81D821F + .incbin "baserom.gba", 0x001d821f, 0x14 +Unknown_081D8233: @ 81D8233 + .incbin "baserom.gba", 0x001d8233, 0x3B +Unknown_081D826E: @ 81D826E + .incbin "baserom.gba", 0x001d826e, 0x57 +Unknown_081D82C5: @ 81D82C5 + .incbin "baserom.gba", 0x001d82c5, 0xAB +Unknown_081D8370: @ 81D8370 + .incbin "baserom.gba", 0x001d8370, 0x22 +Unknown_081D8392: @ 81D8392 + .incbin "baserom.gba", 0x001d8392, 0x9 gUnknown_081D839B:: @ 81D839B .incbin "baserom.gba", 0x001d839b, 0x1a gUnknown_081D83B5:: @ 81D83B5 - .incbin "baserom.gba", 0x001d83b5, 0x21 + .incbin "baserom.gba", 0x001d83b5, 0xE +Unknown_081D83C3: + .incbin "baserom.gba", 0x001d83c3, 0x13 gUnknown_081D83D6:: @ 81D83D6 - .incbin "baserom.gba", 0x001d83d6, 0x882 + .incbin "baserom.gba", 0x001d83d6, 0x24 +Unknown_081D83FA: @ 81D83FA + .incbin "baserom.gba", 0x001d83fa, 0x20 +Unknown_081D841A: @ 81D841A + .incbin "baserom.gba", 0x001d841a, 0x13 +Unknown_081D842D: @ 81D842D + .incbin "baserom.gba", 0x001d842d, 0x42 +Unknown_081D846F: @ 81D846F + .incbin "baserom.gba", 0x001d846f, 0x1D +Unknown_081D848C: @ 81D848C + .incbin "baserom.gba", 0x001d848c, 0x9 +Unknown_081D8495: @ 81D8495 + .incbin "baserom.gba", 0x001d8495, 0x1C +Unknown_081D84B1: @ 81D84B1 + .incbin "baserom.gba", 0x001d84b1, 0x5E +Unknown_081D850F: @ 81D850F + .incbin "baserom.gba", 0x001d850f, 0x74 +Unknown_081D8583: @ 81D8583 + .incbin "baserom.gba", 0x001d8583, 0xA3 +Unknown_081D8626: @ 81D8626 + .incbin "baserom.gba", 0x001d8626, 0x1A +Unknown_081D8640: @ 81D8640 + .incbin "baserom.gba", 0x001d8640, 0x12 +Unknown_081D8652: @ 81D8652 + .incbin "baserom.gba", 0x001d8652, 0x2A +Unknown_081D867C: @ 81D867C + .incbin "baserom.gba", 0x001d867c, 0x11 +Unknown_081D868D: @ 81D868D + .incbin "baserom.gba", 0x001d868d, 0xD +Unknown_081D869A: @ 81D869A + .incbin "baserom.gba", 0x001d869a, 0x11 +Unknown_081D86AB: @ 81D86AB + .incbin "baserom.gba", 0x001d86ab, 0x1C +Unknown_081D86C7: @ 81D86C7 + .incbin "baserom.gba", 0x001d86c7, 0x15 +Unknown_081D86DC: @ 81D86DC + .incbin "baserom.gba", 0x001d86dc, 0x2E +Unknown_081D870A: @ 81D870A + .incbin "baserom.gba", 0x001d870a, 0x1C +Unknown_081D8726: @ 81D8726 + .incbin "baserom.gba", 0x001d8726, 0x10 +Unknown_081D8736: @ 81D8736 + .incbin "baserom.gba", 0x001d8736, 0x17 +Unknown_081D874D: @ 81D874D + .incbin "baserom.gba", 0x001d874d, 0x15 +Unknown_081D8762: @ 81D8762 + .incbin "baserom.gba", 0x001d8762, 0xB +Unknown_081D876D: @ 81D876D + .incbin "baserom.gba", 0x001d876d, 0x15 +Unknown_081D8782: @ 81D8782 + .incbin "baserom.gba", 0x001d8782, 0x15 +Unknown_081D8797: @ 81D8797 + .incbin "baserom.gba", 0x001d8797, 0x6 +Unknown_081D879D: @ 81D879D + .incbin "baserom.gba", 0x001d879d, 0x51 +Unknown_081D87EE: @ 81D87EE + .incbin "baserom.gba", 0x001d87ee, 0x59 +Unknown_081D8847: @ 81D8847 + .incbin "baserom.gba", 0x001d8847, 0xB +Unknown_081D8852: @ 81D8852 + .incbin "baserom.gba", 0x001d8852, 0x3B +Unknown_081D888D: @ 81D888D + .incbin "baserom.gba", 0x001d888d, 0x6 +Unknown_081D8893: @ 81D8893 + .incbin "baserom.gba", 0x001d8893, 0x1C +Unknown_081D88AF: @ 81D88AF + .incbin "baserom.gba", 0x001d88af, 0x15 +Unknown_081D88C4: @ 81D88C4 + .incbin "baserom.gba", 0x001d88c4, 0x17 +Unknown_081D88DB: @ 81D88DB + .incbin "baserom.gba", 0x001d88db, 0x15 +Unknown_081D88F0: @ 81D88F0 + .incbin "baserom.gba", 0x001d88f0, 0x18 +Unknown_081D8908: @ 81D8908 + .incbin "baserom.gba", 0x001d8908, 0x10 +Unknown_081D8918: @ 81D8918 + .incbin "baserom.gba", 0x001d8918, 0x6 +Unknown_081D891E: @ 81D891E + .incbin "baserom.gba", 0x001d891e, 0xB +Unknown_081D8929: @ 81D8929 + .incbin "baserom.gba", 0x001d8929, 0xAE +Unknown_081D89D7: @ 81D89D7 + .incbin "baserom.gba", 0x001d89d7, 0x17 +Unknown_081D89EE: @ 81D89EE + .incbin "baserom.gba", 0x001d89ee, 0xB +Unknown_081D89F9: @ 81D89F9 + .incbin "baserom.gba", 0x001d89f9, 0x6 +Unknown_081D89FF: @ 81D89FF + .incbin "baserom.gba", 0x001d89ff, 0xB +Unknown_081D8A0A: @ 81D8A0A + .incbin "baserom.gba", 0x001d8a0a, 0x87 +Unknown_081D8A91: @ 81D8A91 + .incbin "baserom.gba", 0x001d8a91, 0x64 +Unknown_081D8AF5: @ 81D8AF5 + .incbin "baserom.gba", 0x001d8af5, 0xE +Unknown_081D8B03: @ 81D8B03 + .incbin "baserom.gba", 0x001d8b03, 0x64 +Unknown_081D8B67: @ 81D8B67 + .incbin "baserom.gba", 0x001d8b67, 0x78 +Unknown_081D8BDF: @ 81D8BDF + .incbin "baserom.gba", 0x001d8bdf, 0x64 +Unknown_081D8C43: @ 81D8C43 + .incbin "baserom.gba", 0x001d8c43, 0x15 gUnknown_081D8C58:: @ 81D8C58 .incbin "baserom.gba", 0x001d8c58, 0xd @@ -553,7 +1146,6 @@ gUnknown_081D9B2D:: @ 81D9B2D .include "data/field_effect_scripts.s" .align 2 - gUnknown_081D9E48:: @ 81D9E48 .incbin "baserom.gba", 0x001d9e48, 0x34 diff --git a/data/data2.s b/data/data2.s index a6c665f1b..7d4a3ad9b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -825,7 +825,7 @@ gSpriteTemplate_81F958C:: @ 81F958C .align 2 gUnknown_081F95A4:: @ 81F95A4 - obj_tiles 0x08e5dc2c, 4096, 0x2710 + obj_tiles gUnknown_08E5DC2C, 4096, 0x2710 .align 2 gBattleTerrainTable:: @ 81F95AC @@ -929,7 +929,7 @@ gOamData_81F96F0:: @ 81F96F0 .2byte 0x2800 .align 2 - .incbin "baserom.gba", 0x1f96f8, 0x28 + .incbin "baserom.gba", 0x001f96f8, 0x28 @ 81F9720 .include "data/type_effectiveness.s" @@ -1541,7 +1541,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C .align 2 gUnknown_081FAF24:: @ 81FAF24 - obj_tiles 0x08E6A728, 128, 0xD759 + obj_tiles gUnknown_08E6A728, 128, 0xD759 .align 2 gOamData_81FAF2C:: @ 81FAF2C @@ -1871,10 +1871,11 @@ gSpriteTemplate_82087AC:: @ 82087AC gUnknown_082087C4:: @ 82087C4 .incbin "baserom.gba", 0x002087c4, 0x18 -@ 82087DC +gUnknown_082087DC:: .include "data/crc16_table.s" - .incbin "baserom.gba", 0x002089dc, 0x800 +gMiscBlank_Gfx:: + .incbin "graphics/interface/blank.4bpp" @ seems to be a placeholder gfx? @ 82091DC .include "data/egg_moves.s" @@ -1989,43 +1990,43 @@ gUnknown_0820A430:: @ 820A430 .align 2 gUnknown_0820A47C:: @ 820A47C - obj_tiles 0x08d1f52c, 4096, 0xd6ff + obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff .align 2 gUnknown_0820A484:: @ 820A484 - obj_tiles 0x08d1f7e0, 4096, 0xd701 + obj_tiles gBattleWindowSmallGfx, 4096, 0xd701 .align 2 gUnknown_0820A48C:: @ 820A48C - obj_tiles 0x08d1f96c, 2048, 0xd6ff + obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff .align 2 gUnknown_0820A494:: @ 820A494 - obj_tiles 0x08d1f96c, 2048, 0xd700 + obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700 .align 2 gUnknown_0820A49C:: @ 820A49C - obj_tiles 0x08d1fb04, 2048, 0xd701 + obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701 .align 2 gUnknown_0820A4A4:: @ 820A4A4 - obj_tiles 0x08d1fb04, 2048, 0xd702 + obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702 .align 2 gUnknown_0820A4AC:: @ 820A4AC - obj_tiles 0x08d1fc94, 4096, 0xd70b + obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b .align 2 gUnknown_0820A4B4:: @ 820A4B4 - obj_tiles 0x08d0314c, 256, 0xd704 - obj_tiles 0x08d0314c, 288, 0xd705 - obj_tiles 0x08d0314c, 256, 0xd706 - obj_tiles 0x08d0314c, 288, 0xd707 + obj_tiles gBlankGfxCompressed, 256, 0xd704 + obj_tiles gBlankGfxCompressed, 288, 0xd705 + obj_tiles gBlankGfxCompressed, 256, 0xd706 + obj_tiles gBlankGfxCompressed, 288, 0xd707 .align 2 gUnknown_0820A4D4:: @ 820A4D4 - obj_pal 0x08D1212C, 0xD6FF - obj_pal 0x08D1214C, 0xD704 + obj_pal gUnknown_08D1212C, 0xD6FF + obj_pal gUnknown_08D1214C, 0xD704 .align 2 gOamData_820A4E4:: @ 820A4E4 @@ -2076,7 +2077,7 @@ gSpriteTemplate_820A5B4:: @ 820A5B4 spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC .align 2 - .incbin "baserom.gba", 0x20a5cc, 0xb8 + .incbin "baserom.gba", 0x0020a5cc, 0xb8 gUnknown_0820A684:: @ 820A684 .incbin "baserom.gba", 0x0020a684, 0x60 @@ -2089,18 +2090,18 @@ gUnknown_0820A6EC:: @ 820A6EC .align 2 gUnknown_0820A754:: @ 820A754 - obj_tiles 0x08e6a758, 512, 0xd70c - obj_tiles 0x08e6a758, 512, 0xd70d + obj_tiles gUnknown_08E6A758, 512, 0xd70c + obj_tiles gUnknown_08E6A758, 512, 0xd70d .align 2 gUnknown_0820A764:: @ 820A764 - obj_pal 0x08d1212c, 0xd710 - obj_pal 0x08d1212c, 0xd711 + obj_pal gUnknown_08D1212C, 0xd710 + obj_pal gUnknown_08D1212C, 0xd711 .align 2 gUnknown_0820A774:: @ 820A774 - obj_pal 0x08d1214c, 0xd712 - obj_pal 0x08d1214c, 0xd713 + obj_pal gUnknown_08D1214C, 0xd712 + obj_pal gUnknown_08D1214C, 0xd713 gUnknown_0820A784:: @ 820A784 .incbin "baserom.gba", 0x0020a784, 0x18 @@ -2212,7 +2213,7 @@ gOamData_820A9EC:: @ 820A9EC .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x20a9f4, 0x20 + .incbin "baserom.gba", 0x0020a9f4, 0x20 .align 2 gSpriteAnim_820AA14:: @ 820AA14 @@ -2238,7 +2239,7 @@ gSpriteAnimTable_820AA34:: @ 820AA34 .4byte gSpriteAnim_820AA28 .align 2 - .incbin "baserom.gba", 0x20aa40, 0x10 + .incbin "baserom.gba", 0x0020aa40, 0x10 .align 2 gSpriteAffineAnim_820AA50:: @ 820AA50 @@ -2289,7 +2290,7 @@ gSpriteTemplate_820AAB4:: @ 820AAB4 spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 .align 2 - .incbin "baserom.gba", 0x20abd4, 0x1c + .incbin "baserom.gba", 0x0020abd4, 0x1c gUnknown_0820ABF0:: @ 820ABF0 .incbin "baserom.gba", 0x0020abf0, 0x1fe @@ -2351,7 +2352,8 @@ gSpriteAnimTable_820C024:: @ 820C024 .4byte gSpriteAnim_820C01C .align 2 - .incbin "baserom.gba", 0x20c03c, 0x40 +gUnknownPal_0820C03C:: + .incbin "baserom.gba", 0x0020c03c, 0x40 .align 2 gUnknown_0820C07C:: @ 820C07C @@ -2371,7 +2373,7 @@ gUnknown_0820C07C:: @ 820C07C .align 2 gUnknown_0820C0E4:: @ 820C0E4 - obj_pal 0x0820c03c, 0x133d + obj_pal gUnknownPal_0820C03C, 0x133d .align 2 gSpriteTemplate_820C0EC:: @ 820C0EC @@ -3347,7 +3349,7 @@ gUnknown_08304F18:: @ 8304F18 .4byte FallarborTown_ContestLobby_MapAttributes .4byte FallarborTown_ContestHall_MapAttributes .4byte LilycoveCity_House2_MapAttributes - .4byte 0x082cf564 + .4byte UnknownMapAttributes_082CF564 .4byte VerdanturfTown_WandasHouse_MapAttributes .4byte PacifidlogTown_House1_MapAttributes .4byte PacifidlogTown_House2_MapAttributes @@ -3355,8 +3357,8 @@ gUnknown_08304F18:: @ 8304F18 .4byte MossdeepCity_House4_MapAttributes .4byte SlateportCity_SternsShipyard_1F_MapAttributes .4byte SlateportCity_SternsShipyard_2F_MapAttributes - .4byte 0x082d05d8 - .4byte 0x082d05fc + .4byte UnknownMapAttributes_082D05D8 + .4byte UnknownMapAttributes_082D05FC .4byte SlateportCity_PokemonFanClub_MapAttributes .4byte SlateportCity_OceanicMuseum_1F_MapAttributes .4byte SlateportCity_OceanicMuseum_2F_MapAttributes @@ -3443,20 +3445,20 @@ gUnknown_08304F18:: @ 8304F18 .4byte ShoalCave_LowTideLowerRoom_MapAttributes .4byte ShoalCave_HighTideEntranceRoom_MapAttributes .4byte ShoalCave_HighTideInnerRoom_MapAttributes - .4byte 0x082e55c8 @ unused maps - .4byte 0x082e55ec - .4byte 0x082e5610 - .4byte 0x082e5634 - .4byte 0x082e5658 - .4byte 0x082e567c - .4byte 0x082e56a0 - .4byte 0x082e56c4 - .4byte 0x082e56e8 - .4byte 0x082e570c - .4byte 0x082e5730 - .4byte 0x082e5754 - .4byte 0x082e5778 - .4byte 0x082e579c + .4byte UnknownMapAttributes_082E55C8 @ unused maps + .4byte UnknownMapAttributes_082E55EC + .4byte UnknownMapAttributes_082E5610 + .4byte UnknownMapAttributes_082E5634 + .4byte UnknownMapAttributes_082E5658 + .4byte UnknownMapAttributes_082E567C + .4byte UnknownMapAttributes_082E56A0 + .4byte UnknownMapAttributes_082E56C4 + .4byte UnknownMapAttributes_082E56E8 + .4byte UnknownMapAttributes_082E570C + .4byte UnknownMapAttributes_082E5730 + .4byte UnknownMapAttributes_082E5754 + .4byte UnknownMapAttributes_082E5778 + .4byte UnknownMapAttributes_082E579C .4byte NewMauville_Entrance_MapAttributes .4byte NewMauville_Inside_MapAttributes .4byte AbandonedShip_Deck_MapAttributes @@ -3515,7 +3517,7 @@ gUnknown_08304F18:: @ 8304F18 .4byte SafariZone_Northeast_MapAttributes .4byte SafariZone_Southwest_MapAttributes .4byte SafariZone_Southeast_MapAttributes - .4byte 0x082edf30 + .4byte UnknownMapAttributes_082EDF30 .4byte Route109_SeashoreHouse_MapAttributes .4byte Route110_TrickHouseEntrance_MapAttributes .4byte Route110_TrickHouseEnd_MapAttributes @@ -3585,21 +3587,21 @@ gUnknown_08304F18:: @ 8304F18 .4byte SootopolisCity_House3_MapAttributes .4byte AbandonedShip_HiddenFloorRooms_MapAttributes .4byte ScorchedSlab_MapAttributes - .4byte 0x082ff894 + .4byte UnknownMapAttributes_082FF894 .4byte RustboroCity_Flat1_1F_MapAttributes .4byte RustboroCity_Flat1_2F_MapAttributes .4byte EverGrandeCity_Corridor4_MapAttributes .4byte MagmaHideout_1F_MapAttributes .4byte MagmaHideout_B1F_MapAttributes .4byte MagmaHideout_B2F_MapAttributes - .4byte 0x08302970 + .4byte UnknownMapAttributes_08302970 .4byte SkyPillar_Entrance_MapAttributes .4byte SkyPillar_Outside_MapAttributes .4byte SkyPillar_1F_MapAttributes .4byte SkyPillar_2F_MapAttributes .4byte SkyPillar_3F_MapAttributes .4byte SkyPillar_4F_MapAttributes - .4byte 0x083041b4 + .4byte UnknownMapAttributes_083041B4 .4byte MossdeepCity_StevensHouse_MapAttributes .4byte ShoalCave_LowTideIceRoom_MapAttributes .4byte SafariZone_RestHouse_MapAttributes @@ -7172,7 +7174,6 @@ gUnknown_08376180:: @ 8376180 .align 1 gUnknown_08376194:: @ 8376194 .2byte 16, 8, 6, 4, 2 - Unknown_837619E: .byte -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0 Unknown_83761AE: @@ -7254,9 +7255,9 @@ gUnknown_083762DC:: @ 83762DC .align 2 gUnknown_083762F0:: @ 83762F0 - .4byte 0x020231cc - .4byte 0x020232cc - .4byte 0x020233cc + .4byte gStringVar1 + .4byte gStringVar2 + .4byte gStringVar3 gUnknown_083762FC:: @ 83762FC .incbin "baserom.gba", 0x003762fc, 0x68 @@ -7305,7 +7306,7 @@ gSpriteImage_8376484:: @ 8376484 .incbin "graphics/unknown_sprites/83764AC/1.4bpp" .align 2 - .incbin "baserom.gba", 0x3764a4, 0x8 + .incbin "baserom.gba", 0x003764a4, 0x8 .align 2 gSpriteImageTable_83764AC:: @ 83764AC @@ -7343,15 +7344,80 @@ gSpriteTemplate_83764E8:: @ 83764E8 gUnknown_08376500:: @ 8376500 .incbin "baserom.gba", 0x00376500, 0x4 + .align 1 gUnknown_08376504:: @ 8376504 - .incbin "baserom.gba", 0x00376504, 0xd8 + .2byte MOVE_FOCUS_PUNCH + .2byte MOVE_DRAGON_CLAW + .2byte MOVE_WATER_PULSE + .2byte MOVE_CALM_MIND + .2byte MOVE_ROAR + .2byte MOVE_TOXIC + .2byte MOVE_HAIL + .2byte MOVE_BULK_UP + .2byte MOVE_BULLET_SEED + .2byte MOVE_HIDDEN_POWER + .2byte MOVE_SUNNY_DAY + .2byte MOVE_TAUNT + .2byte MOVE_ICE_BEAM + .2byte MOVE_BLIZZARD + .2byte MOVE_HYPER_BEAM + .2byte MOVE_LIGHT_SCREEN + .2byte MOVE_PROTECT + .2byte MOVE_RAIN_DANCE + .2byte MOVE_GIGA_DRAIN + .2byte MOVE_SAFEGUARD + .2byte MOVE_FRUSTRATION + .2byte MOVE_SOLAR_BEAM + .2byte MOVE_IRON_TAIL + .2byte MOVE_THUNDERBOLT + .2byte MOVE_THUNDER + .2byte MOVE_EARTHQUAKE + .2byte MOVE_RETURN + .2byte MOVE_DIG + .2byte MOVE_PSYCHIC + .2byte MOVE_SHADOW_BALL + .2byte MOVE_BRICK_BREAK + .2byte MOVE_DOUBLE_TEAM + .2byte MOVE_REFLECT + .2byte MOVE_SHOCK_WAVE + .2byte MOVE_FLAMETHROWER + .2byte MOVE_SLUDGE_BOMB + .2byte MOVE_SANDSTORM + .2byte MOVE_FIRE_BLAST + .2byte MOVE_ROCK_TOMB + .2byte MOVE_AERIAL_ACE + .2byte MOVE_TORMENT + .2byte MOVE_FACADE + .2byte MOVE_SECRET_POWER + .2byte MOVE_REST + .2byte MOVE_ATTRACT + .2byte MOVE_THIEF + .2byte MOVE_STEEL_WING + .2byte MOVE_SKILL_SWAP + .2byte MOVE_SNATCH + .2byte MOVE_OVERHEAT + .2byte MOVE_CUT + .2byte MOVE_FLY + .2byte MOVE_SURF + .2byte MOVE_STRENGTH + .2byte MOVE_FLASH + .2byte MOVE_ROCK_SMASH + .2byte MOVE_WATERFALL + .2byte MOVE_DIVE + + .4byte gTileBuffer @ unreferenced? +MenuGfx_HoldIcons: + .incbin "graphics/interface/hold_icons.4bpp" +MenuPal_HoldIcons: + .incbin "graphics/interface/hold_icons.gbapal" .align 2 gUnknown_083765DC:: @ 83765DC - obj_tiles 0x0837657c, 64, 0xd750 + obj_tiles MenuGfx_HoldIcons, 64, 0xd750 + .align 2 gUnknown_083765E4:: @ 83765E4 - .incbin "baserom.gba", 0x003765e4, 0x8 + obj_pal MenuPal_HoldIcons, 0xd750 .align 2 gOamData_83765EC:: @ 83765EC @@ -7403,7 +7469,7 @@ gUnknown_08376624:: @ 8376624 .4byte OtherText_TeachWhichPoke gUnknown_08376678:: @ 8376678 - .incbin "baserom.gba", 0x00376678, 0xc0 + .incbin "baserom.gba", 0x00376678, 0xc0 @ 4 byte array? gUnknown_08376738:: @ 8376738 .incbin "baserom.gba", 0x00376738, 0x120 @@ -7436,16 +7502,54 @@ gUnknown_08376A25:: @ 8376A25 .incbin "baserom.gba", 0x00376a25, 0x39 gUnknown_08376A5E:: @ 8376A5E - .incbin "baserom.gba", 0x00376a5e, 0xf6 + .incbin "baserom.gba", 0x00376a5e, 0xf3 + .align 2 gUnknown_08376B54:: @ 8376B54 - .incbin "baserom.gba", 0x00376b54, 0x60 + .4byte ether_effect_related_2 + .4byte sub_80704F0 +Unknown_08376B5C: + .incbin "baserom.gba", 0x00376b5c, 0x2c +Unknown_08376B88: + .incbin "baserom.gba", 0x00376b88, 0x2c + .align 2 gUnknown_08376BB4:: @ 8376BB4 - .incbin "baserom.gba", 0x00376bb4, 0xc0 + .4byte 0x401, Unknown_08376B5C + .4byte 0x10C, Unknown_08376B88 + .4byte 0x40C, Unknown_08376B88 + .4byte 0x70C, Unknown_08376B88 + .4byte 0xA0C, Unknown_08376B88 + .4byte 0xD0C, Unknown_08376B88 + .4byte 0x201, Unknown_08376B5C + .4byte 0x901, Unknown_08376B5C + .4byte 0x10C, Unknown_08376B88 + .4byte 0x50C, Unknown_08376B88 + .4byte 0x90C, Unknown_08376B88 + .4byte 0xD0C, Unknown_08376B88 + .4byte 0x201, Unknown_08376B5C + .4byte 0x901, Unknown_08376B5C + .4byte 0x20C, Unknown_08376B88 + .4byte 0x50C, Unknown_08376B88 + .4byte 0x90C, Unknown_08376B88 + .4byte 0xC0C, Unknown_08376B88 + .4byte 0x201, Unknown_08376B5C + .4byte 0x20C, Unknown_08376B88 + .4byte 0x50C, Unknown_08376B88 + .4byte 0x901, Unknown_08376B5C + .4byte 0x90C, Unknown_08376B88 + .4byte 0xC0C, Unknown_08376B88 + .align 2 gUnknown_08376C74:: @ 8376C74 - .incbin "baserom.gba", 0x00376c74, 0x60 + .4byte sub_8089CD4, sub_806AFD0, 0 + .4byte sub_8095118, sub_8094E58, 0 + .4byte sub_80F9C6C, sub_80F9ACC, 0 + .4byte sub_80F9C6C, sub_806AFD0, 0 + .4byte sub_81222B0, sub_8121E78, 0 + .4byte sub_8122A48, sub_8122854, 0xFF + .4byte sub_8122E0C, sub_806AFD0, 0x0F + .4byte sub_80F9E64, sub_80F9CE8, 0 gUnknown_08376CD4:: @ 8376CD4 .incbin "baserom.gba", 0x00376cd4, 0x18 @@ -8148,7 +8252,16 @@ gOamData_837DF3C:: @ 837DF3C .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37df44, 0x10 +gOamData_837DF44:: @ 837DF44 + .2byte 0x4000 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837DF4C:: @ 837DF4C + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837DF54:: @ 837DF54 @@ -8169,7 +8282,10 @@ gOamData_837DF64:: @ 837DF64 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37df6c, 0x8 +gOamData_837DF6C:: @ 837DF6C + .2byte 0x8000 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837DF74:: @ 837DF74 @@ -8208,7 +8324,22 @@ gOamData_837DF9C:: @ 837DF9C .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37dfa4, 0x18 +gOamData_837DFA4:: @ 837DFA4 + .2byte 0x4100 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837DFAC:: @ 837DFAC + .2byte 0x4100 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_837DFB4:: @ 837DFB4 + .2byte 0x4100 + .2byte 0x8000 + .2byte 0x0800 .align 2 gOamData_837DFBC:: @ 837DFBC @@ -8217,7 +8348,22 @@ gOamData_837DFBC:: @ 837DFBC .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37dfc4, 0x18 +gOamData_837DFC4:: @ 837DFC4 + .2byte 0x8100 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837DFCC:: @ 837DFCC + .2byte 0x8100 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_837DFD4:: @ 837DFD4 + .2byte 0x8100 + .2byte 0x8000 + .2byte 0x0800 .align 2 gOamData_837DFDC:: @ 837DFDC @@ -8250,7 +8396,16 @@ gOamData_837DFFC:: @ 837DFFC .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e004, 0x10 +gOamData_837D004:: @ 837D004 + .2byte 0x4300 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837D00C:: @ 837D00C + .2byte 0x4300 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837E014:: @ 837E014 @@ -8259,7 +8414,10 @@ gOamData_837E014:: @ 837E014 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e01c, 0x8 +gOamData_837E01C:: @ 837E01C + .2byte 0x4300 + .2byte 0xC000 + .2byte 0x0800 .align 2 gOamData_837E024:: @ 837E024 @@ -8268,7 +8426,10 @@ gOamData_837E024:: @ 837E024 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e02c, 0x8 +gOamData_837E02C:: @ 837E02C + .2byte 0x8300 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837E034:: @ 837E034 @@ -8307,7 +8468,16 @@ gOamData_837E05C:: @ 837E05C .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e064, 0x10 +gOamData_837E064:: @ 837E064 + .2byte 0x4400 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837E06C:: @ 837E06C + .2byte 0x4400 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837E074:: @ 837E074 @@ -8328,7 +8498,10 @@ gOamData_837E084:: @ 837E084 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e08c, 0x8 +gOamData_837E08C:: @ 837E08C + .2byte 0x8400 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837E094:: @ 837E094 @@ -8337,7 +8510,10 @@ gOamData_837E094:: @ 837E094 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e09c, 0x8 +gOamData_837E09C:: @ 837E09C + .2byte 0x8400 + .2byte 0xC000 + .2byte 0x0800 .align 2 gOamData_837E0A4:: @ 837E0A4 @@ -8364,7 +8540,28 @@ gOamData_837E0BC:: @ 837E0BC .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e0c4, 0x20 +gOamData_837E0C4:: @ 837E0C4 + .2byte 0x4500 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837E0CC:: @ 837E0CC + .2byte 0x4500 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_837E0D4:: @ 837E0D4 + .2byte 0x4500 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_837E0DC:: @ 837E0DC + .2byte 0x4500 + .2byte 0xC000 + .2byte 0x0800 .align 2 gOamData_837E0E4:: @ 837E0E4 @@ -8373,7 +8570,16 @@ gOamData_837E0E4:: @ 837E0E4 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e0ec, 0x10 +gOamData_837E0EC:: @ 837E0EC + .2byte 0x8500 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_837E0F4:: @ 837E0F4 + .2byte 0x8500 + .2byte 0x8000 + .2byte 0x0800 .align 2 gOamData_837E0FC:: @ 837E0FC @@ -8406,7 +8612,16 @@ gOamData_837E11C:: @ 837E11C .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e124, 0x10 +gOamData_837E124:: @ 837E124 + .2byte 0x4700 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gOamData_837E12C:: @ 837E12C + .2byte 0x4700 + .2byte 0x4000 + .2byte 0x0800 .align 2 gOamData_837E134:: @ 837E134 @@ -8427,7 +8642,22 @@ gOamData_837E144:: @ 837E144 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x37e14c, 0x18 +gOamData_837E14C:: @ 837E14C + .2byte 0x8700 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_837E154:: @ 837E154 + .2byte 0x8700 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_837E15C:: @ 837E15C + .2byte 0x8700 + .2byte 0xC000 + .2byte 0x0800 .align 2 gBattleAnimPicTable:: @ 837E164 @@ -9116,8 +9346,8 @@ gSpriteTemplate_837F5C8:: @ 837F5C8 .align 2 gUnknown_0837F5E0:: @ 837F5E0 - obj_tiles 0x082089dc, 2048, 0xd755 - obj_tiles 0x082089dc, 2048, 0xd756 + obj_tiles gMiscBlank_Gfx, 2048, 0xd755 + obj_tiles gMiscBlank_Gfx, 2048, 0xd756 .include "data/maps/events/PetalburgCity.s" .include "data/maps/events/SlateportCity.s" @@ -9632,10 +9862,12 @@ gSpriteTemplate_8393188:: @ 8393188 spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544 .align 2 - .incbin "baserom.gba", 0x3931a0, 0x38 + .incbin "baserom.gba", 0x003931a0, 0x18 +Unknown_083931B8: + .incbin "baserom.gba", 0x003931b8, 0x20 gUnknown_083931D8:: @ 83931D8 - .incbin "baserom.gba", 0x003931d8, 0x8 + .4byte 4, Unknown_083931B8 .align 2 gSpriteTemplate_83931E0:: @ 83931E0 @@ -9851,7 +10083,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - .incbin "baserom.gba", 0x00396fc0, 0x4 + .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000? .align 2 gUnknown_08396FC4:: @ 8396FC4 @@ -10110,7 +10342,7 @@ gSpriteTemplate_839AB04:: @ 839AB04 spr_template 0xFFFF, 4608, gOamData_839AAD4, gSpriteAnimTable_839AAFC, gSpriteImageTable_839AADC, gDummySpriteAffineAnimTable, sub_807ED48 .align 2 - .incbin "baserom.gba", 0x39ab1c, 0x10 + .incbin "baserom.gba", 0x0039ab1c, 0x10 .align 2 gOamData_839AB2C:: @ 839AB2C @@ -10400,8 +10632,12 @@ gUnknown_0839B498:: @ 839B498 .4byte sub_8084654 .4byte sub_80846C8 + .align 2 gUnknown_0839B4C8:: @ 839B4C8 - .incbin "baserom.gba", 0x0039b4c8, 0x10 + .4byte sub_80845C8 + .4byte sub_80845FC + .4byte sub_8084654 + .4byte sub_80846C8 .align 2 gOamData_839B4D8:: @ 839B4D8 @@ -10586,7 +10822,7 @@ gSpriteImageTable_839F178:: @ 839F178 obj_frame_tiles gSpriteImage_839E7F4, 0x200 .align 2 - .incbin "baserom.gba", 0x39f180, 0x20 + .incbin "baserom.gba", 0x0039f180, 0x20 gUnknown_0839F1A0:: @ 839F1A0 .incbin "baserom.gba", 0x0039f1a0, 0x28 @@ -10796,7 +11032,6 @@ gUnknown_0839F3E4:: @ 839F3E4 .align 2 gUnknown_0839F3F8:: @ 839F3F8 -Unknown_839F3F8: .4byte sub_8088CA0 .4byte sub_8088CF8 .4byte sub_8088D3C @@ -11103,18 +11338,23 @@ gSpriteTemplate_83A059C:: @ 83A059C gSpriteTemplate_83A05B4:: @ 83A05B4 spr_template 4096, 4096, gOamData_83A042C, gSpriteAnimTable_83A0520, NULL, gDummySpriteAffineAnimTable, sub_808F168 + .align 2 gUnknown_083A05CC:: @ 83A05CC - .incbin "baserom.gba", 0x003a05cc, 0x10 - + obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000 + null_obj_tiles + + .align 2 gUnknown_083A05DC:: @ 83A05DC - .incbin "baserom.gba", 0x003a05dc, 0x10 - + obj_pal gUnknown_08E87AF4, 0x1000 + null_obj_pal + gUnknown_083A05EC:: @ 83A05EC - .incbin "baserom.gba", 0x003a05ec, 0x5 + .byte 2, 4, 8, 16, 32 gUnknown_083A05F1:: @ 83A05F1 - .incbin "baserom.gba", 0x003a05f1, 0x7 - + .byte 16, 8, 4, 2, 1 + + .align 2 gUnknown_083A05F8:: @ 83A05F8 .string "$" @@ -11299,14 +11539,10 @@ gUnknown_083B5FF4:: @ 83B5FF4 .align 2 gUnknown_083B600C:: @ 83B600C - .4byte PCText_WithdrawPoke - .4byte PCText_MovePokeToParty - .4byte PCText_DepositPoke - .4byte PCText_StorePokeInBox - .4byte PCText_MovePoke - .4byte PCText_OrganizeBoxesParty - .4byte PCText_SeeYa - .4byte PCText_ReturnToPrevMenu + .4byte PCText_WithdrawPoke, PCText_MovePokeToParty + .4byte PCText_DepositPoke, PCText_StorePokeInBox + .4byte PCText_MovePoke, PCText_OrganizeBoxesParty + .4byte PCText_SeeYa, PCText_ReturnToPrevMenu .align 2 gSpriteAnim_83B602C:: @ 83B602C @@ -11392,7 +11628,7 @@ gUnknown_083B6DB4:: @ 83B6DB4 .align 2 gUnknown_083B6DB8:: @ 83B6DB8 - .4byte 0x02039360 + .4byte gTileBuffer .align 2 gWaveformSpritePalette:: @ 83B6DBC @@ -11499,11 +11735,11 @@ gOamData_83B6F2C:: @ 83B6F2C .align 2 Unknown_83B6F34: @ 83B6F34 - .incbin "baserom.gba", 0x3b6f34, 0x10 + .incbin "baserom.gba", 0x003b6f34, 0x10 .align 2 Unknown_83B6F44: @ 83B6F44 - .incbin "baserom.gba", 0x3b6f44, 0x18 + .incbin "baserom.gba", 0x003b6f44, 0x18 .align 2 gUnknown_083B6F5C:: @ 83B6F5C @@ -11839,15 +12075,18 @@ gWallpaperTable:: @ 83BB0E8 .4byte gWallpaperTilemap_Plain .4byte gWallpaperPalettes_Plain +PCPal_Arrow: .incbin "graphics/pokemon_storage/arrow.gbapal" +PCGfx_Arrow: .incbin "graphics/pokemon_storage/arrow.4bpp" .align 2 gUnknown_083BB288:: @ 83BB288 - obj_tiles 0x083bb208, 128, 0x0006 + obj_tiles PCGfx_Arrow, 128, 0x0006 + .align 2 gUnknown_083BB290:: @ 83BB290 - .incbin "baserom.gba", 0x003bb290, 0x8 + obj_pal PCPal_Arrow, 0xDACF .align 2 gOamData_83BB298:: @ 83BB298 @@ -12034,21 +12273,20 @@ gUnknown_083BBCA0:: @ 83BBCA0 .include "data/graphics/pokemon/icon_palette_table.s" gUnknown_083BC5E8:: @ 83BC5E8 - .incbin "baserom.gba", 0x3BC5E8, 0x8 + .incbin "baserom.gba", 0x003BC5E8, 0x8 Unknown_83BC5F0: - .incbin "baserom.gba", 0x3BC5F0, 0xC + .incbin "baserom.gba", 0x003BC5F0, 0xC Unknown_83BC5FC: - .incbin "baserom.gba", 0x3BC5FC, 0xC + .incbin "baserom.gba", 0x003BC5FC, 0xC Unknown_83BC608: - .incbin "baserom.gba", 0x3BC608, 0xC + .incbin "baserom.gba", 0x003BC608, 0xC Unknown_83BC614: - .incbin "baserom.gba", 0x3BC614, 0xC + .incbin "baserom.gba", 0x003BC614, 0xC Unknown_83BC620: - .incbin "baserom.gba", 0x3BC620, 0xC + .incbin "baserom.gba", 0x003BC620, 0xC .align 2 gUnknown_083BC62C:: @ 83BC62C -Unknown_83BC62C: .4byte Unknown_83BC5F0 .4byte Unknown_83BC5FC .4byte Unknown_83BC608 @@ -12225,7 +12463,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C .align 2 gUnknown_083C11B8:: @ 83C11B8 - obj_tiles 0x08e71d10, 5888, 0x7532 + obj_tiles gUnknown_08E71D10, 5888, 0x7532 .align 2 gSpriteTemplate_83C11C0:: @ 83C11C0 @@ -12305,11 +12543,11 @@ gSpriteAnimTable_83C1248:: @ 83C1248 .align 2 gUnknown_083C1270:: @ 83C1270 - obj_tiles 0x08e7274c, 1024, 0x7530 + obj_tiles gMenuSummaryGfx, 1024, 0x7530 .align 2 gUnknown_083C1278:: @ 83C1278 - obj_pal 0x08e72848, 0x7530 + obj_pal gMenuSummaryPal, 0x7530 .align 2 gSpriteTemplate_83C1280:: @ 83C1280 @@ -12368,11 +12606,11 @@ gSpriteAnimTable_83C12D8:: @ 83C12D8 .align 2 gUnknown_083C12F4:: @ 83C12F4 - obj_tiles 0x08e72860, 896, 0x7531 + obj_tiles gStatusGfx_Icons, 896, 0x7531 .align 2 gUnknown_083C12FC:: @ 83C12FC - obj_pal 0x08e72a50, 0x7531 + obj_pal gStatusPal_Icons, 0x7531 .align 2 gSpriteTemplate_83C1304:: @ 83C1304 @@ -12568,7 +12806,7 @@ gSpriteAnimTable_83C1C84:: @ 83C1C84 .4byte gSpriteAnim_83C1C7C .align 2 - .incbin "baserom.gba", 0x3c1c98, 0x4 + .incbin "baserom.gba", 0x003c1c98, 0x4 .align 2 gSpriteAffineAnim_83C1C9C:: @ 83C1C9C @@ -12653,7 +12891,7 @@ gSpriteAnimTable_83C1D68:: @ 83C1D68 .4byte gSpriteAnim_83C1D60 .align 2 - .incbin "baserom.gba", 0x3c1d6c, 0x8 + .incbin "baserom.gba", 0x003c1d6c, 0x8 .align 2 gSpriteTemplate_83C1D74:: @ 83C1D74 @@ -12693,10 +12931,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04 .align 2 gUnknown_083C1F74:: @ 83C1F74 - obj_tiles 0x08e78bb4, 2048, 0x2710 + obj_tiles gUnknown_08E78BB4, 2048, 0x2710 + .align 2 gUnknown_083C1F7C:: @ 83C1F7C - .incbin "baserom.gba", 0x003c1f7c, 0x8 + obj_pal gUnknown_08E7883C, 0x2710 .align 2 gOamData_83C1F84:: @ 83C1F84 @@ -12782,7 +13021,13 @@ gUnknown_083C91F0:: @ 83C91F0 .4byte Unknown_83C91D6, sub_80AB02C gUnknown_083C9228:: @ 83C9228 - .incbin "baserom.gba", 0x003c9228, 0x46 + .incbin "baserom.gba", 0x003c9228, 0x5 +Unknown_083C922D: + .incbin "graphics/unknown/ball.4bpp" + + .align 1 +Unknown_083C924E: + .incbin "graphics/unknown/ball.gbapal" gUnknown_083C926E:: @ 83C926E .incbin "baserom.gba", 0x003c926e, 0x8 @@ -12804,10 +13049,11 @@ gUnknown_083C92A8:: @ 83C92A8 .align 2 gUnknown_083C92B4:: @ 83C92B4 - obj_tiles 0x083c922d, 32, 0x04b0 + obj_tiles Unknown_083C922D, 32, 0x04b0 + .align 2 gUnknown_083C92BC:: @ 83C92BC - .incbin "baserom.gba", 0x003c92bc, 0x8 + obj_pal Unknown_083C924E, 0x04B0 .align 2 gOamData_83C92C4:: @ 83C92C4 @@ -12850,17 +13096,17 @@ gUnknown_083C933B:: @ 83C933B .incbin "baserom.gba", 0x003c933b, 0x29 gUnknown_083C9364:: @ 83C9364 - .incbin "baserom.gba", 0x3C9364, 0x18 + .incbin "baserom.gba", 0x003C9364, 0x18 Unknown_83C937C: - .incbin "baserom.gba", 0x3C937C, 0xB + .incbin "baserom.gba", 0x003C937C, 0xB Unknown_83C9387: - .incbin "baserom.gba", 0x3C9387, 0xB + .incbin "baserom.gba", 0x003C9387, 0xB Unknown_83C9392: - .incbin "baserom.gba", 0x3C9392, 0xB + .incbin "baserom.gba", 0x003C9392, 0xB Unknown_83C939D: - .incbin "baserom.gba", 0x3C939D, 0xB + .incbin "baserom.gba", 0x003C939D, 0xB Unknown_83C93A8: - .incbin "baserom.gba", 0x3C93A8, 0xC + .incbin "baserom.gba", 0x003C93A8, 0xC .align 2 gUnknown_083C93B4:: @ 83C93B4 @@ -12955,13 +13201,14 @@ gSpriteTemplate_83CA3AC:: @ 83CA3AC .align 2 gUnknown_083CA3C4:: @ 83CA3C4 - obj_tiles 0x08e69404, 256, 0x4e26 - obj_tiles 0x08e69404, 256, 0x4e27 - obj_tiles 0x08e69404, 256, 0x4e28 - obj_tiles 0x08e69404, 256, 0x4e29 + obj_tiles gContestNextTurnGfx, 256, 0x4e26 + obj_tiles gContestNextTurnGfx, 256, 0x4e27 + obj_tiles gContestNextTurnGfx, 256, 0x4e28 + obj_tiles gContestNextTurnGfx, 256, 0x4e29 + .align 2 gUnknown_083CA3E4:: @ 83CA3E4 - .incbin "baserom.gba", 0x003ca3e4, 0x8 + obj_pal gContestPal, 0x4E26 .align 2 gOamData_83CA3EC:: @ 83CA3EC @@ -12986,17 +13233,18 @@ gSpriteTemplate_83CA43C:: @ 83CA43C spr_template 20009, 20006, gOamData_83CA3EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 - .incbin "baserom.gba", 0x3ca454, 0x10 + .incbin "baserom.gba", 0x003ca454, 0x10 gUnknown_083CA464:: @ 83CA464 .incbin "baserom.gba", 0x003ca464, 0x8 .align 2 gUnknown_083CA46C:: @ 83CA46C - obj_tiles 0x08e69648, 1024, 0xabe2 + obj_tiles gContestApplauseGfx, 1024, 0xabe2 + .align 2 gUnknown_083CA474:: @ 83CA474 - .incbin "baserom.gba", 0x003ca474, 0x8 + obj_pal gContestPal, 0xABE2 .align 2 gOamData_83CA47C:: @ 83CA47C @@ -13020,15 +13268,15 @@ gSpriteTemplate_83CA4A4:: @ 83CA4A4 .align 2 gUnknown_083CA4BC:: @ 83CA4BC - obj_tiles 0x08d1c748, 2048, 0x4e25 + obj_tiles gContestJudgeGfx, 2048, 0x4e25 .align 2 gUnknown_083CA4C4:: @ 83CA4C4 - obj_tiles 0x08d19590, 896, 0xabe0 + obj_tiles gContestJudgeSymbolsGfx, 896, 0xabe0 .align 2 gUnknown_083CA4CC:: @ 83CA4CC - obj_pal 0x08d19734, 0xabe0 + obj_pal gContest3Pal, 0xabe0 .include "data/text/contest_strings.s" @@ -13055,10 +13303,14 @@ UnknownText_UnknownFormatting3: .align 2 gUnknown_083CC3AC:: @ 83CC3AC - obj_tiles 0x08d16024, 512, 0x4e20 + obj_tiles gContestNumbers_UnusedGfx, 512, 0x4e20 + .align 2 gUnknown_083CC3B4:: @ 83CC3B4 - .incbin "baserom.gba", 0x003cc3b4, 0x20 + obj_pal gContestNumbers_UnusedPal, 0x4E20 + obj_pal gContestNumbers_UnusedPal, 0x4E21 + obj_pal gContestNumbers_UnusedPal, 0x4E22 + obj_pal gContestNumbers_UnusedPal, 0x4E23 .align 2 gSpriteAnim_83CC3D4:: @ 83CC3D4 @@ -13110,7 +13362,7 @@ gSpriteAffineAnimTable_83CC43C:: @ 83CC43C .4byte gSpriteAffineAnim_83CC424 .align 2 - .incbin "baserom.gba", 0x3cc448, 0x4 + .incbin "baserom.gba", 0x003cc448, 0x4 .align 2 gOamData_83CC44C:: @ 83CC44C @@ -13136,10 +13388,10 @@ gSpriteTemplate_83CC49C:: @ 83CC49C .align 2 gUnknown_083CC4B4:: @ 83CC4B4 - obj_tiles 0x08d0314c, 4096, 0x80e8 - obj_tiles 0x08d0314c, 4096, 0x80e9 - obj_tiles 0x08d0314c, 4096, 0x80ea - obj_tiles 0x08d0314c, 4096, 0x80eb + obj_tiles gBlankGfxCompressed, 4096, 0x80e8 + obj_tiles gBlankGfxCompressed, 4096, 0x80e9 + obj_tiles gBlankGfxCompressed, 4096, 0x80ea + obj_tiles gBlankGfxCompressed, 4096, 0x80eb gUnknown_083CC4D4:: @ 83CC4D4 .incbin "baserom.gba", 0x003cc4d4, 0x20 @@ -13265,7 +13517,7 @@ gSpriteImage_83CE154:: @ 83CE154 .incbin "graphics/unknown_sprites/83CE588/1.4bpp" .align 2 - .incbin "baserom.gba", 0x3ce214, 0x4 + .incbin "baserom.gba", 0x003ce214, 0x4 .align 2 gUnknown_083CE218:: @ 83CE218 @@ -13591,11 +13843,11 @@ gSpriteTemplate_83CF56C:: @ 83CF56C .align 2 gUnknown_083CF584:: @ 83CF584 - obj_tiles 0x08e77a5c, 256, 0x2722 + obj_tiles gMenuMoneyGfx, 256, 0x2722 .align 2 gUnknown_083CF58C:: @ 83CF58C - obj_pal 0x08e77900, 0x2722 + obj_pal gMenuMoneyPal, 0x2722 @ 83CF594 .include "data/contest_moves.s" @@ -13801,9 +14053,9 @@ gUnknown_083D1454:: @ 83D1454 .align 2 gUnknown_083D1464:: @ 83D1464 - .4byte 0x020231cc - .4byte 0x020232cc - .4byte 0x020233cc + .4byte gStringVar1 + .4byte gStringVar2 + .4byte gStringVar3 .align 2 gUnknown_083D1470:: @ 83D1470 @@ -13953,6 +14205,7 @@ gUnknown_083D1600:: @ 83D1600 .4byte UnknownString_81ACF49 .4byte UnknownString_81AD00A + .align 2 gUnknown_083D1624:: @ 83D1624 .incbin "baserom.gba", 0x003d1624, 0x20 @@ -13960,7 +14213,11 @@ gUnknown_083D1644:: @ 83D1644 .incbin "baserom.gba", 0x003d1644, 0xa0 gUnknown_083D16E4:: @ 83D16E4 - .incbin "baserom.gba", 0x003d16e4, 0x60 + .incbin "baserom.gba", 0x003d16e4, 0x40 + + .align 2 +gMiscBlank_Pal:: + .incbin "graphics/interface/blank.gbapal" .align 2 gOamData_83D1744:: @ 83D1744 @@ -13974,17 +14231,18 @@ gSpriteTemplate_83D174C:: @ 83D174C .align 2 gUnknown_083D1764:: @ 83D1764 - obj_tiles 0x082089dc, 1024, 0x0bc1 - obj_tiles 0x082089dc, 1024, 0x0bc2 - obj_tiles 0x082089dc, 1024, 0x0bc3 - obj_tiles 0x082089dc, 1024, 0x0bc4 - obj_tiles 0x082089dc, 1024, 0x0bc5 - obj_tiles 0x082089dc, 1024, 0x0bc6 - obj_tiles 0x082089dc, 1024, 0x0bc7 - obj_tiles 0x082089dc, 1024, 0x0bc8 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc1 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc2 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc3 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc4 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc5 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc6 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc7 + obj_tiles gMiscBlank_Gfx, 1024, 0x0bc8 + .align 2 gUnknown_083D17A4:: @ 83D17A4 - .incbin "baserom.gba", 0x003d17a4, 0x8 + obj_pal gMiscBlank_Pal, 0x0BC1 .align 2 gOamData_83D17AC:: @ 83D17AC @@ -13998,11 +14256,11 @@ gSpriteTemplate_83D17B4:: @ 83D17B4 .align 2 gUnknown_083D17CC:: @ 83D17CC - obj_tiles 0x08d2d7d4, 544, 0x0bc9 + obj_tiles gContestConfetti_Gfx, 544, 0x0bc9 .align 2 gUnknown_083D17D4:: @ 83D17D4 - obj_pal 0x08d2d8f4, 0x0bc9 + obj_pal gContestConfetti_Pal, 0x0bc9 gUnknown_083D17DC:: @ 83D17DC .incbin "baserom.gba", 0x003d17dc, 0x4 @@ -14024,11 +14282,11 @@ gUnknown_083D188E:: @ 83D188E .align 2 gUnknown_083D1898:: @ 83D1898 - obj_pal 0x083d190c, 0x0080 + obj_pal gUnknownPal_083D190C, 0x0080 .align 2 gUnknown_083D18A0:: @ 83D18A0 - obj_pal 0x083d18ec, 0x0000 + obj_pal gUnknownPal_083D18EC, 0x0000 .align 2 gSpriteTemplate_83D18A8:: @ 83D18A8 @@ -14054,7 +14312,14 @@ gSpriteAnimTable_83D18E8:: @ 83D18E8 .4byte gSpriteAnim_83D18E0 .align 2 - .incbin "baserom.gba", 0x3d18ec, 0xa0 +gUnknownPal_083D18EC:: + .incbin "baserom.gba", 0x003d18ec, 0x20 + + .align 2 +gUnknownPal_083D190C:: + .incbin "baserom.gba", 0x003d190c, 0x20 + + .incbin "baserom.gba", 0x003d192c, 0x60 .align 2 gSpriteImage_83D198C:: @ 83D198C @@ -14077,7 +14342,7 @@ gSpriteImage_83D1B8C:: @ 83D1B8C .incbin "graphics/unknown_sprites/83D259C/4.4bpp" .align 2 - .incbin "baserom.gba", 0x3d1c0c, 0x20 + .incbin "baserom.gba", 0x003d1c0c, 0x20 .align 2 gFieldEffectObjectPalette7: @ 83D1C2C @@ -14124,7 +14389,7 @@ gSpriteImage_83D20CC:: @ 83D20CC .incbin "graphics/unknown_sprites/83D25C4/4.4bpp" .align 2 - .incbin "baserom.gba", 0x3d214c, 0x80 + .incbin "baserom.gba", 0x003d214c, 0x80 .align 2 gFieldEffectObjectPalette8: @ 83D21CC @@ -14306,7 +14571,7 @@ gSpriteImage_83D27C0:: @ 83D27C0 .incbin "graphics/unknown_sprites/83D2860/2.4bpp" .align 2 - .incbin "baserom.gba", 0x3d2840, 0x20 + .incbin "baserom.gba", 0x003d2840, 0x20 .align 2 gSpriteImageTable_83D2860:: @ 83D2860 @@ -14450,7 +14715,7 @@ gSpriteAffineAnim_83D5EAC:: @ 83D5EAC obj_rot_scal_anim_jump 0 .align 2 - .incbin "baserom.gba", 0x3d5ebc, 0x60 + .incbin "baserom.gba", 0x003d5ebc, 0x60 .align 2 gSpriteAffineAnim_83D5F1C:: @ 83D5F1C @@ -14459,7 +14724,7 @@ gSpriteAffineAnim_83D5F1C:: @ 83D5F1C obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3d5f34, 0x30 + .incbin "baserom.gba", 0x003d5f34, 0x30 .align 2 gSpriteAffineAnim_83D5F64:: @ 83D5F64 @@ -14468,7 +14733,7 @@ gSpriteAffineAnim_83D5F64:: @ 83D5F64 obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3d5f7c, 0xc0 + .incbin "baserom.gba", 0x003d5f7c, 0xc0 .align 2 gSpriteAffineAnimTable_83D603C:: @ 83D603C @@ -14480,7 +14745,7 @@ gSpriteAffineAnimTable_83D603C:: @ 83D603C .4byte gSpriteAffineAnim_83D5F64 .align 2 - .incbin "baserom.gba", 0x3d6054, 0x38 + .incbin "baserom.gba", 0x003d6054, 0x38 .align 2 gSpriteTemplate_83D608C:: @ 83D608C @@ -15428,7 +15693,7 @@ gSpriteAffineAnim_83D6D2C:: @ 83D6D2C obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3d6d44, 0x18 + .incbin "baserom.gba", 0x003d6d44, 0x18 .align 2 gSpriteAffineAnim_83D6D5C:: @ 83D6D5C @@ -15437,7 +15702,7 @@ gSpriteAffineAnim_83D6D5C:: @ 83D6D5C obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3d6d74, 0x18 + .incbin "baserom.gba", 0x003d6d74, 0x18 .align 2 gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C @@ -15811,7 +16076,7 @@ gSpriteAffineAnim_83D7250:: @ 83D7250 obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3d7278, 0x48 + .incbin "baserom.gba", 0x003d7278, 0x48 .align 2 gSpriteAffineAnimTable_83D72C0:: @ 83D72C0 @@ -15874,7 +16139,7 @@ gSpriteTemplate_83D7370:: @ 83D7370 spr_template 10064, 10064, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF280 .align 2 - .incbin "baserom.gba", 0x3d7388, 0xc + .incbin "baserom.gba", 0x003d7388, 0xc .align 2 gSpriteTemplate_83D7394:: @ 83D7394 @@ -16941,7 +17206,7 @@ gSpriteAnimTable_83D9650:: @ 83D9650 .4byte gSpriteAnim_83D9644 .align 2 - .incbin "baserom.gba", 0x3d9654, 0x28 + .incbin "baserom.gba", 0x003d9654, 0x28 .align 2 gBattleAnimSpriteTemplate_83D967C:: @ 83D967C @@ -17274,14 +17539,14 @@ gSpriteTemplate_83D9B40:: @ 83D9B40 spr_template 10001, 10001, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D755C .align 2 - .incbin "baserom.gba", 0x3d9b58, 0x10 + .incbin "baserom.gba", 0x003d9b58, 0x10 .align 2 gSpriteTemplate_83D9B68:: @ 83D9B68 spr_template 10141, 10141, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D7704 .align 2 - .incbin "baserom.gba", 0x3d9b80, 0x8 + .incbin "baserom.gba", 0x003d9b80, 0x8 .align 2 gSpriteAnim_83D9B88:: @ 83D9B88 @@ -17310,7 +17575,7 @@ gSpriteAnim_83D9BA8:: @ 83D9BA8 obj_image_anim_jump 0 .align 2 - .incbin "baserom.gba", 0x3d9bb4, 0x4 + .incbin "baserom.gba", 0x003d9bb4, 0x4 .align 2 gSpriteAnimTable_83D9BB8:: @ 83D9BB8 @@ -17959,7 +18224,7 @@ gBattleAnimSpriteTemplate_83DA498:: @ 83DA498 spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8 .align 2 - .incbin "baserom.gba", 0x3da4b0, 0x20 + .incbin "baserom.gba", 0x003da4b0, 0x20 .align 2 gSpriteTemplate_83DA4D0:: @ 83DA4D0 @@ -18033,7 +18298,7 @@ gBattleAnimSpriteTemplate_83DA5D8:: @ 83DA5D8 spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA5D4, sub_80DB288 .align 2 - .incbin "baserom.gba", 0x3da5f0, 0x24 + .incbin "baserom.gba", 0x003da5f0, 0x24 .align 2 gBattleAnimSpriteTemplate_83DA614:: @ 83DA614 @@ -18185,7 +18450,7 @@ gSpriteAnimTable_83DA85C:: @ 83DA85C .4byte gSpriteAnim_83DA83C .align 2 - .incbin "baserom.gba", 0x3da860, 0x28 + .incbin "baserom.gba", 0x003da860, 0x28 gUnknown_083DA888:: @ 83DA888 .incbin "baserom.gba", 0x003da888, 0x4 @@ -18451,7 +18716,7 @@ gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8 spr_template 10261, 10261, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD3AC .align 2 - .incbin "baserom.gba", 0x3dad00, 0x10 + .incbin "baserom.gba", 0x003dad00, 0x10 gUnknown_083DAD10:: @ 83DAD10 .incbin "baserom.gba", 0x003dad10, 0x8 @@ -18597,7 +18862,7 @@ gBattleAnimSpriteTemplate_83DAEDC:: @ 83DAEDC spr_template 10177, 10177, gOamData_837DF74, gSpriteAnimTable_83DAED8, NULL, gDummySpriteAffineAnimTable, sub_80DE0FC .align 2 - .incbin "baserom.gba", 0x3daef4, 0x14 + .incbin "baserom.gba", 0x003daef4, 0x14 .align 2 gSpriteTemplate_83DAF08:: @ 83DAF08 @@ -19131,8 +19396,15 @@ gUnknown_083DB7EC:: @ 83DB7EC gUnknown_083DB7F4:: @ 83DB7F4 .incbin "baserom.gba", 0x003db7f4, 0x24C + + .align 2 +gMenuInterviewFrame_Pal:: .incbin "graphics/misc/interview_frame.gbapal" + + .align 2 +gMenuInterviewFrame_Gfx:: .incbin "graphics/misc/interview_frame.4bpp.lz" + .incbin "baserom.gba", 0x003dbb94, 0x20 gUnknown_083DBBB4:: @ 83DBBB4 @@ -19244,7 +19516,7 @@ gSpriteTemplate_83DBCAC:: @ 83DBCAC .align 2 gUnknown_083DBCC4:: @ 83DBCC4 - .incbin "baserom.gba", 0x3dbcc4, 0x1c + .incbin "baserom.gba", 0x003dbcc4, 0x1c .align 2 gOamData_83DBCE0:: @ 83DBCE0 @@ -19282,10 +19554,11 @@ gSpriteTemplate_83DBD18:: @ 83DBD18 .align 2 gUnknown_083DBD30:: @ 83DBD30 - obj_tiles 0x083dba60, 2048, 0x0006 + obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006 + .align 2 gUnknown_083DBD38:: @ 83DBD38 - .incbin "baserom.gba", 0x003dbd38, 0x8 + obj_pal gMenuInterviewFrame_Pal, 0x0004 .align 2 gOamData_83DBD40:: @ 83DBD40 @@ -19299,10 +19572,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48 .align 2 gUnknown_083DBD60:: @ 83DBD60 - obj_tiles 0x08e8ea98, 4096, 0x0007 + obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007 + .align 2 gUnknown_083DBD68:: @ 83DBD68 - .incbin "baserom.gba", 0x003dbd68, 0x8 + obj_pal gMenuWordGroup_Pal, 0x0005 .align 2 gOamData_83DBD70:: @ 83DBD70 @@ -19626,8 +19900,15 @@ gUnknown_083E329C:: @ 83E329C .incbin "graphics/pokenav/icon.4bpp.lz" .incbin "graphics/pokenav/contest_pokeball.4bpp" .incbin "baserom.gba", 0x003E3780, 0x20 + + .align 2 +gContestSparkle_Pal:: .incbin "graphics/pokenav/contest_sparkle.gbapal" + + .align 2 +gContestSparkle_Gfx:: .incbin "graphics/pokenav/contest_sparkle.4bpp" + .incbin "graphics/pokenav/contest_arrows.4bpp" .incbin "baserom.gba", 0x003E3BC0, 0x20 .incbin "graphics/unknown/unknown_3E3BE0.4bpp" @@ -19639,10 +19920,18 @@ gUnknown_083E3C60:: @ 83E3C60 .incbin "graphics/misc/ribbons_smart.gbapal" .incbin "graphics/misc/ribbons_tough.gbapal" + .align 2 gUnknown_083E3D00:: @ 83E3D00 .incbin "graphics/misc/ribbons_full.4bpp.lz" + + .align 2 +gUnknownPal_083E41D8:: .incbin "graphics/unknown/unknown_3E41D8.gbapal" + + .align 2 +gUnknownGfx_083E41D8:: .incbin "graphics/unknown/unknown_3E41D8.4bpp" + .incbin "baserom.gba", 0x003e42D8, 0x20 gUnknown_083E42F8:: @ 83E42F8 @@ -19813,10 +20102,11 @@ gSpriteTemplate_83E4454:: @ 83E4454 .align 2 gUnknown_083E446C:: @ 83E446C - obj_tiles 0x083e41d8, 256, 0x0019 + obj_tiles gUnknownGfx_083E41D8, 256, 0x0019 + .align 2 gUnknown_083E4474:: @ 83E4474 - .incbin "baserom.gba", 0x003e4474, 0x8 + obj_pal gUnknownPal_083E41D8, 0x0011 .align 2 gOamData_83E447C:: @ 83E447C @@ -20025,11 +20315,11 @@ gSpriteTemplate_83E476C:: @ 83E476C .align 2 gUnknown_083E4784:: @ 83E4784 - obj_tiles 0x083e37c0, 896, 0x0017 + obj_tiles gContestSparkle_Gfx, 896, 0x0017 .align 2 gUnknown_083E478C:: @ 83E478C - obj_pal 0x083e37a0, 0x000f + obj_pal gContestSparkle_Pal, 0x000f gUnknown_083E4794:: @ 83E4794 .incbin "baserom.gba", 0x003e4794, 0x28 @@ -20059,7 +20349,7 @@ gSpriteAnimTable_83E47E4:: @ 83E47E4 .4byte gSpriteAnim_83E47C4 + 0x18 .align 2 - .incbin "baserom.gba", 0x3e47f4, 0xc + .incbin "baserom.gba", 0x003e47f4, 0xc .align 2 gSpriteTemplate_83E4800:: @ 83E4800 @@ -20067,7 +20357,7 @@ gSpriteTemplate_83E4800:: @ 83E4800 .align 2 gUnknown_083E4818:: @ 83E4818 - .incbin "baserom.gba", 0x3e4818, 0x8 + .incbin "baserom.gba", 0x003e4818, 0x8 .align 2 gSpriteAnim_83E4820:: @ 83E4820 @@ -20214,7 +20504,7 @@ gSpriteAnimTable_83E52AC:: @ 83E52AC .4byte gSpriteAnim_83E52A4 gUnknown_083E52B4:: @ 83E52B4 - .incbin "baserom.gba", 0x3E52B4, 0x8 + .incbin "baserom.gba", 0x003E52B4, 0x8 .align 2 gSpriteAnim_83E52BC:: @ 83E52BC @@ -20486,7 +20776,7 @@ gSpriteImage_83E5928:: @ 83E5928 .incbin "graphics/unknown_sprites/83E59C0/1.4bpp" .align 2 - .incbin "baserom.gba", 0x3e5948, 0x20 + .incbin "baserom.gba", 0x003e5948, 0x20 gUnknown_083E5968:: @ 83E5968 .incbin "baserom.gba", 0x003e5968, 0x8 @@ -20559,6 +20849,9 @@ gUnknown_083E5A1C:: @ 83E5A1C gUnknown_083E5A20:: @ 83E5A20 .incbin "baserom.gba", 0x003E5A20, 0xB0 + + .align 2 +gPokenavCursor_Pal:: .incbin "graphics/pokenav/cursor.gbapal" gUnknown_083E5AF0:: @ 83E5AF0 @@ -20627,7 +20920,7 @@ gSpriteAnimTable_83E76E0:: @ 83E76E0 .align 2 gUnknown_083E76E8:: @ 83E76E8 - obj_pal 0x083e5ad0, 0x0000 + obj_pal gPokenavCursor_Pal, 0x0000 .align 2 gSpriteTemplate_83E76F0:: @ 83E76F0 @@ -20650,6 +20943,9 @@ gUnknown_083E773C:: @ 83E773C gUnknown_083E7774:: @ 83E7774 .incbin "baserom.gba", 0x003e7774, 0xb8 + + .align 2 +gPokenavMapMisc_Pal:: .incbin "graphics/pokenav/map_misc.gbapal" gUnknown_083E784C:: @ 83E784C @@ -20663,7 +20959,7 @@ gUnknown_083E79C0:: @ 83E79C0 .align 2 gUnknown_083E79CC:: @ 83E79CC - obj_pal 0x083e782c, 0x0002 + obj_pal gPokenavMapMisc_Pal, 0x0002 gUnknown_083E79D4:: @ 83E79D4 .incbin "baserom.gba", 0x003e79d4, 0x8 @@ -20805,7 +21101,13 @@ gUnknown_083EC97C:: @ 83EC97C .incbin "baserom.gba", 0x003ec97c, 0x8 gUnknown_083EC984:: @ 83EC984 - .incbin "baserom.gba", 0x003ec984, 0x48 + .incbin "baserom.gba", 0x003ec984, 0x8 + + .align 2 +gUnknown_083EC98C:: + .incbin "baserom.gba", 0x003ec98c, 0x20 + + .incbin "baserom.gba", 0x003ec9ac, 0x20 .align 2 gUnknown_083EC9CC:: @ 83EC9CC @@ -20823,7 +21125,7 @@ gSpriteImage_83EC9DC:: @ 83EC9DC .align 2 gUnknown_083ECA5C:: @ 83ECA5C - obj_pal 0x083ec98c, 0x0008 + obj_pal gUnknown_083EC98C, 0x0008 gUnknown_083ECA64:: @ 83ECA64 .incbin "baserom.gba", 0x003eca64, 0x8 @@ -20966,7 +21268,7 @@ gUnknown_083ECBB4:: @ 83ECBB4 .4byte sub_81041AC gUnknown_083ECBC4:: @ 83ECBC4 - .incbin "baserom.gba", 0x003ecbc4, 0x2 + .2byte 0x9E gUnknown_083ECBC6:: @ 83ECBC6 .incbin "baserom.gba", 0x003ecbc6, 0xa @@ -21019,7 +21321,7 @@ gUnknown_083ECC54:: @ 83ECC54 .4byte nullsub_69 gUnknown_083ECC58:: @ 83ECC58 - .incbin "baserom.gba", 0x003ecc58, 0x2 + .2byte 16 gUnknown_083ECC5A:: @ 83ECC5A .incbin "baserom.gba", 0x003ecc5a, 0x8 @@ -21097,21 +21399,21 @@ gUnknown_083ECE7E:: @ 83ECE7E .incbin "baserom.gba", 0x003ece7e, 0x8e gUnknown_083ECF0C:: @ 83ECF0C - .incbin "baserom.gba", 0x3ECF0C, 0x8C + .incbin "baserom.gba", 0x003ECF0C, 0x8C Unknown_83ECF98: - .incbin "baserom.gba", 0x3ECF98, 0x10 + .incbin "baserom.gba", 0x003ECF98, 0x10 Unknown_83ECFA8: - .incbin "baserom.gba", 0x3ECFA8, 0x1C + .incbin "baserom.gba", 0x003ECFA8, 0x1C Unknown_83ECFC4: - .incbin "baserom.gba", 0x3ECFC4, 0xC + .incbin "baserom.gba", 0x003ECFC4, 0xC Unknown_83ECFD0: - .incbin "baserom.gba", 0x3ECFD0, 0x18 + .incbin "baserom.gba", 0x003ECFD0, 0x18 Unknown_83ECFE8: - .incbin "baserom.gba", 0x3ECFE8, 0x10 + .incbin "baserom.gba", 0x003ECFE8, 0x10 Unknown_83ECFF8: - .incbin "baserom.gba", 0x3ECFF8, 0x28 + .incbin "baserom.gba", 0x003ECFF8, 0x28 Unknown_83ED020: - .incbin "baserom.gba", 0x3ED020, 0x28 + .incbin "baserom.gba", 0x003ED020, 0x28 .align 2 gUnknown_083ED048:: @ 83ED048 @@ -21124,7 +21426,13 @@ gUnknown_083ED048:: @ 83ED048 .4byte Unknown_83ECFF8 gUnknown_083ED064:: @ 83ED064 - .incbin "baserom.gba", 0x003ed064, 0x1C + .4byte sub_810639C + .4byte sub_8106364 + .4byte sub_8106370 + .4byte nullsub_70 + .4byte nullsub_70 + .4byte sub_8106370 + .4byte sub_8106370 .align 2 gOamData_83ED080:: @ 83ED080 @@ -21175,7 +21483,7 @@ gOamData_83ED0B8:: @ 83ED0B8 .2byte 0x0000 .align 2 - .incbin "baserom.gba", 0x3ed0c0, 0x40 + .incbin "baserom.gba", 0x003ed0c0, 0x40 .align 2 gSpriteImageTable_83ED100:: @ 83ED100 @@ -21217,7 +21525,7 @@ gSpriteImageTable_83ED170:: @ 83ED170 obj_frame_tiles gSpriteImage_8E98868, 0x80 .align 2 - .incbin "baserom.gba", 0x3ed178, 0xb0 + .incbin "baserom.gba", 0x003ed178, 0xb0 .align 2 gSpriteImageTable_83ED228:: @ 83ED228 @@ -21570,25 +21878,131 @@ gSpriteTemplate_83ED6CC:: @ 83ED6CC spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 .align 2 - .incbin "baserom.gba", 0x3ed6e4, 0x20 +Unknown_083ED6E4: + .incbin "baserom.gba", 0x003ed6e4, 0x20 gUnknown_083ED704:: @ 83ED704 - .incbin "baserom.gba", 0x003ed704, 0x38 + .4byte 4, Unknown_083ED6E4 +Unknown_083ED70C: + .incbin "baserom.gba", 0x003ed70c, 0x30 gUnknown_083ED73C:: @ 83ED73C - .incbin "baserom.gba", 0x003ed73c, 0x20 + .4byte 6, Unknown_083ED70C +Unknown_083ED744: + .incbin "baserom.gba", 0x003ed744, 0x18 gUnknown_083ED75C:: @ 83ED75C - .incbin "baserom.gba", 0x003ed75c, 0x30 + .4byte 3, Unknown_083ED744 +Unknown_083ED764: + .incbin "baserom.gba", 0x003ed764, 0x28 gUnknown_083ED78C:: @ 83ED78C - .incbin "baserom.gba", 0x003ed78c, 0x28 + .4byte 5, Unknown_083ED764 +Unknown_083ED794: + .incbin "baserom.gba", 0x003ed794, 0x20 gUnknown_083ED7B4:: @ 83ED7B4 - .incbin "baserom.gba", 0x003ed7b4, 0x20 + .4byte 4, Unknown_083ED794 +Unknown_083ED7BC: + .incbin "baserom.gba", 0x003ed7bc, 0x18 gUnknown_083ED7D4:: @ 83ED7D4 - .incbin "baserom.gba", 0x003ed7d4, 0x388 + .4byte 3, Unknown_083ED7BC +Unknown_083ED7DC: + .incbin "baserom.gba", 0x003ed7dc, 0x28 +Unknown_083ED804: + .4byte 5, Unknown_083ED7DC +Unknown_083ED80C: + .incbin "baserom.gba", 0x003ed80c, 0x20 +Unknown_083ED82C: + .4byte 4, Unknown_083ED80C +Unknown_083ED834: + .incbin "baserom.gba", 0x003ed834, 0x20 +Unknown_083ED854: + .4byte 4, Unknown_083ED834 +Unknown_083ED85C: + .incbin "baserom.gba", 0x003ed85c, 0x20 +Unknown_083ED87C: + .4byte 4, Unknown_083ED85C +Unknown_083ED884: + .incbin "baserom.gba", 0x003ed884, 0x30 +Unknown_083ED8B4: + .4byte 6, Unknown_083ED884 +Unknown_083ED8BC: + .incbin "baserom.gba", 0x003ed8bc, 0x8 +Unknown_083ED8C4: + .incbin "baserom.gba", 0x003ed8c4, 0x8 +Unknown_083ED8CC: + .4byte 1, Unknown_083ED8BC + .4byte 1, Unknown_083ED8C4 +Unknown_083ED8DC: + .incbin "baserom.gba", 0x003ed8dc, 0x60 +Unknown_083ED93C: + .4byte 12, Unknown_083ED8DC +Unknown_083ED944: + .incbin "baserom.gba", 0x003ed944, 0x18 +Unknown_083ED95C: + .4byte 3, Unknown_083ED944 +Unknown_083ED964: + .incbin "baserom.gba", 0x003ed964, 0x10 +Unknown_083ED974: + .4byte 2, Unknown_083ED964 +Unknown_083ED97C: + .incbin "baserom.gba", 0x003ed97c, 0x10 +Unknown_083ED98C: + .4byte 2, Unknown_083ED97C +Unknown_083ED994: + .incbin "baserom.gba", 0x003ed994, 0x10 +Unknown_083ED9A4: + .4byte 2, Unknown_083ED994 +Unknown_083ED9AC: + .incbin "baserom.gba", 0x003ed9ac, 0x10 +Unknown_083ED9BC: + .4byte 2, Unknown_083ED9AC +Unknown_083ED9C4: + .incbin "baserom.gba", 0x003ed9c4, 0x10 +Unknown_083ED9D4: + .4byte 2, Unknown_083ED9C4 +Unknown_083ED9DC: + .incbin "baserom.gba", 0x003ed9dc, 0x10 +Unknown_083ED9EC: + .4byte 2, Unknown_083ED9DC +Unknown_083ED9F4: + .incbin "baserom.gba", 0x003ed9f4, 0x10 +Unknown_083EDA04: + .4byte 2, Unknown_083ED9F4 +Unknown_083EDA0C: + .incbin "baserom.gba", 0x003eda0C, 0x10 +Unknown_083EDA1C: + .4byte 2, Unknown_083EDA0C +Unknown_083EDA24: + .incbin "baserom.gba", 0x003eda24, 0x10 +Unknown_083EDA34: + .4byte 2, Unknown_083EDA24 +Unknown_083EDA3C: + .incbin "baserom.gba", 0x003eda3c, 0x30 +Unknown_083EDA6C: + .4byte 6, Unknown_083EDA3C +Unknown_083EDA74: + .incbin "baserom.gba", 0x003eda74, 0x18 +Unknown_083EDA8C: + .4byte 3, Unknown_083EDA74 +Unknown_083EDA94: + .incbin "baserom.gba", 0x003eda94, 0x30 +Unknown_083EDAC4: + .4byte 6, Unknown_083EDA94 +Unknown_083EDACC: + .incbin "baserom.gba", 0x003edacc, 0x30 +Unknown_083EDAFC: + .4byte 6, Unknown_083EDACC +Unknown_083EDB04: + .incbin "baserom.gba", 0x003edb04, 0x18 +Unknown_083EDB1C: + .4byte 3, Unknown_083EDB04 +Unknown_083EDB24: + .incbin "baserom.gba", 0x003edb24, 0x30 +Unknown_083EDB54: + .4byte 6, Unknown_083EDB24 .align 2 gUnknown_083EDB5C:: @ 83EDB5C @@ -21619,8 +22033,34 @@ gUnknown_083EDB5C:: @ 83EDB5C .4byte gSpriteTemplate_83ED63C .4byte gDummySpriteTemplate + .align 2 gUnknown_083EDBC4:: @ 83EDBC4 - .incbin "baserom.gba", 0x003edbc4, 0x68 + .4byte Unknown_083ED804 + .4byte Unknown_083ED82C + .4byte Unknown_083ED854 + .4byte Unknown_083ED8B4 + .4byte 0 @ dummied out + .4byte 0 @ dummied out + .4byte Unknown_083ED8CC + .4byte 0 @ dummied out + .4byte Unknown_083ED93C + .4byte Unknown_083ED95C + .4byte Unknown_083ED974 + .4byte Unknown_083ED98C + .4byte Unknown_083ED9A4 + .4byte Unknown_083ED9BC + .4byte Unknown_083ED9D4 + .4byte Unknown_083ED9EC + .4byte Unknown_083EDA04 + .4byte Unknown_083EDA1C + .4byte Unknown_083EDA34 + .4byte Unknown_083EDA6C + .4byte Unknown_083EDA8C + .4byte Unknown_083EDAC4 + .4byte Unknown_083EDAFC + .4byte Unknown_083EDB1C + .4byte Unknown_083EDB54 + .4byte 0 @ dummied out gUnknown_083EDC2C:: @ 83EDC2C .incbin "baserom.gba", 0x003edc2c, 0xb0 @@ -21663,14 +22103,13 @@ gUnknown_083EDD35:: @ 83EDD35 .incbin "baserom.gba", 0x003edd35, 0x6 gUnknown_083EDD3B:: @ 83EDD3B -Unknown_83EDD3B: .incbin "baserom.gba", 0x003edd3b, 0x3 Unknown_83EDD3E: .incbin "baserom.gba", 0x003edd3e, 0x20 Unknown_83EDD5E: .incbin "baserom.gba", 0x003edd5e, 0x20 Unknown_83EDD7E: - .incbin "baserom.gba", 0x003edd7e, 0x22 + .incbin "baserom.gba", 0x003edd7e, 0x20 .align 2 gUnknown_083EDDA0:: @ 83EDDA0 @@ -21943,7 +22382,13 @@ gUnknown_083F62E8:: @ 83F62E8 gUnknown_083F62EC:: @ 83F62EC .incbin "graphics/misc/birch_bag.gbapal" .incbin "graphics/misc/birch_grass.gbapal" + + .align 2 +gBirchBallarrow_Pal:: .incbin "graphics/misc/birch_ballarrow.gbapal" + + .align 2 +gBirchCircle_Pal:: .incbin "graphics/misc/birch_circle.gbapal" gUnknown_083F636C:: @ 83F636C @@ -21954,7 +22399,13 @@ gUnknown_083F64F8:: @ 83F64F8 gUnknown_083F66F0:: @ 83F66F0 .incbin "graphics/misc/birch_help.4bpp.lz" + + .align 2 +gBirchBallarrow_Gfx:: .incbin "graphics/misc/birch_ballarrow.4bpp.lz" + + .align 2 +gBirchCircle_Gfx:: .incbin "graphics/misc/birch_circle.4bpp.lz" gUnknown_083F76B8:: @ 83F76B8 @@ -22055,13 +22506,17 @@ gSpriteAffineAnimTable_83F7790:: @ 83F7790 .4byte gSpriteAffineAnim_83F7774 gUnknown_083F7794:: @ 83F7794 - .incbin "baserom.gba", 0x003f7794, 0x10 + obj_tiles gBirchBallarrow_Gfx, 0x0800, 0x1000 + .space 8 gUnknown_083F77A4:: @ 83F77A4 - .incbin "baserom.gba", 0x003f77a4, 0x10 + obj_tiles gBirchCircle_Gfx, 0x0800, 0x1001 + .space 8 gUnknown_083F77B4:: @ 83F77B4 - .incbin "baserom.gba", 0x003f77b4, 0x18 + obj_pal gBirchBallarrow_Pal, 0x1000 + obj_pal gBirchCircle_Pal, 0x1001 + .space 8 .align 2 gSpriteTemplate_83F77CC:: @ 83F77CC @@ -22076,13 +22531,17 @@ gSpriteTemplate_83F77FC:: @ 83F77FC spr_template 4097, 4097, gOamData_83F76DC, gSpriteAnimTable_83F7758, NULL, gSpriteAffineAnimTable_83F7790, sub_810A6C4 @ 83F7814 +ClockGfx_Misc: .incbin "graphics/misc/clock_misc.4bpp.lz" gUnknown_083F7A90:: @ 83F7A90 - .incbin "baserom.gba", 0x003f7a90, 0x10 + obj_tiles ClockGfx_Misc, 0x2000, 0x1000 + .space 8 gUnknown_083F7AA0:: @ 83F7AA0 - .incbin "baserom.gba", 0x003f7aa0, 0x18 + obj_pal gUnknown_08E8F804, 0x1000 + obj_pal gUnknown_08E8F824, 0x1001 + .space 8 .align 2 gOamData_83F7AB8:: @ 83F7AB8 @@ -22156,10 +22615,8 @@ gUnknown_083F7E28:: @ 83F7E28 .align 2 gUnknown_083F7EA8:: @ 83F7EA8 - .4byte sub_80A5B40 - .4byte c2_exit_to_overworld_2_switch - .4byte sub_802E424 - .4byte c2_exit_to_overworld_2_switch + .4byte sub_80A5B40, c2_exit_to_overworld_2_switch + .4byte sub_802E424, c2_exit_to_overworld_2_switch .align 2 gUnknown_083F7EB8:: @ 83F7EB8 @@ -22222,16 +22679,17 @@ gSpriteAnimTable_83F7F44:: @ 83F7F44 Unknown_83F7F48: .incbin "baserom.gba", 0x003f7f48, 0x28 + .align 2 gUnknown_083F7F70:: @ 83F7F70 .4byte Unknown_83F7F48 .align 2 gUnknown_083F7F74:: @ 83F7F74 - obj_tiles 0x08e77d90, 2048, 0x39d0 + obj_tiles gMenuPokeblockDevice_Gfx, 2048, 0x39d0 .align 2 gUnknown_083F7F7C:: @ 83F7F7C - obj_pal 0x08e78050, 0x39d0 + obj_pal gMenuPokeblockDevice_Pal, 0x39d0 .align 2 gSpriteTemplate_83F7F84:: @ 83F7F84 @@ -22390,7 +22848,13 @@ gUnknown_083F868C:: @ 83F868C .incbin "baserom.gba", 0x003f868c, 0x30 gUnknown_083F86BC:: @ 83F86BC - .incbin "baserom.gba", 0x003f86bc, 0x200 + .incbin "baserom.gba", 0x003f86bc, 0x40 + + .align 2 +gRouletteCenter_Pal:: + .incbin "graphics/roulette/center.gbapal" + + .incbin "baserom.gba", 0x003f871c, 0x1A0 gUnknown_083F88BC:: @ 83F88BC .incbin "baserom.gba", 0x003f88bc, 0x1a4 @@ -22935,7 +23399,7 @@ gOamData_83FA328:: @ 83FA328 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x3fa330, 0x20 + .incbin "baserom.gba", 0x003fa330, 0x20 .align 2 gSpriteAnim_83FA350:: @ 83FA350 @@ -22970,7 +23434,12 @@ gSpriteAnim_83FA38C:: @ 83FA38C obj_image_anim_end .align 2 - .incbin "baserom.gba", 0x3fa3a0, 0x34 +Unknown_083FA3A0: + .incbin "baserom.gba", 0x003fa3a0, 0x18 +Unknown_083FA3B8: + .incbin "baserom.gba", 0x003fa3b8, 0x14 +Unknown_083FA3CC: + .incbin "baserom.gba", 0x003fa3cc, 0x8 .align 2 gSpriteAnim_83FA3D4:: @ 83FA3D4 @@ -22989,8 +23458,11 @@ gSpriteAnimTable_83FA3E8:: @ 83FA3E8 .4byte gSpriteAnim_83FA3D4 .align 2 - .incbin "baserom.gba", 0x3fa3fc, 0x10 - + .4byte Unknown_083FA3A0 + .4byte Unknown_083FA3B8 + .4byte Unknown_083FA3B8 + .4byte Unknown_083FA3CC + .align 2 gSpriteTemplate_83FA40C:: @ 83FA40C spr_template 0xFFFF, 2, gOamData_83FA328, gSpriteAnimTable_83FA3E8, 0x83FA330, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -23003,7 +23475,7 @@ gOamData_83FA424:: @ 83FA424 .align 2 gUnknown_083FA42C:: @ 83FA42C - obj_tiles 0x08e82140, 2048, 0x0006 + obj_tiles gRouletteCenter_Gfx, 2048, 0x0006 .align 2 gSpriteTemplate_83FA434:: @ 83FA434 @@ -23022,7 +23494,7 @@ gOamData_83FA454:: @ 83FA454 .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x3fa45c, 0x38 + .incbin "baserom.gba", 0x003fa45c, 0x38 .align 2 gSpriteAnim_83FA494:: @ 83FA494 @@ -23108,7 +23580,9 @@ gOamData_83FA54C:: @ 83FA54C .2byte 0x0800 .align 2 - .incbin "baserom.gba", 0x3fa554, 0x28 + .incbin "baserom.gba", 0x003fa554, 0x10 +Unknown_083FA564: + .incbin "baserom.gba", 0x003fa564, 0x18 .align 2 gSpriteAffineAnim_83FA57C:: @ 83FA57C @@ -23119,14 +23593,14 @@ gSpriteAffineAnim_83FA57C:: @ 83FA57C obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x3fa5a4, 0x4 + .4byte Unknown_083FA564 .align 2 gSpriteAffineAnimTable_83FA5A8:: @ 83FA5A8 .4byte gSpriteAffineAnim_83FA57C .align 2 - .incbin "baserom.gba", 0x3fa5ac, 0x14 + .incbin "baserom.gba", 0x003fa5ac, 0x14 .align 2 gSpriteTemplate_83FA5C0:: @ 83FA5C0 @@ -23143,8 +23617,10 @@ gSpriteTemplate_83FA5F0:: @ 83FA5F0 gUnknown_083FA608:: @ 83FA608 .incbin "baserom.gba", 0x003fa608, 0x6 + .align 1 gUnknown_083FA60E:: @ 83FA60E - .incbin "baserom.gba", 0x003fa60e, 0x8 + .2byte 0x74, 0x2C + .2byte 0x74, 0x70 gUnknown_083FA616:: @ 83FA616 .incbin "baserom.gba", 0x003fa616, 0x8 @@ -23686,7 +24162,7 @@ gUnknown_08401D8E:: @ 8401D8E .incbin "baserom.gba", 0x00401d8e, 0x8 gUnknown_08401D96:: @ 8401D96 - .incbin "baserom.gba", 0x00401d96, 0x6 + .incbin "baserom.gba", 0x00401d96, 0x4 .align 2 gUnknown_08401D9C:: @ 8401D9C @@ -24223,7 +24699,7 @@ gBattleAnimSpriteTemplate_84026A4:: @ 84026A4 spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0 .align 2 - .incbin "baserom.gba", 0x4026bc, 0x20 + .incbin "baserom.gba", 0x004026bc, 0x20 .align 2 gSpriteAnim_84026DC:: @ 84026DC @@ -24468,7 +24944,17 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10 .align 2 gUnknown_08402B28:: @ 8402B28 - .incbin "baserom.gba", 0x00402b28, 0x1d0 + .incbin "baserom.gba", 0x00402b28, 0x30 + + .align 2 +gDexArrows_Pal:: + .incbin "graphics/pokedex/arrows.gbapal" + + .align 2 +gDexArrows_Gfx:: + .incbin "graphics/pokedex/arrows.4bpp" + + .incbin "baserom.gba", 0x00402c78, 0x80 gUnknown_08402CF8:: @ 8402CF8 .incbin "baserom.gba", 0x00402cf8, 0x10 @@ -24511,11 +24997,11 @@ gSpriteAnimTable_8402D78:: @ 8402D78 .align 2 gUnknown_08402D80:: @ 8402D80 - obj_tiles 0x08402b78, 384, 0x1595 + obj_tiles gDexArrows_Gfx, 384, 0x1595 .align 2 gUnknown_08402D88:: @ 8402D88 - obj_pal 0x08402b58, 0x1596 + obj_pal gDexArrows_Pal, 0x1596 .align 2 gSpriteTemplate_8402D90:: @ 8402D90 @@ -24572,7 +25058,7 @@ gSpriteTemplate_8402E08:: @ 8402E08 spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300 .align 2 - .incbin "baserom.gba", 0x402e20, 0x4 + .incbin "baserom.gba", 0x00402e20, 0x4 gUnknown_08402E24:: @ 8402E24 .incbin "baserom.gba", 0x00402e24, 0x15 @@ -24620,7 +25106,17 @@ gUnknown_08405EDA:: @ 8405EDA .incbin "baserom.gba", 0x00405eda, 0xc gUnknown_08405EE6:: @ 8405EE6 - .incbin "baserom.gba", 0x00405ee6, 0x232 + .incbin "baserom.gba", 0x00405ee6, 0x12 + + .align 2 +gUnknownPal_08405EF8:: + .incbin "baserom.gba", 0x00405ef8, 0x20 + + .align 2 +gUnknownPal_08405F18:: + .incbin "baserom.gba", 0x00405f18, 0x20 + + .incbin "baserom.gba", 0x00405f38, 0x1E0 gUnknown_08406118:: @ 8406118 .incbin "baserom.gba", 0x00406118, 0x14 @@ -24639,11 +25135,11 @@ gUnknown_08406134:: @ 8406134 .align 2 gUnknown_08406148:: @ 8406148 - obj_pal 0x08405f18, 0x0200 + obj_pal gUnknownPal_08405F18, 0x0200 .align 2 gUnknown_08406150:: @ 8406150 - obj_pal 0x08405ef8, 0x0000 + obj_pal gUnknownPal_08405EF8, 0x0000 gUnknown_08406158:: @ 8406158 .incbin "baserom.gba", 0x00406158, 0x14 @@ -24900,7 +25396,7 @@ gSpriteTemplate_840AE20:: @ 840AE20 spr_template 2000, 2000, gOamData_840ADE8, gSpriteAnimTable_840AE10, NULL, gDummySpriteAffineAnimTable, sub_813D208 .align 2 - .incbin "baserom.gba", 0x40ae38, 0x48 + .incbin "baserom.gba", 0x0040ae38, 0x48 gUnknown_0840AE80:: @ 840AE80 .incbin "baserom.gba", 0x0040ae80, 0x10 @@ -28219,7 +28715,7 @@ gSpriteAffineAnimTable_84121D8:: @ 84121D8 .align 2 gUnknown_084121DC:: @ 84121DC - obj_tiles 0x08e781c8, 0x20, 14818 + obj_tiles gPokeblock_Gfx, 0x20, 14818 .align 2 gSpriteTemplate_84121E4:: @ 84121E4 diff --git a/data/graphics.s b/data/graphics.s index 378a5483c..d3ccc7fc6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -104,6 +104,9 @@ gInterfacePal_PremierBall:: gUnknown_08D030D0:: @ 8D030D0 .incbin "graphics/interface/ball_open.4bpp.lz" + + .align 2 +gBlankGfxCompressed:: .incbin "graphics/interface/blank.4bpp.lz" .align 2 @@ -885,8 +888,12 @@ gBattleAnimSpritePalette_114:: @ 8D1106C gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "graphics/battle_anims/sprites/115.4bpp.lz" - .incbin "baserom.gba", 0xd11ca4, 0x4C8 - + .incbin "baserom.gba", 0xd11ca4, 0x488 + +gUnknown_08D1212C:: + .incbin "graphics/interface/battle_window.gbapal" +gUnknown_08D1214C:: + .incbin "baserom.gba", 0xd1214c, 0x20 gUnknown_08D1216C:: @ 8D1216C .incbin "baserom.gba", 0x00d1216c, 0xec0 @@ -1038,7 +1045,17 @@ gBattleAnimSpritePalette_076:: @ 8D150CC gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" - .incbin "baserom.gba", 0xd151c8, 0x1F7C + .incbin "baserom.gba", 0x00d151c8, 0xE5C + + .align 2 +gContestNumbers_UnusedGfx:: + .incbin "graphics/unused/numbers.4bpp.lz" + + .align 2 +gContestNumbers_UnusedPal:: + .incbin "graphics/unused/numbers.gbapal.lz" + + .incbin "baserom.gba", 0x00d16134, 0x1010 gUnknown_08D17144:: @ 8D17144 .incbin "baserom.gba", 0x00d17144, 0x118 @@ -1056,7 +1073,17 @@ gUnknown_08D17D6C:: @ 8D17D6C .incbin "baserom.gba", 0x00d17d6c, 0xaac gUnknown_08D18818:: @ 8D18818 - .incbin "baserom.gba", 0x00d18818, 0xf64 + .incbin "baserom.gba", 0x00d18818, 0xd78 + + .align 2 +gContestJudgeSymbolsGfx:: @ 8D19590 + .incbin "graphics/misc/judge_symbols.4bpp.lz" + + .align 2 +gContest3Pal:: + .incbin "graphics/misc/judge_symbols.gbapal.lz" + + .incbin "baserom.gba", 0x00d1975c, 0x20 gUnknown_08D1977C:: @ 8D1977C .incbin "baserom.gba", 0x00d1977c, 0xad4 @@ -1317,10 +1344,13 @@ gBattleAnimSpritePalette_171:: @ 8D1C700 gBattleAnimSpritePalette_172:: @ 8D1C728 .incbin "graphics/battle_anims/sprites/172.gbapal.lz" - .incbin "baserom.gba", 0xd1c748, 0x2d4 + .align 2 +gContestJudgeGfx:: + .incbin "graphics/misc/judge.4bpp.lz" -gUnknown_08D1CA1C:: @ 8D1CA1C - .incbin "baserom.gba", 0x00d1ca1c, 0x28 + .align 2 +gContest2Pal:: @ 8D1CA1C + .incbin "graphics/misc/judge.gbapal.lz" .align 2 gBattleAnimSpriteSheet_001:: @ 8D1CA44 @@ -1471,7 +1501,27 @@ gBattleAnimSpriteSheet_186:: @ 8D1F13C gBattleAnimSpritePalette_186:: @ 8D1F508 .incbin "graphics/battle_anims/sprites/186.gbapal.lz" - .incbin "baserom.gba", 0xd1f52c, 0xa54 + .align 2 +gBattleWindowLargeGfx:: + .incbin "graphics/interface/battle_window.4bpp.lz" + + .align 2 +gBattleWindowSmallGfx:: + .incbin "graphics/interface/battle_window2.4bpp.lz" + + .align 2 +gBattleWindowSmall2Gfx:: + .incbin "graphics/interface/battle_window3.4bpp.lz" + + .align 2 +gBattleWindowSmall3Gfx:: + .incbin "graphics/interface/battle_window4.4bpp.lz" + + .align 2 +gBattleWindowLarge2Gfx:: @ 8d1fc94 + .incbin "graphics/interface/battle_window5.4bpp.lz" + + .incbin "baserom.gba", 0xd1ff0C, 0x74 .align 2 gBattleAnimSpriteSheet_014:: @ 8D1FF80 @@ -2057,7 +2107,13 @@ gBattleAnimSpriteSheet_241:: @ 8D2D6F4 gBattleAnimSpritePalette_241:: @ 8D2D7B8 .incbin "graphics/battle_anims/sprites/241.gbapal.lz" - .incbin "baserom.gba", 0xd2d7d4, 0x148 + .align 2 +gContestConfetti_Gfx:: + .incbin "graphics/misc/confetti.4bpp.lz" + + .align 2 +gContestConfetti_Pal:: + .incbin "graphics/misc/confetti.gbapal.lz" .align 2 gBattleAnimSpriteSheet_242:: @ 8D2D91C @@ -2258,8 +2314,9 @@ gUnknown_08E5DAF8:: @ 8E5DAF8 gUnknown_08E5DC04:: @ 8E5DC04 .incbin "baserom.gba", 0x00e5dc04, 0x28 + .align 2 gUnknown_08E5DC2C:: @ 8E5DC2C - .incbin "baserom.gba", 0x00e5dc2c, 0x210 + .incbin "graphics/battle_transitions/vs.4bpp.lz" .align 2 gBattleTerrainTiles_TallGrass:: @ 8E5DE3C @@ -2530,7 +2587,9 @@ gBattleAnimSpriteSheet_262:: @ 8E69308 gBattleAnimSpritePalette_262:: @ 8E693DC .incbin "graphics/battle_anims/sprites/262.gbapal.lz" - .incbin "baserom.gba", 0xe69404, 0x74 + .align 2 +gContestNextTurnGfx:: + .incbin "graphics/misc/nextturn.4bpp.lz" gUnknown_08E69478:: @ 8E69478 .incbin "baserom.gba", 0x00e69478, 0x100 @@ -2558,10 +2617,16 @@ gBattleAnimSpritePalette_067:: @ 8E69608 gBattleAnimSpritePalette_068:: @ 8E69628 .incbin "graphics/battle_anims/sprites/068.gbapal.lz" - .incbin "baserom.gba", 0xe69648, 0x144 + .align 2 +gContestApplauseGfx:: + .incbin "graphics/misc/applause.4bpp.lz" gUnknown_08E6978C:: @ 8E6978C - .incbin "baserom.gba", 0x00e6978c, 0xA0 + .incbin "baserom.gba", 0x00e6978c, 0x80 + + .align 2 +gContestPal:: + .incbin "graphics/misc/nextturn.gbapal" .align 2 gBattleAnimSpriteSheet_272:: @ 8E6982C @@ -2620,7 +2685,13 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4 .incbin "graphics/battle_anims/sprites/280.gbapal.lz" gUnknown_08E6A704:: @ 8E6A704 - .incbin "baserom.gba", 0x00e6a704, 0xD8 + .incbin "baserom.gba", 0x00e6a704, 0x24 + +gUnknown_08E6A728:: @ 8E6A728 + .incbin "baserom.gba", 0x00e6a728, 0x30 + +gUnknown_08E6A758:: @ 8E6A758 + .incbin "baserom.gba", 0x00e6a758, 0x84 .align 2 gMonIcon_Egg:: @ 8E6A7DC @@ -2816,16 +2887,27 @@ gUnknown_08E71894:: @ 8E71894 .incbin "baserom.gba", 0x00e71894, 0xa0 gUnknown_08E71934:: @ 8E71934 - .incbin "baserom.gba", 0x00e71934, 0xdb0 + .incbin "baserom.gba", 0x00e71934, 0x3dc + +gUnknown_08E71D10:: @ 8E71D10 + .incbin "baserom.gba", 0x00e71d10, 0x9d4 gUnknown_08E726E4:: @ 8E726E4 - .incbin "baserom.gba", 0x00e726e4, 0x17c + .incbin "baserom.gba", 0x00e726e4, 0x68 + +gMenuSummaryGfx:: @ 8E7274C + .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused. + +gMenuSummaryPal:: @ 8E72848 + .incbin "graphics/interface/summary_frames.gbapal.lz" -gUnknown_08E72860:: @ 8E72860 - .incbin "baserom.gba", 0x00e72860, 0x1f0 + .align 2 +gStatusGfx_Icons:: @ 8E72860 + .incbin "graphics/interface/status_icons.4bpp.lz" -gUnknown_08E72A50:: @ 8E72A50 - .incbin "baserom.gba", 0x00e72a50, 0x28 + .align 2 +gStatusPal_Icons:: @ 8E72A50 + .incbin "graphics/interface/status_icons.gbapal.lz" gUnknown_08E72A78:: @ 8E72A78 .incbin "baserom.gba", 0x00e72a78, 0x9f0 @@ -2876,20 +2958,37 @@ gUnknown_08E77004:: @ 8E77004 gUnknown_08E77804:: @ 8E77804 .incbin "baserom.gba", 0x00e77804, 0xfc -gUnknown_08E77900:: @ 8E77900 - .incbin "baserom.gba", 0x00e77900, 0x28 + .align 2 +gMenuMoneyPal:: @ 8E77900 + .incbin "graphics/interface/money.gbapal.lz" gUnknown_08E77928:: @ 8E77928 - .incbin "baserom.gba", 0x00e77928, 0x1bc + .incbin "baserom.gba", 0x00e77928, 0x134 + + .align 2 +gMenuMoneyGfx:: @ 8E77A5C + .incbin "graphics/interface/money.4bpp.lz" gUnknown_08E77AE4:: @ 8E77AE4 .incbin "baserom.gba", 0x00e77ae4, 0x23c gUnknown_08E77D20:: @ 8E77D20 - .incbin "baserom.gba", 0x00e77d20, 0x358 + .incbin "baserom.gba", 0x00e77d20, 0x70 + + .align 2 +gMenuPokeblockDevice_Gfx:: @ 8E77D90 + .incbin "graphics/interface/pokeblock_device.4bpp.lz" + + .align 2 +gMenuPokeblockDevice_Pal:: @ 8E78050 + .incbin "graphics/interface/pokeblock_device.gbapal.lz" gUnknown_08E78078:: @ 8E78078 - .incbin "baserom.gba", 0x00e78078, 0x16c + .incbin "baserom.gba", 0x00e78078, 0x150 + + .align 2 +gPokeblock_Gfx:: + .incbin "graphics/misc/pokeblock.4bpp.lz" gUnknown_08E781E4:: .incbin "baserom.gba", 0x00e781e4, 0x14 @@ -2939,14 +3038,18 @@ gUnknown_08E782FC:: @ 8E782FC gUnknown_08E783FC:: @ 8E783FC .incbin "baserom.gba", 0x00e783fc, 0x440 + .align 2 gUnknown_08E7883C:: @ 8E7883C - .incbin "baserom.gba", 0x00e7883c, 0xa8 + .incbin "graphics/battle_transitions/vs.gbapal.lz" gUnknown_08E788E4:: @ 8E788E4 .incbin "baserom.gba", 0x00e788e4, 0x1a0 gUnknown_08E78A84:: @ 8E78A84 - .incbin "baserom.gba", 0x00e78a84, 0x27c + .incbin "baserom.gba", 0x00e78a84, 0x130 + +gUnknown_08E78BB4:: @ 8E78BB4 + .incbin "baserom.gba", 0x00e78bb4, 0x14C @ 8E78D00 .include "data/graphics/berries/graphics.s" @@ -2985,7 +3088,11 @@ gUnknown_08E8096C:: @ 8E8096C .incbin "baserom.gba", 0x00e8096c, 0x72c gUnknown_08E81098:: @ 8E81098 - .incbin "baserom.gba", 0x00e81098, 0x1424 + .incbin "baserom.gba", 0x00e81098, 0x10A8 + + .align 2 +gRouletteCenter_Gfx:: + .incbin "graphics/roulette/center.4bpp.lz" .align 2 gRouletteHeadersTiles:: @ 8E824BC @@ -3215,7 +3322,13 @@ gUnknown_08E86258:: @ 8E86258 .incbin "baserom.gba", 0x00e86258, 0x500 gUnknown_08E86758:: @ 8E86758 - .incbin "baserom.gba", 0x00e86758, 0x139e + .incbin "baserom.gba", 0x00e86758, 0xd70 + +gUnknown_08E874C8:: + .incbin "baserom.gba", 0x00e874c8, 0x62c + +gUnknown_08E87AF4:: + .incbin "baserom.gba", 0x00e87af4, 0x2 gUnknown_08E87AF6:: @ 8E87AF6 .incbin "baserom.gba", 0x00e87af6, 0x60 @@ -3366,10 +3479,18 @@ gUnknown_08E8E8B0:: @ 8E8E8B0 .incbin "baserom.gba", 0x00e8e8b0, 0x1c8 gUnknown_08E8EA78:: @ 8E8EA78 - .incbin "baserom.gba", 0x00e8ea78, 0x3a0 + .incbin "baserom.gba", 0x00e8ea78, 0x20 + + .align 2 +gMenuWordGroup_Gfx:: @ 8E8EA98 + .incbin "graphics/interface/wordgroup.4bpp.lz" gUnknown_08E8EE18:: @ 8E8EE18 - .incbin "baserom.gba", 0x00e8ee18, 0x360 + .incbin "baserom.gba", 0x00e8ee18, 0x340 + + .align 2 +gMenuWordGroup_Pal:: @ 8E8F158 + .incbin "graphics/interface/wordgroup.gbapal" gUnknown_08E8F178:: @ 8E8F178 .incbin "baserom.gba", 0x00e8f178, 0x22 diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/maps/UnknownMap_082CF564/border.bin new file mode 100755 index 000000000..19d906679 --- /dev/null +++ b/data/maps/UnknownMap_082CF564/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/maps/UnknownMap_082CF564/map.bin Binary files differnew file mode 100755 index 000000000..ca93fa0e2 --- /dev/null +++ b/data/maps/UnknownMap_082CF564/map.bin diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/maps/UnknownMap_082D05D8/border.bin new file mode 100755 index 000000000..19d906679 --- /dev/null +++ b/data/maps/UnknownMap_082D05D8/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/maps/UnknownMap_082D05D8/map.bin Binary files differnew file mode 100755 index 000000000..37f05b971 --- /dev/null +++ b/data/maps/UnknownMap_082D05D8/map.bin diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/maps/UnknownMap_082D05FC/border.bin new file mode 100755 index 000000000..19d906679 --- /dev/null +++ b/data/maps/UnknownMap_082D05FC/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/maps/UnknownMap_082D05FC/map.bin Binary files differnew file mode 100755 index 000000000..ca93fa0e2 --- /dev/null +++ b/data/maps/UnknownMap_082D05FC/map.bin diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/maps/UnknownMap_082E55C8/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E55C8/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/maps/UnknownMap_082E55C8/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E55C8/map.bin diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/maps/UnknownMap_082E55EC/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E55EC/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/maps/UnknownMap_082E55EC/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E55EC/map.bin diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/maps/UnknownMap_082E5610/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5610/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/maps/UnknownMap_082E5610/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5610/map.bin diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/maps/UnknownMap_082E5634/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5634/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/maps/UnknownMap_082E5634/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5634/map.bin diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/maps/UnknownMap_082E5658/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5658/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/maps/UnknownMap_082E5658/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5658/map.bin diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/maps/UnknownMap_082E567C/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E567C/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/maps/UnknownMap_082E567C/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E567C/map.bin diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/maps/UnknownMap_082E56A0/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E56A0/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/maps/UnknownMap_082E56A0/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E56A0/map.bin diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/maps/UnknownMap_082E56C4/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E56C4/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/maps/UnknownMap_082E56C4/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E56C4/map.bin diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/maps/UnknownMap_082E56E8/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E56E8/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/maps/UnknownMap_082E56E8/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E56E8/map.bin diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/maps/UnknownMap_082E570C/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E570C/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/maps/UnknownMap_082E570C/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E570C/map.bin diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/maps/UnknownMap_082E5730/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5730/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/maps/UnknownMap_082E5730/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5730/map.bin diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/maps/UnknownMap_082E5754/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5754/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/maps/UnknownMap_082E5754/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5754/map.bin diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/maps/UnknownMap_082E5778/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E5778/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/maps/UnknownMap_082E5778/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E5778/map.bin diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/maps/UnknownMap_082E579C/border.bin new file mode 100755 index 000000000..b15c94f96 --- /dev/null +++ b/data/maps/UnknownMap_082E579C/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/maps/UnknownMap_082E579C/map.bin Binary files differnew file mode 100755 index 000000000..22a47d94e --- /dev/null +++ b/data/maps/UnknownMap_082E579C/map.bin diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/maps/UnknownMap_082EDF30/border.bin new file mode 100755 index 000000000..9e4b3fb7a --- /dev/null +++ b/data/maps/UnknownMap_082EDF30/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/maps/UnknownMap_082EDF30/map.bin new file mode 100755 index 000000000..028da0526 --- /dev/null +++ b/data/maps/UnknownMap_082EDF30/map.bin @@ -0,0 +1,3 @@ +22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666
662222222222222222222222222
+2266662BBBB2222222222222222222222222666666BBBB66BBBB22222226666 6622222g2g2g2g2g2g2g2g22222222222202 GG 2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222 +IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22
22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,- 222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222
\ No newline at end of file diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/maps/UnknownMap_082FF894/border.bin new file mode 100755 index 000000000..f1629c020 --- /dev/null +++ b/data/maps/UnknownMap_082FF894/border.bin @@ -0,0 +1 @@ +3333
\ No newline at end of file diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/maps/UnknownMap_082FF894/map.bin Binary files differnew file mode 100755 index 000000000..fd294d9b6 --- /dev/null +++ b/data/maps/UnknownMap_082FF894/map.bin diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/maps/UnknownMap_08302970/border.bin new file mode 100755 index 000000000..c3fe51511 --- /dev/null +++ b/data/maps/UnknownMap_08302970/border.bin @@ -0,0 +1 @@ +pppp
\ No newline at end of file diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/maps/UnknownMap_08302970/map.bin new file mode 100755 index 000000000..dd82c58d3 --- /dev/null +++ b/data/maps/UnknownMap_08302970/map.bin @@ -0,0 +1 @@ +qqqqqqqqqqqt||}ut|}ppp{qs{$14$1$1$1$14$1$1uuqupppppppppppppqqqqqqqqt||}qqt}uppppp{{s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppsqs{$1$1$14$1t|}quupppppppppppppqqqqqt|||}qt}pppppppppPesq{{4$1$1t}qt|}uppppppppppppppqqt||}qqqt|}ppppppppppXm{q{{|||}qt}t|}pppppppppppppp||}qt|||}ppuvpppppPQp{q{|}qupppppppppppppp|}uvpu{vp}~pppppXYpp{|0|}ppppppppppppppppZ[ppppp}~pzq|pppppppppPQpp$1$1$1$1$1Z[ppppPQpppppppppppXYppppuvppppypppppppuvXYppppp$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppppuvyq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppy}~ppuvpppppu|ppppppppuqqvpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|ppppppppyyyyPQppppppppppppppppppppuvpppppppppppppppppuvypppppppuvpppppXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|pppppppppppPQppppppppppppppppppppppp}~pppppppppppppppppyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/maps/UnknownMap_083041B4/border.bin new file mode 100755 index 000000000..f0eabd248 --- /dev/null +++ b/data/maps/UnknownMap_083041B4/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/maps/UnknownMap_083041B4/map.bin new file mode 100755 index 000000000..ec344933f --- /dev/null +++ b/data/maps/UnknownMap_083041B4/map.bin @@ -0,0 +1 @@ +2222222222222222222222222222222222222222222222222222222222222222222222222222222 222222 22222222222 222222
222
222
2222222
2222222222
2222222 #
222 #2222 #
2222
2222 #
2222
efg
222 #
esdrfg
222efsd_ddrfg222qdd_d__ddp222 qd______dp22222es_d____d_p22222
qdd______dp22222222#2#2bdd_d_d_dp222222222#2b_d_d_`a3a3#222222222#2a3a3a3a3a3#22222222222222222222222
\ No newline at end of file diff --git a/data/maps/UnreferencedMap/border.bin b/data/maps/UnreferencedMap/border.bin new file mode 100755 index 000000000..c3fe51511 --- /dev/null +++ b/data/maps/UnreferencedMap/border.bin @@ -0,0 +1 @@ +pppp
\ No newline at end of file diff --git a/data/maps/UnreferencedMap/map.bin b/data/maps/UnreferencedMap/map.bin new file mode 100755 index 000000000..17a14a8d5 --- /dev/null +++ b/data/maps/UnreferencedMap/map.bin @@ -0,0 +1 @@ +pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp00000000000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000
0
0
0000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000
0
0
0
0
0
0
0
0000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppps00000
0
0
0
0
0
0
0
0
0
000rpppppppppppppppppppppppppppppppppppppppppppppppppppppppp000000
0
0
0
0
0
0
0
0
0
0
00000ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp000000
0
0
0
0
0
0
0
0
0
0
0
00000ppppPQpppppppppppppppppppppprqkllmqvppppuvppppPQprs000000
0
0
0
0
0
0
0
0
0
0
01110utpPQXYpppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vXYrss0000000000
0
0
0
0
0
0
0 1 5
10uutXYpuvpu{{qklllmqvppppuvq{|||}qt}~pppppzq|}sss00000000004400
0
0
0
0
01110uuu~p}~pzqqqkklmmqvppp}~pyqqqtyppu{{vppyfsss00000000000444400
0
0
00000uuugppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|puvppfsss000000000004444440
000000uuuguv}~qq{qqqt}qtppXYpppuvppppppuvyyp}~ppfss{|||00000000444444400t|||}uug}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQppppfs{s000000000444444400ut}ugppppPQpyypp}~q|ppppppppppPQppppXYppuvf{ss000000000044444400uut}gppppXYppppppppuvppppyppppppppppXYpppppppp}~nss{|||0000004444t|||}uutopuvppppppppppp}~ppppppppppppppppppppppppuvpp1$1$1$1s{{||0000t||}t}ur$1$1$11p}~pppppuvppppppppppppuvpppppppppppppppp}~pp111$1{{{|22|}t}t}r$1$1$11pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp111$1{{22}t}t$1$1$11ppppppppppppppppppppuvppztppppppp}~pppppppp111$1$1$1"10x{22}tz00 1$1$1$111pppppppppppppppppppp}~pppppppppppppppppppp111$1"10000x22z00000 1$1$111pppppppppppppppppppppppppppppppppppppppppppppp111$1$1100000000000000000001$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp111$1$1!11000000000000000011$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1!11100000000000111$1$1$1$1111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1$1"100000000011$1$1$1$1$1$11111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1111111111$1$1$1$1$1$1$1$111pppppppppPQpppppppuvpppppppppppppppppppppppppppppp1111$1$1$1$1$1$1$1$1$1$1$1$1$1$111111111ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp11111$1$1$1$1$1$1$1$1$1$1$1$11111ppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppp11111111111111111111ppppppppppppppu{{qqqqqqv}~qqtpPQppppppppppppppppppppppppppppppppuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/_assets.s b/data/maps/_assets.s index 9a3b742eb..a9cc15869 100644 --- a/data/maps/_assets.s +++ b/data/maps/_assets.s @@ -674,10 +674,10 @@ Route129_MapAttributes:: @ 82BD8C4 .4byte gTileset_Mossdeep UnreferencedMap_MapBorder: @ 82BD8DC - .incbin "baserom.gba", 0x2bd8dc, 8 + .incbin "data/maps/UnreferencedMap/border.bin" UnreferencedMap_MapBlockdata: @ 82BD8E4 - .incbin "baserom.gba", 0x2bd8e4, 0x1900 + .incbin "data/maps/UnreferencedMap/map.bin" .align 2 UnreferencedMap_MapAttributes:: @ 82BF1E4 @@ -1115,7 +1115,20 @@ LilycoveCity_House2_MapAttributes:: @ 82CF540 .4byte gTileset_Building .4byte gTileset_GenericBuilding - .incbin "baserom.gba", 0x2cf558, 0x24 +UnknownMapBorder_082CF564: + .incbin "data/maps/UnknownMap_082CF564/border.bin" + +UnknownMapBlockdata_082CF564: + .incbin "data/maps/UnknownMap_082CF564/map.bin" + + .align 2 +UnknownMapAttributes_082CF564:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082CF564 + .4byte UnknownMapBlockdata_082CF564 + .4byte gTileset_Building + .4byte gTileset_Contest VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" @@ -1227,7 +1240,35 @@ SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4 .4byte gTileset_General .4byte gTileset_Facility - .incbin "baserom.gba", 0x2d05cc, 0x48 +UnknownMapBorder_082D05D8:: + .incbin "data/maps/UnknownMap_082D05D8/border.bin" + +UnknownMapBlockdata_082D05D8:: + .incbin "data/maps/UnknownMap_082D05D8/map.bin" + + .align 2 +UnknownMapAttributes_082D05D8:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082D05D8 + .4byte UnknownMapBlockdata_082D05D8 + .4byte gTileset_Building + .4byte gTileset_Contest + +UnknownMapBorder_082D05FC:: + .incbin "data/maps/UnknownMap_082D05FC/border.bin" + +UnknownMapBlockdata_082D05FC:: + .incbin "data/maps/UnknownMap_082D05FC/map.bin" + + .align 2 +UnknownMapAttributes_082D05FC:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082D05FC + .4byte UnknownMapBlockdata_082D05FC + .4byte gTileset_Building + .4byte gTileset_Contest SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614 .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" @@ -2528,8 +2569,216 @@ ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4 .4byte ShoalCave_HighTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + +UnknownMapBorder_082E55C8: + .incbin "data/maps/UnknownMap_082E55C8/border.bin" + +UnknownMapBlockdata_082E55C8: + .incbin "data/maps/UnknownMap_082E55C8/map.bin" + + .align 2 +UnknownMapAttributes_082E55C8: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E55C8 + .4byte UnknownMapBlockdata_082E55C8 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E55EC: + .incbin "data/maps/UnknownMap_082E55EC/border.bin" + +UnknownMapBlockdata_082E55EC: + .incbin "data/maps/UnknownMap_082E55EC/map.bin" + + .align 2 +UnknownMapAttributes_082E55EC: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E55EC + .4byte UnknownMapBlockdata_082E55EC + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5610: + .incbin "data/maps/UnknownMap_082E5610/border.bin" + +UnknownMapBlockdata_082E5610: + .incbin "data/maps/UnknownMap_082E5610/map.bin" + + .align 2 +UnknownMapAttributes_082E5610: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5610 + .4byte UnknownMapBlockdata_082E5610 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5634: + .incbin "data/maps/UnknownMap_082E5634/border.bin" + +UnknownMapBlockdata_082E5634: + .incbin "data/maps/UnknownMap_082E5634/map.bin" + + .align 2 +UnknownMapAttributes_082E5634: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5634 + .4byte UnknownMapBlockdata_082E5634 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5658: + .incbin "data/maps/UnknownMap_082E5658/border.bin" + +UnknownMapBlockdata_082E5658: + .incbin "data/maps/UnknownMap_082E5658/map.bin" + + .align 2 +UnknownMapAttributes_082E5658: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5658 + .4byte UnknownMapBlockdata_082E5658 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E567C: + .incbin "data/maps/UnknownMap_082E567C/border.bin" + +UnknownMapBlockdata_082E567C: + .incbin "data/maps/UnknownMap_082E567C/map.bin" + + .align 2 +UnknownMapAttributes_082E567C: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E567C + .4byte UnknownMapBlockdata_082E567C + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E56A0: + .incbin "data/maps/UnknownMap_082E56A0/border.bin" + +UnknownMapBlockdata_082E56A0: + .incbin "data/maps/UnknownMap_082E56A0/map.bin" + + .align 2 +UnknownMapAttributes_082E56A0: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E56A0 + .4byte UnknownMapBlockdata_082E56A0 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E56C4: + .incbin "data/maps/UnknownMap_082E56C4/border.bin" + +UnknownMapBlockdata_082E56C4: + .incbin "data/maps/UnknownMap_082E56C4/map.bin" + + .align 2 +UnknownMapAttributes_082E56C4: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E56C4 + .4byte UnknownMapBlockdata_082E56C4 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E56E8: + .incbin "data/maps/UnknownMap_082E56E8/border.bin" + +UnknownMapBlockdata_082E56E8: + .incbin "data/maps/UnknownMap_082E56E8/map.bin" + + .align 2 +UnknownMapAttributes_082E56E8: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E56E8 + .4byte UnknownMapBlockdata_082E56E8 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E570C: + .incbin "data/maps/UnknownMap_082E570C/border.bin" + +UnknownMapBlockdata_082E570C: + .incbin "data/maps/UnknownMap_082E570C/map.bin" + + .align 2 +UnknownMapAttributes_082E570C: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E570C + .4byte UnknownMapBlockdata_082E570C + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5730: + .incbin "data/maps/UnknownMap_082E5730/border.bin" + +UnknownMapBlockdata_082E5730: + .incbin "data/maps/UnknownMap_082E5730/map.bin" + + .align 2 +UnknownMapAttributes_082E5730: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5730 + .4byte UnknownMapBlockdata_082E5730 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5754: + .incbin "data/maps/UnknownMap_082E5754/border.bin" + +UnknownMapBlockdata_082E5754: + .incbin "data/maps/UnknownMap_082E5754/map.bin" + + .align 2 +UnknownMapAttributes_082E5754: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5754 + .4byte UnknownMapBlockdata_082E5754 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E5778: + .incbin "data/maps/UnknownMap_082E5778/border.bin" + +UnknownMapBlockdata_082E5778: + .incbin "data/maps/UnknownMap_082E5778/map.bin" + + .align 2 +UnknownMapAttributes_082E5778: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E5778 + .4byte UnknownMapBlockdata_082E5778 + .4byte gTileset_General + .4byte gTileset_Cave + +UnknownMapBorder_082E579C: + .incbin "data/maps/UnknownMap_082E579C/border.bin" - .incbin "baserom.gba", 0x2e55bc, 0x1f8 +UnknownMapBlockdata_082E579C: + .incbin "data/maps/UnknownMap_082E579C/map.bin" + + .align 2 +UnknownMapAttributes_082E579C: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMapBorder_082E579C + .4byte UnknownMapBlockdata_082E579C + .4byte gTileset_General + .4byte gTileset_Cave NewMauville_Entrance_MapBorder:: @ 82E57B4 .incbin "data/maps/NewMauville_Entrance/border.bin" @@ -3401,7 +3650,20 @@ SafariZone_Southeast_MapAttributes:: @ 82ED348 .4byte gTileset_General .4byte gTileset_Lilycove - .incbin "baserom.gba", 0x2ed360, 0xbe8 +UnknownMapBorder_082EDF30: + .incbin "data/maps/UnknownMap_082EDF30/border.bin" + +UnknownMapBlockdata_082EDF30: + .incbin "data/maps/UnknownMap_082EDF30/map.bin" + + .align 2 +UnknownMapAttributes_082EDF30: + .4byte 0x3A + .4byte 0x1A + .4byte UnknownMapBorder_082EDF30 + .4byte UnknownMapBlockdata_082EDF30 + .4byte gTileset_General + .4byte 0 Route109_SeashoreHouse_MapBorder:: @ 82EDF48 .incbin "data/maps/Route109_SeashoreHouse/border.bin" @@ -4443,7 +4705,20 @@ ScorchedSlab_MapAttributes:: @ 82FF5A0 .4byte gTileset_General .4byte gTileset_Cave - .incbin "baserom.gba", 0x2ff5b8, 0x2f4 +UnknownMapBorder_082FF894: + .incbin "data/maps/UnknownMap_082FF894/border.bin" + +UnknownMapBlockdata_082FF894: + .incbin "data/maps/UnknownMap_082FF894/map.bin" + + .align 2 +UnknownMapAttributes_082FF894: + .4byte 0x13 + .4byte 0x13 + .4byte UnknownMapBorder_082FF894 + .4byte UnknownMapBlockdata_082FF894 + .4byte gTileset_General + .4byte gTileset_Cave RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" @@ -4535,7 +4810,20 @@ MagmaHideout_B2F_MapAttributes:: @ 8301690 .4byte gTileset_General .4byte gTileset_Facility - .incbin "baserom.gba", 0x3016a8, 0x12e0 +UnknownMapBorder_08302970: + .incbin "data/maps/UnknownMap_08302970/border.bin" + +UnknownMapBlockdata_08302970: + .incbin "data/maps/UnknownMap_08302970/map.bin" + + .align 2 +UnknownMapAttributes_08302970: + .4byte 0x3C + .4byte 0x28 + .4byte UnknownMapBorder_08302970 + .4byte UnknownMapBlockdata_08302970 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_Entrance_MapBorder:: @ 8302988 .incbin "data/maps/SkyPillar_Entrance/border.bin" @@ -4627,7 +4915,20 @@ SkyPillar_4F_MapAttributes:: @ 83037E0 .4byte gTileset_General .4byte gTileset_Pacifidlog - .incbin "baserom.gba", 0x3037f8, 0x9d4 +UnknownMapBorder_083041B4: + .incbin "data/maps/UnknownMap_083041B4/border.bin" + +UnknownMapBlockdata_083041B4: + .incbin "data/maps/UnknownMap_083041B4/map.bin" + + .align 2 +UnknownMapAttributes_083041B4: + .4byte 0x1B + .4byte 0x2E + .4byte UnknownMapBorder_083041B4 + .4byte UnknownMapBlockdata_083041B4 + .4byte gTileset_General + .4byte gTileset_Cave MossdeepCity_StevensHouse_MapBorder:: @ 83041CC .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" diff --git a/data/script_cmd_table.s b/data/script_cmd_table.s index 505b2fe84..696b20f40 100644 --- a/data/script_cmd_table.s +++ b/data/script_cmd_table.s @@ -119,7 +119,7 @@ gScriptCmdTable:: @ 814AE30 .4byte s6F_multichoice .4byte sub_8067298 .4byte s76_close_picture_box - .4byte sub_80672E8 + .4byte s77_showcontestwinner .4byte sub_806730C .4byte s79_give_pokemon .4byte s7A_create_egg diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.s index 46e4633c8..41a14fa28 100644 --- a/data/scripts/maps/Route110.s +++ b/data/scripts/maps/Route110.s @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - playmusicbattle 403 + playmusicbattle 403 @ Bicycle music return Route110_MapScript2_14F933:: @ 814F933 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s index 641c32d55..0dbd5dfc4 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s @@ -21,8 +21,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 +@ Coord event directly in front of the gatesman heading left to right lockall - specialval RESULT, 227 + specialval RESULT, 227 @ player state? compare RESULT, 2 callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 @@ -33,10 +34,12 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D +@ You're on the Mach Bike! setvar 0x40a9, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 +@ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 closebutton move 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 @@ -49,6 +52,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 step_end Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A +@ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 clearflag 2091 diff --git a/graphics/battle_transitions/vs.pal b/graphics/battle_transitions/vs.pal new file mode 100755 index 000000000..f4f6cb4e3 --- /dev/null +++ b/graphics/battle_transitions/vs.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +255 255 255 +238 246 238 +222 238 230 +213 230 213 +197 230 205 +189 222 189 +172 213 180 +164 213 172 +148 156 123 +115 106 90 +90 57 65 +222 49 8 +213 106 74 +205 164 139 +213 213 213 +0 0 0 +255 255 255 +213 246 205 +172 246 156 +139 246 106 +106 213 74 +74 180 41 +41 148 8 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +172 98 8 +90 82 106 +172 98 8 +0 0 172 +0 0 0 +246 246 222 +230 213 222 +222 180 222 +205 148 222 +197 123 222 +180 90 222 +172 57 222 +156 24 222 +148 0 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +230 238 246 +213 230 246 +197 222 238 +180 213 238 +164 205 230 +148 197 230 +131 189 230 +0 0 0 +0 0 0 +0 0 0 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +0 0 0 +189 131 65 +197 131 98 +222 189 131 +123 82 24 +0 0 0 +0 0 0 +180 123 123 +238 222 172 +189 131 65 +65 32 0 +255 0 0 +106 180 213 +41 123 164 +123 148 49 +246 246 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 +0 0 0 +0 0 0 +230 123 139 +164 49 115 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png Binary files differnew file mode 100755 index 000000000..a1badcb02 --- /dev/null +++ b/graphics/battle_transitions/vs.png diff --git a/graphics/interface/battle_window.pal b/graphics/interface/battle_window.pal new file mode 100755 index 000000000..bc8e8f2bc --- /dev/null +++ b/graphics/interface/battle_window.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 65 65 +255 255 222 +222 213 180 +197 189 115 +123 148 131 +82 106 98 +32 57 0 +57 82 65 +255 230 0 +255 156 148 +65 205 255 +0 0 255 +0 255 0 +255 0 0 +106 148 255 diff --git a/graphics/interface/battle_window.png b/graphics/interface/battle_window.png Binary files differnew file mode 100755 index 000000000..2117967ec --- /dev/null +++ b/graphics/interface/battle_window.png diff --git a/graphics/interface/battle_window2.png b/graphics/interface/battle_window2.png Binary files differnew file mode 100755 index 000000000..ac084b2e5 --- /dev/null +++ b/graphics/interface/battle_window2.png diff --git a/graphics/interface/battle_window3.png b/graphics/interface/battle_window3.png Binary files differnew file mode 100755 index 000000000..f45e2f714 --- /dev/null +++ b/graphics/interface/battle_window3.png diff --git a/graphics/interface/battle_window4.png b/graphics/interface/battle_window4.png Binary files differnew file mode 100755 index 000000000..a366186cf --- /dev/null +++ b/graphics/interface/battle_window4.png diff --git a/graphics/interface/battle_window5.png b/graphics/interface/battle_window5.png Binary files differnew file mode 100755 index 000000000..e48f380a4 --- /dev/null +++ b/graphics/interface/battle_window5.png diff --git a/graphics/interface/blank.pal b/graphics/interface/blank.pal new file mode 100755 index 000000000..9757f2e57 --- /dev/null +++ b/graphics/interface/blank.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +148 255 164 +139 246 115 +65 205 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 205 +74 74 74 diff --git a/graphics/interface/hold_icons.pal b/graphics/interface/hold_icons.pal new file mode 100755 index 000000000..e31d717c9 --- /dev/null +++ b/graphics/interface/hold_icons.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 205 106 +255 255 255 +213 213 255 +148 148 180 +255 246 156 +222 222 115 +246 82 41 +164 90 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 98 98 diff --git a/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png Binary files differnew file mode 100755 index 000000000..53eeedde3 --- /dev/null +++ b/graphics/interface/hold_icons.png diff --git a/graphics/interface/money.pal b/graphics/interface/money.pal new file mode 100755 index 000000000..3fa8d8cff --- /dev/null +++ b/graphics/interface/money.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +115 98 98 +65 57 41 +57 106 139 +106 180 49 +255 230 164 +255 205 164 +230 180 123 +255 205 0 +205 180 0 +255 230 0 +0 0 0 diff --git a/graphics/interface/money.png b/graphics/interface/money.png Binary files differnew file mode 100755 index 000000000..5ad533dbf --- /dev/null +++ b/graphics/interface/money.png diff --git a/graphics/interface/pokeblock_device.pal b/graphics/interface/pokeblock_device.pal new file mode 100755 index 000000000..a491b61af --- /dev/null +++ b/graphics/interface/pokeblock_device.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 156 255 +82 90 106 +205 197 222 +90 123 148 +90 164 172 +98 189 222 +172 213 238 +197 148 98 +197 197 49 +98 197 98 +255 197 148 +49 148 246 +172 98 82 +246 123 90 +164 156 180 +246 246 246 diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png Binary files differnew file mode 100755 index 000000000..65b29a8b3 --- /dev/null +++ b/graphics/interface/pokeblock_device.png diff --git a/graphics/interface/status_icons.pal b/graphics/interface/status_icons.pal new file mode 100755 index 000000000..718f5bb77 --- /dev/null +++ b/graphics/interface/status_icons.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 189 131 +57 57 57 +255 255 255 +222 222 222 +197 98 197 +205 131 205 +189 189 24 +205 205 131 +164 164 139 +180 180 148 +139 180 230 +156 197 246 +230 115 82 +255 139 106 +238 82 57 +255 123 98 diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png Binary files differnew file mode 100755 index 000000000..f319d5566 --- /dev/null +++ b/graphics/interface/status_icons.png diff --git a/graphics/interface/summary_frames.pal b/graphics/interface/summary_frames.pal new file mode 100755 index 000000000..d46aa6c8f --- /dev/null +++ b/graphics/interface/summary_frames.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 0 +148 148 0 +49 172 255 +49 98 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 82 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/interface/summary_frames.png b/graphics/interface/summary_frames.png Binary files differnew file mode 100755 index 000000000..d3c9a2c08 --- /dev/null +++ b/graphics/interface/summary_frames.png diff --git a/graphics/interface/wordgroup.pal b/graphics/interface/wordgroup.pal new file mode 100755 index 000000000..0d067c9e2 --- /dev/null +++ b/graphics/interface/wordgroup.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.png Binary files differnew file mode 100755 index 000000000..9cf90dbf1 --- /dev/null +++ b/graphics/interface/wordgroup.png diff --git a/graphics/misc/applause.png b/graphics/misc/applause.png Binary files differnew file mode 100755 index 000000000..32b1748a0 --- /dev/null +++ b/graphics/misc/applause.png diff --git a/graphics/misc/confetti.pal b/graphics/misc/confetti.pal new file mode 100755 index 000000000..f2494e508 --- /dev/null +++ b/graphics/misc/confetti.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 57 57 +156 0 0 +164 222 255 +49 82 255 +255 255 115 +230 106 0 +255 255 255 +189 189 197 +139 246 115 +65 205 57 +255 123 180 +197 49 131 +65 74 106 +0 0 0 +0 0 0 diff --git a/graphics/misc/confetti.png b/graphics/misc/confetti.png Binary files differnew file mode 100755 index 000000000..ef8b921d8 --- /dev/null +++ b/graphics/misc/confetti.png diff --git a/graphics/misc/judge.pal b/graphics/misc/judge.pal new file mode 100755 index 000000000..e62f2abd3 --- /dev/null +++ b/graphics/misc/judge.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 197 164 +255 222 205 +222 180 148 +172 115 90 +238 238 238 +90 57 57 +57 49 65 +0 0 0 +82 90 8 +57 65 16 +222 82 82 +246 197 49 +246 230 139 +131 131 148 +164 164 180 +205 205 222 diff --git a/graphics/misc/judge.png b/graphics/misc/judge.png Binary files differnew file mode 100755 index 000000000..c4dcf520b --- /dev/null +++ b/graphics/misc/judge.png diff --git a/graphics/misc/judge_symbols.pal b/graphics/misc/judge_symbols.pal new file mode 100755 index 000000000..3eeaa1128 --- /dev/null +++ b/graphics/misc/judge_symbols.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 diff --git a/graphics/misc/judge_symbols.png b/graphics/misc/judge_symbols.png Binary files differnew file mode 100755 index 000000000..7669fb88b --- /dev/null +++ b/graphics/misc/judge_symbols.png diff --git a/graphics/misc/nextturn.pal b/graphics/misc/nextturn.pal new file mode 100755 index 000000000..05991c79e --- /dev/null +++ b/graphics/misc/nextturn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 90 16 +246 189 115 +255 222 115 +255 255 156 +255 49 24 +213 16 0 +246 156 222 +255 0 90 +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/nextturn.png b/graphics/misc/nextturn.png Binary files differnew file mode 100755 index 000000000..747c4b5a7 --- /dev/null +++ b/graphics/misc/nextturn.png diff --git a/graphics/misc/pokeblock.png b/graphics/misc/pokeblock.png Binary files differnew file mode 100755 index 000000000..fd24e0621 --- /dev/null +++ b/graphics/misc/pokeblock.png diff --git a/graphics/pokedex/arrows.pal b/graphics/pokedex/arrows.pal new file mode 100755 index 000000000..256cee631 --- /dev/null +++ b/graphics/pokedex/arrows.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +255 0 0 +230 0 0 +213 0 0 +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 +197 197 197 +0 0 0 +255 255 255 diff --git a/graphics/pokedex/arrows.png b/graphics/pokedex/arrows.png Binary files differnew file mode 100755 index 000000000..fe992db2f --- /dev/null +++ b/graphics/pokedex/arrows.png diff --git a/graphics/roulette/center.pal b/graphics/roulette/center.pal new file mode 100755 index 000000000..5eb074037 --- /dev/null +++ b/graphics/roulette/center.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +41 41 41 +123 123 131 +172 180 197 +255 255 255 +238 238 156 +189 180 106 +131 90 32 +255 131 90 +189 106 98 +230 222 255 +74 189 156 +255 255 255 +123 180 172 +255 255 255 +255 255 255 diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png Binary files differnew file mode 100755 index 000000000..0653b0e97 --- /dev/null +++ b/graphics/roulette/center.png diff --git a/graphics/unknown/ball.pal b/graphics/unknown/ball.pal new file mode 100755 index 000000000..b4e7ac7ca --- /dev/null +++ b/graphics/unknown/ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 106 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 diff --git a/graphics/unknown/ball.png b/graphics/unknown/ball.png Binary files differnew file mode 100755 index 000000000..9932b916d --- /dev/null +++ b/graphics/unknown/ball.png diff --git a/graphics/unused/numbers.pal b/graphics/unused/numbers.pal new file mode 100755 index 000000000..3955aa77a --- /dev/null +++ b/graphics/unused/numbers.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 diff --git a/graphics/unused/numbers.png b/graphics/unused/numbers.png Binary files differnew file mode 100755 index 000000000..2c816c426 --- /dev/null +++ b/graphics/unused/numbers.png @@ -11,15 +11,12 @@ BTLANMSPRGFXDIR := graphics/battle_anims/sprites PICFRAMEGFXDIR := graphics/picture_frame $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal - @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ $(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp - @cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@ $(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp - @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ $(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png @@ -165,3 +162,6 @@ $(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 + $(GFX) $< $@ -num_tiles 8 |
