diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index 30334387..ad7c8667 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -248,54 +248,30 @@ _08001374: .4byte sub_080AF1BC _08001378: .4byte GetFacingDirection gUnk_0800137C:: @ 0800137C - .incbin "baserom.gba", 0x00137C, 0x0000004 - .incbin "baserom.gba", 0x001380, 0x0000074 - .incbin "baserom.gba", 0x0013F4, 0x000000C - .incbin "baserom.gba", 0x001400, 0x0000006 - .incbin "baserom.gba", 0x001406, 0x000000A - .incbin "baserom.gba", 0x001410, 0x000000C - .incbin "baserom.gba", 0x00141C, 0x0000020 + .incbin "baserom.gba", 0x00137C, 0x00000C0 gUnk_0800143C:: @ 0800143C - .incbin "baserom.gba", 0x00143C, 0x00000E5 - .incbin "baserom.gba", 0x001521, 0x0000012 - .incbin "baserom.gba", 0x001533, 0x000000D - .incbin "baserom.gba", 0x001540, 0x000007C + .incbin "baserom.gba", 0x00143C, 0x0000180 gUnk_080015BC:: @ 080015BC - .incbin "baserom.gba", 0x0015BC, 0x0000035 - .incbin "baserom.gba", 0x0015F1, 0x000002B + .incbin "baserom.gba", 0x0015BC, 0x0000060 gUnk_0800161C:: @ 0800161C - .incbin "baserom.gba", 0x00161C, 0x000001B - .incbin "baserom.gba", 0x001637, 0x00000C9 - .incbin "baserom.gba", 0x001700, 0x0000001 - .incbin "baserom.gba", 0x001701, 0x0000001 + .incbin "baserom.gba", 0x00161C, 0x00000E6 .ifdef EU @ TODO only small differences .incbin "baserom_eu.gba", 0x00174A, 0x0000014 .else .incbin "baserom.gba", 0x001702, 0x0000014 .endif - .incbin "baserom.gba", 0x001716, 0x0000017 - .incbin "baserom.gba", 0x00172D, 0x00000D4 - .incbin "baserom.gba", 0x001801, 0x000000F - .incbin "baserom.gba", 0x001810, 0x0000008 - .incbin "baserom.gba", 0x001818, 0x0000027 - .incbin "baserom.gba", 0x00183F, 0x0000005 - .incbin "baserom.gba", 0x001844, 0x0000006 - .incbin "baserom.gba", 0x00184A, 0x0000006 - .incbin "baserom.gba", 0x001850, 0x0000010 - .incbin "baserom.gba", 0x001860, 0x0000040 - .incbin "baserom.gba", 0x0018A0, 0x0000004 + .incbin "baserom.gba", 0x001716, 0x000018E .ifdef EU - .incbin "baserom_eu.gba", 0x0018EC, 0x7E + .incbin "baserom_eu.gba", 0x0018EC, 0x000007E .else .incbin "baserom.gba", 0x0018A4, 0x000005E .endif - .incbin "baserom.gba", 0x001902, 0x000000F - .incbin "baserom.gba", 0x001911, 0x000000B + .incbin "baserom.gba", 0x001902, 0x000001A gUnk_0800191C:: @ 0800191C .ifdef EU @@ -304,9 +280,7 @@ gUnk_0800191C:: @ 0800191C .else .incbin "baserom.gba", 0x00191C, 0x000004F .endif - .incbin "baserom.gba", 0x00196B, 0x0000015 - .incbin "baserom.gba", 0x001980, 0x0000098 - .incbin "baserom.gba", 0x001A18, 0x0000004 + .incbin "baserom.gba", 0x00196B, 0x00000B1 gUnk_08001A1C:: @ 08001A1C .incbin "baserom.gba", 0x001A1C, 0x0000060 @@ -467,8 +441,7 @@ gUnk_08001C98:: @ 08001C98 .incbin "baserom.gba", 0x001C98, 0x0000006 gUnk_08001C9E:: @ 08001C9E - .incbin "baserom.gba", 0x001C9E, 0x0000002 - .incbin "baserom.gba", 0x001CA0, 0x0000004 + .incbin "baserom.gba", 0x001C9E, 0x0000006 gUnk_08001CA4:: @ 08001CA4 .incbin "baserom.gba", 0x001CA4, 0x0000006 @@ -519,12 +492,10 @@ gUnk_08001CFE:: @ 08001CFE .incbin "baserom.gba", 0x001CFE, 0x0000006 gUnk_08001D04:: @ 08001D04 - .incbin "baserom.gba", 0x001D04, 0x0000001 - .incbin "baserom.gba", 0x001D05, 0x0000005 + .incbin "baserom.gba", 0x001D04, 0x0000006 gUnk_08001D0A:: @ 08001D0A - .incbin "baserom.gba", 0x001D0A, 0x0000006 - .incbin "baserom.gba", 0x001D10, 0x0000006 + .incbin "baserom.gba", 0x001D0A, 0x000000C gUnk_08001D16:: @ 08001D16 .incbin "baserom.gba", 0x001D16, 0x0000006 @@ -542,8 +513,7 @@ gUnk_08001D2E:: @ 08001D2E .incbin "baserom.gba", 0x001D2E, 0x0000006 gUnk_08001D34:: @ 08001D34 - .incbin "baserom.gba", 0x001D34, 0x0000002 - .incbin "baserom.gba", 0x001D36, 0x0000004 + .incbin "baserom.gba", 0x001D34, 0x0000006 gUnk_08001D3A:: @ 08001D3A .incbin "baserom.gba", 0x001D3A, 0x0000006 @@ -770,9 +740,7 @@ gUnk_08001FF8:: @ 08001FF8 .incbin "baserom.gba", 0x001FF8, 0x0000007 gUnk_08001FFF:: @ 08001FFF - .incbin "baserom.gba", 0x001FFF, 0x0000001 - .incbin "baserom.gba", 0x002000, 0x0000005 - .incbin "baserom.gba", 0x002005, 0x0000001 + .incbin "baserom.gba", 0x001FFF, 0x0000007 gUnk_08002006:: @ 08002006 .incbin "baserom.gba", 0x002006, 0x0000007 @@ -823,8 +791,7 @@ gUnk_08002071:: @ 08002071 .incbin "baserom.gba", 0x002071, 0x0000009 gUnk_0800207A:: @ 0800207A - .incbin "baserom.gba", 0x00207A, 0x0000006 - .incbin "baserom.gba", 0x002080, 0x0000001 + .incbin "baserom.gba", 0x00207A, 0x0000007 gUnk_08002081:: @ 08002081 .incbin "baserom.gba", 0x002081, 0x0000009 @@ -839,8 +806,7 @@ gUnk_08002098:: @ 08002098 .incbin "baserom.gba", 0x002098, 0x0000007 gUnk_0800209F:: @ 0800209F - .incbin "baserom.gba", 0x00209F, 0x0000001 - .incbin "baserom.gba", 0x0020A0, 0x0000006 + .incbin "baserom.gba", 0x00209F, 0x0000007 gUnk_080020A6:: @ 080020A6 .incbin "baserom.gba", 0x0020A6, 0x0000007 @@ -906,12 +872,10 @@ gUnk_08002135:: @ 08002135 .incbin "baserom.gba", 0x002135, 0x0000008 gUnk_0800213D:: @ 0800213D - .incbin "baserom.gba", 0x00213D, 0x0000006 - .incbin "baserom.gba", 0x002143, 0x0000001 + .incbin "baserom.gba", 0x00213D, 0x0000007 gUnk_08002144:: @ 08002144 - .incbin "baserom.gba", 0x002144, 0x0000001 - .incbin "baserom.gba", 0x002145, 0x0000006 + .incbin "baserom.gba", 0x002144, 0x0000007 gUnk_0800214B:: @ 0800214B .incbin "baserom.gba", 0x00214B, 0x0000007 @@ -1025,8 +989,7 @@ gUnk_0800225C:: @ 0800225C .incbin "baserom.gba", 0x00225C, 0x0000007 gUnk_08002263:: @ 08002263 - .incbin "baserom.gba", 0x002263, 0x0000001 - .incbin "baserom.gba", 0x002264, 0x0000006 + .incbin "baserom.gba", 0x002263, 0x0000007 gUnk_0800226A:: @ 0800226A .incbin "baserom.gba", 0x00226A, 0x0000007 @@ -1104,15 +1067,10 @@ gUnk_0800232C:: @ 0800232C .incbin "baserom.gba", 0x00232C, 0x0000002 gUnk_0800232E:: @ 0800232E - .incbin "baserom.gba", 0x00232E, 0x0000005 - .incbin "baserom.gba", 0x002333, 0x000000F + .incbin "baserom.gba", 0x00232E, 0x0000014 gUnk_08002342:: @ 08002342 - .incbin "baserom.gba", 0x002342, 0x00000CE - .incbin "baserom.gba", 0x002410, 0x0000040 - .incbin "baserom.gba", 0x002450, 0x00000D0 - .incbin "baserom.gba", 0x002520, 0x0000107 - .incbin "baserom.gba", 0x002627, 0x000000B + .incbin "baserom.gba", 0x002342, 0x00002F0 non_word_aligned_thumb_func_start sub_08002632 sub_08002632: @ 0x08002632 diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index 3ef44298..ed91b8d1 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -369,9 +369,7 @@ _0800469C: .4byte 0x00000106 _080046A0: .4byte 0x00000280 gUnk_080046A4:: @ 080046A4 - .incbin "baserom.gba", 0x0046A4, 0x0000063 - .incbin "baserom.gba", 0x004707, 0x0000063 - .incbin "baserom.gba", 0x00476A, 0x000008C + .incbin "baserom.gba", 0x0046A4, 0x0000152 gUnk_080047F6:: @ 080047F6 .incbin "baserom.gba", 0x0047F6, 0x00001E0 @@ -383,15 +381,13 @@ gUnk_080049F6:: @ 080049F6 .incbin "baserom.gba", 0x0049F6, 0x0000008 gUnk_080049FE:: @ gUnk_080049FE - .incbin "baserom.gba", 0x0049FE, 0x0000002 - .incbin "baserom.gba", 0x004A00, 0x000000C + .incbin "baserom.gba", 0x0049FE, 0x000000E gUnk_08004A0C:: @ 08004A0C .incbin "baserom.gba", 0x004A0C, 0x000000A gUnk_08004A16:: @ 08004A16 - .incbin "baserom.gba", 0x004A16, 0x000000A - .incbin "baserom.gba", 0x004A20, 0x0000004 + .incbin "baserom.gba", 0x004A16, 0x000000E gUnk_08004A24:: @ 08004A24 .incbin "baserom.gba", 0x004A24, 0x000000E @@ -415,12 +411,10 @@ gUnk_08004AEC:: @ 08004AEC .incbin "baserom.gba", 0x004AEC, 0x0000005 gUnk_08004AF1:: @ 08004AF1 - .incbin "baserom.gba", 0x004AF1, 0x000000F - .incbin "baserom.gba", 0x004B00, 0x000001A + .incbin "baserom.gba", 0x004AF1, 0x0000029 gUnk_08004B1A:: @ 08004B1A - .incbin "baserom.gba", 0x004B1A, 0x0000009 - .incbin "baserom.gba", 0x004B23, 0x0000020 + .incbin "baserom.gba", 0x004B1A, 0x0000029 gUnk_08004B43:: @ 08004B43 .incbin "baserom.gba", 0x004B43, 0x0000029 @@ -438,11 +432,7 @@ gUnk_08004BEE:: @ 08004BEE .incbin "baserom.gba", 0x004BEE, 0x0000009 gUnk_08004BF7:: @ 08004BF7 - .incbin "baserom.gba", 0x004BF7, 0x0000009 - .incbin "baserom.gba", 0x004C00, 0x0000006 - .incbin "baserom.gba", 0x004C06, 0x000000A - .incbin "baserom.gba", 0x004C10, 0x0000010 - .incbin "baserom.gba", 0x004C20, 0x0000007 + .incbin "baserom.gba", 0x004BF7, 0x0000030 gUnk_08004C27:: @ 08004C27 .incbin "baserom.gba", 0x004C27, 0x0000009 @@ -466,8 +456,7 @@ gUnk_08004D90:: @ 08004D90 .incbin "baserom.gba", 0x004D90, 0x0000055 gUnk_08004DE5:: @ 08004DE5 - .incbin "baserom.gba", 0x004DE5, 0x000002B - .incbin "baserom.gba", 0x004E10, 0x000003E + .incbin "baserom.gba", 0x004DE5, 0x0000069 gUnk_08004E4E:: @ 08004E4E .incbin "baserom.gba", 0x004E4E, 0x0000055 @@ -476,19 +465,16 @@ gUnk_08004EA3:: @ 08004EA3 .incbin "baserom.gba", 0x004EA3, 0x0000069 gUnk_08004F0C:: @ 08004F0C - .incbin "baserom.gba", 0x004F0C, 0x0000014 - .incbin "baserom.gba", 0x004F20, 0x0000041 + .incbin "baserom.gba", 0x004F0C, 0x0000055 gUnk_08004F61:: @ 08004F61 .incbin "baserom.gba", 0x004F61, 0x0000041 gUnk_08004FA2:: @ 08004FA2 - .incbin "baserom.gba", 0x004FA2, 0x0000005 - .incbin "baserom.gba", 0x004FA7, 0x000003C + .incbin "baserom.gba", 0x004FA2, 0x0000041 gUnk_08004FE3:: @ 08004FE3 - .incbin "baserom.gba", 0x004FE3, 0x000003A - .incbin "baserom.gba", 0x00501D, 0x0000007 + .incbin "baserom.gba", 0x004FE3, 0x0000041 gUnk_08005024:: @ 08005024 .incbin "baserom.gba", 0x005024, 0x0000041 @@ -515,8 +501,7 @@ gUnk_080050D7:: @ 080050D7 .incbin "baserom.gba", 0x0050D7, 0x0000034 gUnk_0800510B:: @ 0800510B - .incbin "baserom.gba", 0x00510B, 0x000000D - .incbin "baserom.gba", 0x005118, 0x0000027 + .incbin "baserom.gba", 0x00510B, 0x0000034 gUnk_0800513F:: @ 0800513F .incbin "baserom.gba", 0x00513F, 0x0000034 @@ -540,17 +525,13 @@ gUnk_080051EF:: @ 080051EF .incbin "baserom.gba", 0x0051EF, 0x0000008 gUnk_080051F7:: @ 080051F7 - .incbin "baserom.gba", 0x0051F7, 0x0000009 - .incbin "baserom.gba", 0x005200, 0x0000003 - .incbin "baserom.gba", 0x005203, 0x000000E - .incbin "baserom.gba", 0x005211, 0x0000003 + .incbin "baserom.gba", 0x0051F7, 0x000001D gUnk_08005214:: @ 08005214 .incbin "baserom.gba", 0x005214, 0x000001D gUnk_08005231:: @ 08005231 - .incbin "baserom.gba", 0x005231, 0x000000F - .incbin "baserom.gba", 0x005240, 0x000000E + .incbin "baserom.gba", 0x005231, 0x000001D gUnk_0800524E:: @ 0800524E .incbin "baserom.gba", 0x00524E, 0x0000025 @@ -607,12 +588,10 @@ gUnk_080053B5:: @ 080053B5 .incbin "baserom.gba", 0x0053B5, 0x0000061 gUnk_08005416:: @ 08005416 - .incbin "baserom.gba", 0x005416, 0x000000A - .incbin "baserom.gba", 0x005420, 0x0000057 + .incbin "baserom.gba", 0x005416, 0x0000061 gUnk_08005477:: @ 08005477 - .incbin "baserom.gba", 0x005477, 0x0000010 - .incbin "baserom.gba", 0x005487, 0x0000051 + .incbin "baserom.gba", 0x005477, 0x0000061 gUnk_080054D8:: @ 080054D8 .incbin "baserom.gba", 0x0054D8, 0x000000D @@ -621,10 +600,7 @@ gUnk_080054E5:: @ 080054E5 .incbin "baserom.gba", 0x0054E5, 0x0000010 gUnk_080054F5:: @ 080054F5 - .incbin "baserom.gba", 0x0054F5, 0x0000013 - .incbin "baserom.gba", 0x005508, 0x000003C - .incbin "baserom.gba", 0x005544, 0x0000002 - .incbin "baserom.gba", 0x005546, 0x0000010 + .incbin "baserom.gba", 0x0054F5, 0x0000061 gUnk_08005556:: @ 08005556 .incbin "baserom.gba", 0x005556, 0x000000D @@ -642,10 +618,7 @@ gUnk_080055E1:: @ 080055E1 .incbin "baserom.gba", 0x0055E1, 0x0000010 gUnk_080055F1:: @ 080055F1 - .incbin "baserom.gba", 0x0055F1, 0x0000012 - .incbin "baserom.gba", 0x005603, 0x0000005 - .incbin "baserom.gba", 0x005608, 0x000003A - .incbin "baserom.gba", 0x005642, 0x0000010 + .incbin "baserom.gba", 0x0055F1, 0x0000061 gUnk_08005652:: @ 08005652 .incbin "baserom.gba", 0x005652, 0x0000021 @@ -672,8 +645,7 @@ gUnk_080056EC:: @ 080056EC .incbin "baserom.gba", 0x0056EC, 0x000000D gUnk_080056F9:: @ 080056F9 - .incbin "baserom.gba", 0x0056F9, 0x000000F - .incbin "baserom.gba", 0x005708, 0x000000E + .incbin "baserom.gba", 0x0056F9, 0x000001D gUnk_08005716:: @ 08005716 .incbin "baserom.gba", 0x005716, 0x000001D @@ -700,8 +672,7 @@ gUnk_0800577E:: @ 0800577E .incbin "baserom.gba", 0x00577E, 0x0000014 gUnk_08005792:: @ 08005792 - .incbin "baserom.gba", 0x005792, 0x0000002 - .incbin "baserom.gba", 0x005794, 0x0000006 + .incbin "baserom.gba", 0x005792, 0x0000008 gUnk_0800579A:: @ 0800579A .incbin "baserom.gba", 0x00579A, 0x0000005 @@ -716,12 +687,10 @@ gUnk_080057D4:: @ 080057D4 .incbin "baserom.gba", 0x0057D4, 0x0000021 gUnk_080057F5:: @ 080057F5 - .incbin "baserom.gba", 0x0057F5, 0x000001B - .incbin "baserom.gba", 0x005810, 0x0000006 + .incbin "baserom.gba", 0x0057F5, 0x0000021 gUnk_08005816:: @ 08005816 - .incbin "baserom.gba", 0x005816, 0x0000001 - .incbin "baserom.gba", 0x005817, 0x000000F + .incbin "baserom.gba", 0x005816, 0x0000010 gUnk_08005826:: @ 08005826 .incbin "baserom.gba", 0x005826, 0x0000009 @@ -790,8 +759,7 @@ gUnk_080059A4:: @ 080059A4 .incbin "baserom.gba", 0x0059A4, 0x0000005 gUnk_080059A9:: @ 080059A9 - .incbin "baserom.gba", 0x0059A9, 0x000005F - .incbin "baserom.gba", 0x005A08, 0x0000039 + .incbin "baserom.gba", 0x0059A9, 0x0000098 gUnk_08005A41:: @ 08005A41 .incbin "baserom.gba", 0x005A41, 0x0000014 @@ -821,8 +789,7 @@ gUnk_08005AEB:: @ 08005AEB .incbin "baserom.gba", 0x005AEB, 0x0000009 gUnk_08005AF4:: @ 08005AF4 - .incbin "baserom.gba", 0x005AF4, 0x000000C - .incbin "baserom.gba", 0x005B00, 0x0000018 + .incbin "baserom.gba", 0x005AF4, 0x0000024 gUnk_08005B18:: @ 08005B18 .incbin "baserom.gba", 0x005B18, 0x000000C @@ -861,15 +828,13 @@ gUnk_08005BFE:: @ 08005BFE .incbin "baserom.gba", 0x005BFE, 0x0000019 gUnk_08005C17:: @ 08005C17 - .incbin "baserom.gba", 0x005C17, 0x0000009 - .incbin "baserom.gba", 0x005C20, 0x0000010 + .incbin "baserom.gba", 0x005C17, 0x0000019 gUnk_08005C30:: @ 08005C30 .incbin "baserom.gba", 0x005C30, 0x0000019 gUnk_08005C49:: @ 08005C49 - .incbin "baserom.gba", 0x005C49, 0x0000008 - .incbin "baserom.gba", 0x005C51, 0x0000011 + .incbin "baserom.gba", 0x005C49, 0x0000019 gUnk_08005C62:: @ 08005C62 .incbin "baserom.gba", 0x005C62, 0x0000019 @@ -896,12 +861,10 @@ gUnk_08005CCD:: @ 08005CCD .incbin "baserom.gba", 0x005CCD, 0x0000029 gUnk_08005CF6:: @ 08005CF6 - .incbin "baserom.gba", 0x005CF6, 0x000000A - .incbin "baserom.gba", 0x005D00, 0x000001F + .incbin "baserom.gba", 0x005CF6, 0x0000029 gUnk_08005D1F:: @ 08005D1F - .incbin "baserom.gba", 0x005D1F, 0x0000011 - .incbin "baserom.gba", 0x005D30, 0x0000010 + .incbin "baserom.gba", 0x005D1F, 0x0000021 gUnk_08005D40:: @ 08005D40 .incbin "baserom.gba", 0x005D40, 0x0000010 @@ -934,8 +897,7 @@ gUnk_08005E1D:: @ 08005E1D .incbin "baserom.gba", 0x005E1D, 0x0000014 gUnk_08005E31:: @ 08005E31 - .incbin "baserom.gba", 0x005E31, 0x000000F - .incbin "baserom.gba", 0x005E40, 0x0000012 + .incbin "baserom.gba", 0x005E31, 0x0000021 gUnk_08005E52:: @ 08005E52 .incbin "baserom.gba", 0x005E52, 0x0000021 @@ -1022,8 +984,7 @@ gUnk_08005FF6:: @ 08005FF6 .incbin "baserom.gba", 0x005FF6, 0x0000008 gUnk_08005FFE:: @ 08005FFE - .incbin "baserom.gba", 0x005FFE, 0x0000002 - .incbin "baserom.gba", 0x006000, 0x000000B + .incbin "baserom.gba", 0x005FFE, 0x000000D gUnk_0800600B:: @ 0800600B .incbin "baserom.gba", 0x00600B, 0x0000008 @@ -1035,8 +996,7 @@ gUnk_08006020:: @ 08006020 .incbin "baserom.gba", 0x006020, 0x0000021 gUnk_08006041:: @ 08006041 - .incbin "baserom.gba", 0x006041, 0x000001F - .incbin "baserom.gba", 0x006060, 0x0000002 + .incbin "baserom.gba", 0x006041, 0x0000021 gUnk_08006062:: @ 08006062 .incbin "baserom.gba", 0x006062, 0x0000021 @@ -1045,8 +1005,7 @@ gUnk_08006083:: @ 08006083 .incbin "baserom.gba", 0x006083, 0x0000060 gUnk_080060E3:: @ 080060E3 - .incbin "baserom.gba", 0x0060E3, 0x0000022 - .incbin "baserom.gba", 0x006105, 0x000001A + .incbin "baserom.gba", 0x0060E3, 0x000003C gUnk_0800611F:: @ 0800611F .incbin "baserom.gba", 0x00611F, 0x000003C @@ -1058,9 +1017,7 @@ gUnk_08006197:: @ 08006197 .incbin "baserom.gba", 0x006197, 0x0000041 gUnk_080061D8:: @ 080061D8 - .incbin "baserom.gba", 0x0061D8, 0x0000028 - .incbin "baserom.gba", 0x006200, 0x0000008 - .incbin "baserom.gba", 0x006208, 0x0000011 + .incbin "baserom.gba", 0x0061D8, 0x0000041 gUnk_08006219:: @ 08006219 .incbin "baserom.gba", 0x006219, 0x0000041 @@ -1069,8 +1026,7 @@ gUnk_0800625A:: @ 0800625A .incbin "baserom.gba", 0x00625A, 0x0000020 gUnk_0800627A:: @ 0800627A - .incbin "baserom.gba", 0x00627A, 0x000000D - .incbin "baserom.gba", 0x006287, 0x0000013 + .incbin "baserom.gba", 0x00627A, 0x0000020 gUnk_0800629A:: @ 0800629A .incbin "baserom.gba", 0x00629A, 0x0000020 @@ -1094,8 +1050,7 @@ gUnk_080062DC:: @ 080062DC .incbin "baserom.gba", 0x0062DC, 0x0000005 gUnk_080062E1:: @ 080062E1 - .incbin "baserom.gba", 0x0062E1, 0x0000022 - .incbin "baserom.gba", 0x006303, 0x0000002 + .incbin "baserom.gba", 0x0062E1, 0x0000024 gUnk_08006305:: @ 08006305 .incbin "baserom.gba", 0x006305, 0x0000024 @@ -1131,16 +1086,13 @@ gUnk_080063EF:: @ 080063EF .incbin "baserom.gba", 0x0063EF, 0x0000015 gUnk_08006404:: @ 08006404 - .incbin "baserom.gba", 0x006404, 0x0000010 - .incbin "baserom.gba", 0x006414, 0x0000004 + .incbin "baserom.gba", 0x006404, 0x0000014 gUnk_08006418:: @ 08006418 - .incbin "baserom.gba", 0x006418, 0x0000008 - .incbin "baserom.gba", 0x006420, 0x000000D + .incbin "baserom.gba", 0x006418, 0x0000015 gUnk_0800642D:: @ 0800642D - .incbin "baserom.gba", 0x00642D, 0x0000002 - .incbin "baserom.gba", 0x00642F, 0x0000022 + .incbin "baserom.gba", 0x00642D, 0x0000024 gUnk_08006451:: @ 08006451 .incbin "baserom.gba", 0x006451, 0x0000024 @@ -1155,8 +1107,7 @@ gUnk_080064BD:: @ 080064BD .incbin "baserom.gba", 0x0064BD, 0x0000025 gUnk_080064E2:: @ 080064E2 - .incbin "baserom.gba", 0x0064E2, 0x000001E - .incbin "baserom.gba", 0x006500, 0x0000007 + .incbin "baserom.gba", 0x0064E2, 0x0000025 gUnk_08006507:: @ 08006507 .incbin "baserom.gba", 0x006507, 0x0000025 @@ -1171,31 +1122,25 @@ gUnk_0800657A:: @ 0800657A .incbin "baserom.gba", 0x00657A, 0x0000029 gUnk_080065A3:: @ 080065A3 - .incbin "baserom.gba", 0x0065A3, 0x0000018 - .incbin "baserom.gba", 0x0065BB, 0x0000014 + .incbin "baserom.gba", 0x0065A3, 0x000002C gUnk_080065CF:: @ 080065CF .incbin "baserom.gba", 0x0065CF, 0x000002C gUnk_080065FB:: @ 080065FB - .incbin "baserom.gba", 0x0065FB, 0x0000016 - .incbin "baserom.gba", 0x006611, 0x0000016 + .incbin "baserom.gba", 0x0065FB, 0x000002C gUnk_08006627:: @ 08006627 .incbin "baserom.gba", 0x006627, 0x000002C gUnk_08006653:: @ 08006653 - .incbin "baserom.gba", 0x006653, 0x0000014 - .incbin "baserom.gba", 0x006667, 0x0000008 + .incbin "baserom.gba", 0x006653, 0x000001C gUnk_0800666F:: @ 0800666F - .incbin "baserom.gba", 0x00666F, 0x000000D - .incbin "baserom.gba", 0x00667C, 0x000000E - .incbin "baserom.gba", 0x00668A, 0x0000001 + .incbin "baserom.gba", 0x00666F, 0x000001C gUnk_0800668B:: @ 0800668B - .incbin "baserom.gba", 0x00668B, 0x000000E - .incbin "baserom.gba", 0x006699, 0x000000E + .incbin "baserom.gba", 0x00668B, 0x000001C gUnk_080066A7:: @ 080066A7 .incbin "baserom.gba", 0x0066A7, 0x0000018 @@ -1207,20 +1152,16 @@ gUnk_080066D7:: @ 080066D7 .incbin "baserom.gba", 0x0066D7, 0x0000018 gUnk_080066EF:: @ 080066EF - .incbin "baserom.gba", 0x0066EF, 0x0000010 - .incbin "baserom.gba", 0x0066FF, 0x0000019 + .incbin "baserom.gba", 0x0066EF, 0x0000029 gUnk_08006718:: @ 08006718 - .incbin "baserom.gba", 0x006718, 0x0000029 - .incbin "baserom.gba", 0x006741, 0x0000032 - .incbin "baserom.gba", 0x006773, 0x0000012 + .incbin "baserom.gba", 0x006718, 0x000006D gUnk_08006785:: @ 08006785 .incbin "baserom.gba", 0x006785, 0x0000018 gUnk_0800679D:: @ 0800679D - .incbin "baserom.gba", 0x00679D, 0x0000016 - .incbin "baserom.gba", 0x0067B3, 0x0000002 + .incbin "baserom.gba", 0x00679D, 0x0000018 gUnk_080067B5:: @ 080067B5 .incbin "baserom.gba", 0x0067B5, 0x0000029 @@ -1232,9 +1173,7 @@ gUnk_08006807:: @ 08006807 .incbin "baserom.gba", 0x006807, 0x0000018 gUnk_0800681F:: @ 0800681F - .incbin "baserom.gba", 0x00681F, 0x0000001 - .incbin "baserom.gba", 0x006820, 0x0000020 - .incbin "baserom.gba", 0x006840, 0x0000008 + .incbin "baserom.gba", 0x00681F, 0x0000029 gUnk_08006848:: @ 08006848 .incbin "baserom.gba", 0x006848, 0x0000029 @@ -1252,8 +1191,7 @@ gUnk_080068CA:: @ 080068CA .incbin "baserom.gba", 0x0068CA, 0x000002C gUnk_080068F6:: @ 080068F6 - .incbin "baserom.gba", 0x0068F6, 0x000000A - .incbin "baserom.gba", 0x006900, 0x0000022 + .incbin "baserom.gba", 0x0068F6, 0x000002C gUnk_08006922:: @ 08006922 .incbin "baserom.gba", 0x006922, 0x0000034 @@ -1271,8 +1209,7 @@ gUnk_08006A02:: @ 08006A02 .incbin "baserom.gba", 0x006A02, 0x0000044 gUnk_08006A46:: @ 08006A46 - .incbin "baserom.gba", 0x006A46, 0x0000025 - .incbin "baserom.gba", 0x006A6B, 0x000001F + .incbin "baserom.gba", 0x006A46, 0x0000044 gUnk_08006A8A:: @ 08006A8A .incbin "baserom.gba", 0x006A8A, 0x0000015 @@ -1293,15 +1230,13 @@ gUnk_08006AE9:: @ 08006AE9 .incbin "baserom.gba", 0x006AE9, 0x0000010 gUnk_08006AF9:: @ 08006AF9 - .incbin "baserom.gba", 0x006AF9, 0x000000B - .incbin "baserom.gba", 0x006B04, 0x0000005 + .incbin "baserom.gba", 0x006AF9, 0x0000010 gUnk_08006B09:: @ 08006B09 .incbin "baserom.gba", 0x006B09, 0x0000029 gUnk_08006B32:: @ 08006B32 - .incbin "baserom.gba", 0x006B32, 0x000000D - .incbin "baserom.gba", 0x006B3F, 0x000000F + .incbin "baserom.gba", 0x006B32, 0x000001C gUnk_08006B4E:: @ 08006B4E .incbin "baserom.gba", 0x006B4E, 0x0000010 @@ -1325,27 +1260,22 @@ gUnk_08006BD4:: @ 08006BD4 .incbin "baserom.gba", 0x006BD4, 0x0000029 gUnk_08006BFD:: @ 08006BFD - .incbin "baserom.gba", 0x006BFD, 0x0000028 - .incbin "baserom.gba", 0x006C25, 0x0000001 + .incbin "baserom.gba", 0x006BFD, 0x0000029 gUnk_08006C26:: @ 08006C26 .incbin "baserom.gba", 0x006C26, 0x0000029 gUnk_08006C4F:: @ 08006C4F - .incbin "baserom.gba", 0x006C4F, 0x0000006 - .incbin "baserom.gba", 0x006C55, 0x0000028 - .incbin "baserom.gba", 0x006C7D, 0x0000016 + .incbin "baserom.gba", 0x006C4F, 0x0000044 gUnk_08006C93:: @ 08006C93 .incbin "baserom.gba", 0x006C93, 0x0000044 gUnk_08006CD7:: @ 08006CD7 - .incbin "baserom.gba", 0x006CD7, 0x0000037 - .incbin "baserom.gba", 0x006D0E, 0x000000D + .incbin "baserom.gba", 0x006CD7, 0x0000044 gUnk_08006D1B:: @ 08006D1B - .incbin "baserom.gba", 0x006D1B, 0x0000005 - .incbin "baserom.gba", 0x006D20, 0x000002B + .incbin "baserom.gba", 0x006D1B, 0x0000030 gUnk_08006D4B:: @ 08006D4B .incbin "baserom.gba", 0x006D4B, 0x0000030 @@ -1375,8 +1305,7 @@ gUnk_08006E1F:: @ 08006E1F .incbin "baserom.gba", 0x006E1F, 0x0000019 gUnk_08006E38:: @ 08006E38 - .incbin "baserom.gba", 0x006E38, 0x0000008 - .incbin "baserom.gba", 0x006E40, 0x0000008 + .incbin "baserom.gba", 0x006E38, 0x0000010 gUnk_08006E48:: @ 08006E48 .incbin "baserom.gba", 0x006E48, 0x0000004 @@ -1391,8 +1320,7 @@ gUnk_08006E75:: @ 08006E75 .incbin "baserom.gba", 0x006E75, 0x0000004 gUnk_08006E79:: @ 08006E79 - .incbin "baserom.gba", 0x006E79, 0x0000008 - .incbin "baserom.gba", 0x006E81, 0x0000011 + .incbin "baserom.gba", 0x006E79, 0x0000019 gUnk_08006E92:: @ 08006E92 .incbin "baserom.gba", 0x006E92, 0x000001C @@ -1407,8 +1335,7 @@ gUnk_08006EE6:: @ 08006EE6 .incbin "baserom.gba", 0x006EE6, 0x000001C gUnk_08006F02:: @ 08006F02 - .incbin "baserom.gba", 0x006F02, 0x000000E - .incbin "baserom.gba", 0x006F10, 0x0000002 + .incbin "baserom.gba", 0x006F02, 0x0000010 gUnk_08006F12:: @ 08006F12 .incbin "baserom.gba", 0x006F12, 0x0000009 @@ -1444,17 +1371,13 @@ gUnk_08006FB6:: @ 08006FB6 .incbin "baserom.gba", 0x006FB6, 0x0000044 gUnk_08006FFA:: @ 08006FFA - .incbin "baserom.gba", 0x006FFA, 0x000000D - .incbin "baserom.gba", 0x007007, 0x0000034 + .incbin "baserom.gba", 0x006FFA, 0x0000041 gUnk_0800703B:: @ 0800703B - .incbin "baserom.gba", 0x00703B, 0x0000004 - .incbin "baserom.gba", 0x00703F, 0x0000031 - .incbin "baserom.gba", 0x007070, 0x000003C + .incbin "baserom.gba", 0x00703B, 0x0000071 gUnk_080070AC:: @ 080070AC - .incbin "baserom.gba", 0x0070AC, 0x0000084 - .incbin "baserom.gba", 0x007130, 0x0000029 + .incbin "baserom.gba", 0x0070AC, 0x00000AD gUnk_08007159:: @ 08007159 .incbin "baserom.gba", 0x007159, 0x0000038 @@ -1463,8 +1386,7 @@ gUnk_08007191:: @ 08007191 .incbin "baserom.gba", 0x007191, 0x0000008 gUnk_08007199:: @ 08007199 - .incbin "baserom.gba", 0x007199, 0x0000033 - .incbin "baserom.gba", 0x0071CC, 0x0000005 + .incbin "baserom.gba", 0x007199, 0x0000038 gUnk_080071D1:: @ 080071D1 .incbin "baserom.gba", 0x0071D1, 0x0000008 @@ -1476,16 +1398,13 @@ gUnk_080071F9:: @ 080071F9 .incbin "baserom.gba", 0x0071F9, 0x0000008 gUnk_08007201:: @ 08007201 - .incbin "baserom.gba", 0x007201, 0x000000C - .incbin "baserom.gba", 0x00720D, 0x0000011 + .incbin "baserom.gba", 0x007201, 0x000001D gUnk_0800721E:: @ 0800721E - .incbin "baserom.gba", 0x00721E, 0x0000001 - .incbin "baserom.gba", 0x00721F, 0x000001C + .incbin "baserom.gba", 0x00721E, 0x000001D gUnk_0800723B:: @ 0800723B - .incbin "baserom.gba", 0x00723B, 0x0000004 - .incbin "baserom.gba", 0x00723F, 0x0000019 + .incbin "baserom.gba", 0x00723B, 0x000001D gUnk_08007258:: @ 08007258 .incbin "baserom.gba", 0x007258, 0x0000028 @@ -1503,16 +1422,13 @@ gUnk_080072F5:: @ 080072F5 .incbin "baserom.gba", 0x0072F5, 0x0000019 gUnk_0800730E:: @ 0800730E - .incbin "baserom.gba", 0x00730E, 0x0000012 - .incbin "baserom.gba", 0x007320, 0x0000002 + .incbin "baserom.gba", 0x00730E, 0x0000014 gUnk_08007322:: @ 08007322 .incbin "baserom.gba", 0x007322, 0x0000044 gUnk_08007366:: @ 08007366 - .incbin "baserom.gba", 0x007366, 0x0000012 - .incbin "baserom.gba", 0x007378, 0x000002A - .incbin "baserom.gba", 0x0073A2, 0x0000008 + .incbin "baserom.gba", 0x007366, 0x0000044 gUnk_080073AA:: @ 080073AA .incbin "baserom.gba", 0x0073AA, 0x0000044 @@ -1530,8 +1446,7 @@ gUnk_08007412:: @ 08007412 .incbin "baserom.gba", 0x007412, 0x0000004 gUnk_08007416:: @ 08007416 - .incbin "baserom.gba", 0x007416, 0x000000F - .incbin "baserom.gba", 0x007425, 0x0000001 + .incbin "baserom.gba", 0x007416, 0x0000010 gUnk_08007426:: @ 08007426 .incbin "baserom.gba", 0x007426, 0x0000004 diff --git a/data/animations/enemy/bowMoblin.s b/data/animations/enemy/bowMoblin.s index 43bb683a..faa299dd 100644 --- a/data/animations/enemy/bowMoblin.s +++ b/data/animations/enemy/bowMoblin.s @@ -20,18 +20,13 @@ gUnk_080CFFF0:: @ 080CFFF0 .incbin "baserom.gba", 0x0CFFF0, 0x0000011 gUnk_080D0001:: @ 080D0001 - .incbin "baserom.gba", 0x0D0001, 0x0000004 - .incbin "baserom.gba", 0x0D0005, 0x0000003 - .incbin "baserom.gba", 0x0D0008, 0x0000001 - .incbin "baserom.gba", 0x0D0009, 0x0000003 - .incbin "baserom.gba", 0x0D000C, 0x0000006 + .incbin "baserom.gba", 0x0D0001, 0x0000011 gUnk_080D0012:: @ 080D0012 .incbin "baserom.gba", 0x0D0012, 0x0000011 gUnk_080D0023:: @ 080D0023 - .incbin "baserom.gba", 0x0D0023, 0x0000009 - .incbin "baserom.gba", 0x0D002C, 0x0000008 + .incbin "baserom.gba", 0x0D0023, 0x0000011 gUnk_080D0034:: @ 080D0034 .incbin "baserom.gba", 0x0D0034, 0x0000011 diff --git a/data/animations/enemy/curtain.s b/data/animations/enemy/curtain.s index 330bdb1c..06c7e495 100644 --- a/data/animations/enemy/curtain.s +++ b/data/animations/enemy/curtain.s @@ -12,14 +12,10 @@ gUnk_080D1CF9:: @ 080D1CF9 .incbin "baserom.gba", 0x0D1CF9, 0x0000009 gUnk_080D1D02:: @ 080D1D02 - .incbin "baserom.gba", 0x0D1D02, 0x0000020 - .incbin "baserom.gba", 0x0D1D22, 0x0000001 - .incbin "baserom.gba", 0x0D1D23, 0x0000003 + .incbin "baserom.gba", 0x0D1D02, 0x0000024 gUnk_080D1D26:: @ 080D1D26 - .incbin "baserom.gba", 0x0D1D26, 0x0000001 - .incbin "baserom.gba", 0x0D1D27, 0x0000005 - .incbin "baserom.gba", 0x0D1D2C, 0x0000008 + .incbin "baserom.gba", 0x0D1D26, 0x000000E gUnk_080D1D34:: @ 080D1D34 .4byte gUnk_080D1CF0 diff --git a/data/animations/enemy/enemy5A.s b/data/animations/enemy/enemy5A.s index 8f545768..ce1b509b 100644 --- a/data/animations/enemy/enemy5A.s +++ b/data/animations/enemy/enemy5A.s @@ -17,12 +17,10 @@ gUnk_080D18F3:: @ 080D18F3 .incbin "baserom.gba", 0x0D18F3, 0x0000021 gUnk_080D1914:: @ 080D1914 - .incbin "baserom.gba", 0x0D1914, 0x0000004 - .incbin "baserom.gba", 0x0D1918, 0x0000005 + .incbin "baserom.gba", 0x0D1914, 0x0000009 gUnk_080D191D:: @ 080D191D - .incbin "baserom.gba", 0x0D191D, 0x0000007 - .incbin "baserom.gba", 0x0D1924, 0x0000002 + .incbin "baserom.gba", 0x0D191D, 0x0000009 gUnk_080D1926:: @ 080D1926 .incbin "baserom.gba", 0x0D1926, 0x0000009 diff --git a/data/animations/enemy/enemy5F.s b/data/animations/enemy/enemy5F.s index 8c9ab70d..bd909d29 100644 --- a/data/animations/enemy/enemy5F.s +++ b/data/animations/enemy/enemy5F.s @@ -23,12 +23,10 @@ gUnk_080D1DE8:: @ 080D1DE8 .incbin "baserom.gba", 0x0D1DE8, 0x000001D gUnk_080D1E05:: @ 080D1E05 - .incbin "baserom.gba", 0x0D1E05, 0x0000016 - .incbin "baserom.gba", 0x0D1E1B, 0x0000006 + .incbin "baserom.gba", 0x0D1E05, 0x000001C gUnk_080D1E21:: @ 080D1E21 - .incbin "baserom.gba", 0x0D1E21, 0x0000005 - .incbin "baserom.gba", 0x0D1E26, 0x000000C + .incbin "baserom.gba", 0x0D1E21, 0x0000011 gUnk_080D1E32:: @ 080D1E32 .incbin "baserom.gba", 0x0D1E32, 0x0000012 diff --git a/data/animations/enemy/fireballGuy.s b/data/animations/enemy/fireballGuy.s index e1be564f..3c39ed68 100644 --- a/data/animations/enemy/fireballGuy.s +++ b/data/animations/enemy/fireballGuy.s @@ -5,9 +5,7 @@ .align 2 gUnk_080D1818:: @ 080D1818 - .incbin "baserom.gba", 0x0D1818, 0x0000004 - .incbin "baserom.gba", 0x0D181C, 0x0000010 - .incbin "baserom.gba", 0x0D182C, 0x000000D + .incbin "baserom.gba", 0x0D1818, 0x0000021 gUnk_080D1839:: @ 080D1839 .incbin "baserom.gba", 0x0D1839, 0x0000023 diff --git a/data/animations/enemy/ghini.s b/data/animations/enemy/ghini.s index 7f20208c..4c590ef6 100644 --- a/data/animations/enemy/ghini.s +++ b/data/animations/enemy/ghini.s @@ -14,16 +14,7 @@ gUnk_080D09C9:: @ 080D09C9 .incbin "baserom.gba", 0x0D09C9, 0x0000025 gUnk_080D09EE:: @ 080D09EE - .incbin "baserom.gba", 0x0D09EE, 0x000000E - .incbin "baserom.gba", 0x0D09FC, 0x0000005 - .incbin "baserom.gba", 0x0D0A01, 0x0000002 - .incbin "baserom.gba", 0x0D0A03, 0x0000005 - .incbin "baserom.gba", 0x0D0A08, 0x0000002 - .incbin "baserom.gba", 0x0D0A0A, 0x0000002 - .incbin "baserom.gba", 0x0D0A0C, 0x0000001 - .incbin "baserom.gba", 0x0D0A0D, 0x0000001 - .incbin "baserom.gba", 0x0D0A0E, 0x0000002 - .incbin "baserom.gba", 0x0D0A10, 0x0000022 + .incbin "baserom.gba", 0x0D09EE, 0x0000044 gUnk_080D0A32:: @ 080D0A32 .incbin "baserom.gba", 0x0D0A32, 0x0000039 diff --git a/data/animations/enemy/gyorgFemaleMouth.s b/data/animations/enemy/gyorgFemaleMouth.s index 085043a1..53e2005d 100644 --- a/data/animations/enemy/gyorgFemaleMouth.s +++ b/data/animations/enemy/gyorgFemaleMouth.s @@ -11,8 +11,7 @@ gUnk_080D292D:: @ 080D292D .incbin "baserom.gba", 0x0D292D, 0x0000011 gUnk_080D293E:: @ 080D293E - .incbin "baserom.gba", 0x0D293E, 0x000000C - .incbin "baserom.gba", 0x0D294A, 0x0000005 + .incbin "baserom.gba", 0x0D293E, 0x0000011 gUnk_080D294F:: @ 080D294F .incbin "baserom.gba", 0x0D294F, 0x0000011 diff --git a/data/animations/enemy/mazaalBracelet.s b/data/animations/enemy/mazaalBracelet.s index 7d631399..a175d93c 100644 --- a/data/animations/enemy/mazaalBracelet.s +++ b/data/animations/enemy/mazaalBracelet.s @@ -14,8 +14,7 @@ gUnk_080CFD82:: @ 080CFD82 .incbin "baserom.gba", 0x0CFD82, 0x0000054 gUnk_080CFDD6:: @ 080CFDD6 - .incbin "baserom.gba", 0x0CFDD6, 0x0000013 - .incbin "baserom.gba", 0x0CFDE9, 0x0000041 + .incbin "baserom.gba", 0x0CFDD6, 0x0000054 gUnk_080CFE2A:: @ 080CFE2A .incbin "baserom.gba", 0x0CFE2A, 0x000000D diff --git a/data/animations/enemy/slime.s b/data/animations/enemy/slime.s index 57b93b07..113923c5 100644 --- a/data/animations/enemy/slime.s +++ b/data/animations/enemy/slime.s @@ -17,8 +17,7 @@ gUnk_080D170D:: @ 080D170D .incbin "baserom.gba", 0x0D170D, 0x0000010 gUnk_080D171D:: @ 080D171D - .incbin "baserom.gba", 0x0D171D, 0x0000004 - .incbin "baserom.gba", 0x0D1721, 0x0000020 + .incbin "baserom.gba", 0x0D171D, 0x0000024 gUnk_080D1741:: @ 080D1741 .incbin "baserom.gba", 0x0D1741, 0x0000020 diff --git a/data/animations/enemy/stalfos.s b/data/animations/enemy/stalfos.s index 6892ce60..50842210 100644 --- a/data/animations/enemy/stalfos.s +++ b/data/animations/enemy/stalfos.s @@ -47,9 +47,7 @@ gUnk_080CF9D7:: @ 080CF9D7 .incbin "baserom.gba", 0x0CF9D7, 0x0000011 gUnk_080CF9E8:: @ 080CF9E8 - .incbin "baserom.gba", 0x0CF9E8, 0x000000B - .incbin "baserom.gba", 0x0CF9F3, 0x0000004 - .incbin "baserom.gba", 0x0CF9F7, 0x0000002 + .incbin "baserom.gba", 0x0CF9E8, 0x0000011 gUnk_080CF9F9:: @ 080CF9F9 .incbin "baserom.gba", 0x0CF9F9, 0x0000011 diff --git a/data/animations/enemy/vaatiArm.s b/data/animations/enemy/vaatiArm.s index b502d87f..40dc0e35 100644 --- a/data/animations/enemy/vaatiArm.s +++ b/data/animations/enemy/vaatiArm.s @@ -5,9 +5,7 @@ @ .align 2 gUnk_080D141E:: @ 080D141E - .incbin "baserom.gba", 0x0D141E, 0x0000001 - .incbin "baserom.gba", 0x0D141F, 0x0000004 - .incbin "baserom.gba", 0x0D1423, 0x0000008 + .incbin "baserom.gba", 0x0D141E, 0x000000D gUnk_080D142B:: @ 080D142B .incbin "baserom.gba", 0x0D142B, 0x0000005 @@ -61,9 +59,7 @@ gUnk_080D14F3:: @ 080D14F3 .incbin "baserom.gba", 0x0D14F3, 0x0000019 gUnk_080D150C:: @ 080D150C - .incbin "baserom.gba", 0x0D150C, 0x0000009 - .incbin "baserom.gba", 0x0D1515, 0x0000005 - .incbin "baserom.gba", 0x0D151A, 0x000000B + .incbin "baserom.gba", 0x0D150C, 0x0000019 gUnk_080D1525:: @ 080D1525 .incbin "baserom.gba", 0x0D1525, 0x0000005 diff --git a/data/animations/enemy/vaatiRebornEnemy.s b/data/animations/enemy/vaatiRebornEnemy.s index a5d9c99e..1b0d0612 100644 --- a/data/animations/enemy/vaatiRebornEnemy.s +++ b/data/animations/enemy/vaatiRebornEnemy.s @@ -8,14 +8,10 @@ gUnk_080D04D7:: @ 080D04D7 .incbin "baserom.gba", 0x0D04D7, 0x0000011 gUnk_080D04E8:: @ 080D04E8 - .incbin "baserom.gba", 0x0D04E8, 0x0000011 - .incbin "baserom.gba", 0x0D04F9, 0x0000005 - .incbin "baserom.gba", 0x0D04FE, 0x0000003 + .incbin "baserom.gba", 0x0D04E8, 0x0000019 gUnk_080D0501:: @ 080D0501 - .incbin "baserom.gba", 0x0D0501, 0x0000001 - .incbin "baserom.gba", 0x0D0502, 0x0000006 - .incbin "baserom.gba", 0x0D0508, 0x0000005 + .incbin "baserom.gba", 0x0D0501, 0x000000C gUnk_080D050D:: @ 080D050D .incbin "baserom.gba", 0x0D050D, 0x0000024 @@ -66,13 +62,7 @@ gUnk_080D05E0:: @ 080D05E0 .4byte 00000000 gUnk_080D05F4:: @ 080D05F4 - .incbin "baserom.gba", 0x0D05F4, 0x0000006 - .incbin "baserom.gba", 0x0D05FA, 0x0000002 - .incbin "baserom.gba", 0x0D05FC, 0x0000001 - .incbin "baserom.gba", 0x0D05FD, 0x0000001 - .incbin "baserom.gba", 0x0D05FE, 0x0000007 - .incbin "baserom.gba", 0x0D0605, 0x0000003 - .incbin "baserom.gba", 0x0D0608, 0x0000001 + .incbin "baserom.gba", 0x0D05F4, 0x0000015 gUnk_080D0609:: @ 080D0609 .incbin "baserom.gba", 0x0D0609, 0x0000015 diff --git a/data/animations/enemy/vaatiTransfigured.s b/data/animations/enemy/vaatiTransfigured.s index 684cb489..68cc5ed9 100644 --- a/data/animations/enemy/vaatiTransfigured.s +++ b/data/animations/enemy/vaatiTransfigured.s @@ -31,15 +31,10 @@ gUnk_080D0BF2:: @ 080D0BF2 .incbin "baserom.gba", 0x0D0BF2, 0x0000005 gUnk_080D0BF7:: @ 080D0BF7 - .incbin "baserom.gba", 0x0D0BF7, 0x0000004 - .incbin "baserom.gba", 0x0D0BFB, 0x0000001 + .incbin "baserom.gba", 0x0D0BF7, 0x0000005 gUnk_080D0BFC:: @ 080D0BFC - .incbin "baserom.gba", 0x0D0BFC, 0x0000004 - .incbin "baserom.gba", 0x0D0C00, 0x0000006 - .incbin "baserom.gba", 0x0D0C06, 0x0000002 - .incbin "baserom.gba", 0x0D0C08, 0x0000002 - .incbin "baserom.gba", 0x0D0C0A, 0x0000002 + .incbin "baserom.gba", 0x0D0BFC, 0x0000010 gUnk_080D0C0C:: @ 080D0C0C .4byte gUnk_080D0BDC @@ -88,9 +83,7 @@ gUnk_080D0CF4:: @ 080D0CF4 .4byte 00000000 gUnk_080D0D0C:: @ 080D0D0C - .incbin "baserom.gba", 0x0D0D0C, 0x0000002 - .incbin "baserom.gba", 0x0D0D0E, 0x0000006 - .incbin "baserom.gba", 0x0D0D14, 0x000002C + .incbin "baserom.gba", 0x0D0D0C, 0x0000034 gUnk_080D0D40:: @ 080D0D40 .4byte gUnk_080D0D0C diff --git a/data/animations/enemy/vaatiWrath.s b/data/animations/enemy/vaatiWrath.s index 44b26efb..ab0c30fc 100644 --- a/data/animations/enemy/vaatiWrath.s +++ b/data/animations/enemy/vaatiWrath.s @@ -8,24 +8,13 @@ gUnk_080D0ED0:: @ 080D0ED0 .incbin "baserom.gba", 0x0D0ED0, 0x0000019 gUnk_080D0EE9:: @ 080D0EE9 - .incbin "baserom.gba", 0x0D0EE9, 0x000000C - .incbin "baserom.gba", 0x0D0EF5, 0x000000D + .incbin "baserom.gba", 0x0D0EE9, 0x0000019 gUnk_080D0F02:: @ 080D0F02 - .incbin "baserom.gba", 0x0D0F02, 0x0000003 - .incbin "baserom.gba", 0x0D0F05, 0x0000003 - .incbin "baserom.gba", 0x0D0F08, 0x0000001 - .incbin "baserom.gba", 0x0D0F09, 0x0000004 - .incbin "baserom.gba", 0x0D0F0D, 0x0000001 - .incbin "baserom.gba", 0x0D0F0E, 0x0000001 - .incbin "baserom.gba", 0x0D0F0F, 0x0000001 - .incbin "baserom.gba", 0x0D0F10, 0x0000001 - .incbin "baserom.gba", 0x0D0F11, 0x0000001 - .incbin "baserom.gba", 0x0D0F12, 0x0000001 + .incbin "baserom.gba", 0x0D0F02, 0x0000011 gUnk_080D0F13:: @ 080D0F13 - .incbin "baserom.gba", 0x0D0F13, 0x0000004 - .incbin "baserom.gba", 0x0D0F17, 0x0000011 + .incbin "baserom.gba", 0x0D0F13, 0x0000015 gUnk_080D0F28:: @ 080D0F28 .incbin "baserom.gba", 0x0D0F28, 0x0000045 @@ -52,17 +41,10 @@ gUnk_080D0FF3:: @ 080D0FF3 .incbin "baserom.gba", 0x0D0FF3, 0x0000005 gUnk_080D0FF8:: @ 080D0FF8 - .incbin "baserom.gba", 0x0D0FF8, 0x0000015 - .incbin "baserom.gba", 0x0D100D, 0x0000002 - .incbin "baserom.gba", 0x0D100F, 0x0000001 - .incbin "baserom.gba", 0x0D1010, 0x0000001 - .incbin "baserom.gba", 0x0D1011, 0x0000001 - .incbin "baserom.gba", 0x0D1012, 0x0000001 - .incbin "baserom.gba", 0x0D1013, 0x0000006 + .incbin "baserom.gba", 0x0D0FF8, 0x0000021 gUnk_080D1019:: @ 080D1019 - .incbin "baserom.gba", 0x0D1019, 0x0000012 - .incbin "baserom.gba", 0x0D102B, 0x000000B + .incbin "baserom.gba", 0x0D1019, 0x000001D gUnk_080D1036:: @ 080D1036 .incbin "baserom.gba", 0x0D1036, 0x0000019 @@ -101,19 +83,10 @@ gUnk_080D10F1:: @ 080D10F1 .incbin "baserom.gba", 0x0D10F1, 0x0000015 gUnk_080D1106:: @ 080D1106 - .incbin "baserom.gba", 0x0D1106, 0x0000006 - .incbin "baserom.gba", 0x0D110C, 0x0000003 - .incbin "baserom.gba", 0x0D110F, 0x0000001 - .incbin "baserom.gba", 0x0D1110, 0x0000001 - .incbin "baserom.gba", 0x0D1111, 0x0000001 - .incbin "baserom.gba", 0x0D1112, 0x0000002 - .incbin "baserom.gba", 0x0D1114, 0x0000001 - .incbin "baserom.gba", 0x0D1115, 0x0000001 - .incbin "baserom.gba", 0x0D1116, 0x0000001 + .incbin "baserom.gba", 0x0D1106, 0x0000011 gUnk_080D1117:: @ 080D1117 - .incbin "baserom.gba", 0x0D1117, 0x0000007 - .incbin "baserom.gba", 0x0D111E, 0x000001A + .incbin "baserom.gba", 0x0D1117, 0x0000021 gUnk_080D1138:: @ 080D1138 .incbin "baserom.gba", 0x0D1138, 0x0000015 diff --git a/data/animations/npc/bladeBrothers.s b/data/animations/npc/bladeBrothers.s index cf948fcb..47664667 100644 --- a/data/animations/npc/bladeBrothers.s +++ b/data/animations/npc/bladeBrothers.s @@ -17,14 +17,7 @@ gUnk_081117C8:: @ 081117C8 .incbin "baserom.gba", 0x1117C8, 0x0000031 gUnk_081117F9:: @ 081117F9 - .incbin "baserom.gba", 0x1117F9, 0x000001E - .incbin "baserom.gba", 0x111817, 0x0000002 - .incbin "baserom.gba", 0x111819, 0x0000002 - .incbin "baserom.gba", 0x11181B, 0x0000001 - .incbin "baserom.gba", 0x11181C, 0x0000001 - .incbin "baserom.gba", 0x11181D, 0x0000001 - .incbin "baserom.gba", 0x11181E, 0x0000004 - .incbin "baserom.gba", 0x111822, 0x0000008 + .incbin "baserom.gba", 0x1117F9, 0x0000031 gUnk_0811182A:: @ 0811182A .incbin "baserom.gba", 0x11182A, 0x0000031 diff --git a/data/animations/npc/cat.s b/data/animations/npc/cat.s index a63ab214..c0d0ba79 100644 --- a/data/animations/npc/cat.s +++ b/data/animations/npc/cat.s @@ -45,8 +45,7 @@ gUnk_081111B0:: @ 081111B0 .incbin "baserom.gba", 0x1111B0, 0x0000009 gUnk_081111B9:: @ 081111B9 - .incbin "baserom.gba", 0x1111B9, 0x0000003 - .incbin "baserom.gba", 0x1111BC, 0x0000006 + .incbin "baserom.gba", 0x1111B9, 0x0000009 gUnk_081111C2:: @ 081111C2 .incbin "baserom.gba", 0x1111C2, 0x0000011 @@ -55,13 +54,10 @@ gUnk_081111D3:: @ 081111D3 .incbin "baserom.gba", 0x1111D3, 0x0000018 gUnk_081111EB:: @ 081111EB - .incbin "baserom.gba", 0x1111EB, 0x0000010 - .incbin "baserom.gba", 0x1111FB, 0x0000009 + .incbin "baserom.gba", 0x1111EB, 0x0000019 gUnk_08111204:: @ 08111204 - .incbin "baserom.gba", 0x111204, 0x000000D - .incbin "baserom.gba", 0x111211, 0x000000D - .incbin "baserom.gba", 0x11121E, 0x000000E + .incbin "baserom.gba", 0x111204, 0x0000028 gUnk_0811122C:: @ 0811122C .incbin "baserom.gba", 0x11122C, 0x000000C diff --git a/data/animations/npc/cow.s b/data/animations/npc/cow.s index d5e79a38..c2ab8699 100644 --- a/data/animations/npc/cow.s +++ b/data/animations/npc/cow.s @@ -44,8 +44,7 @@ gUnk_081119E8:: @ 081119E8 .incbin "baserom.gba", 0x1119E8, 0x0000009 gUnk_081119F1:: @ 081119F1 - .incbin "baserom.gba", 0x1119F1, 0x0000005 - .incbin "baserom.gba", 0x1119F6, 0x0000004 + .incbin "baserom.gba", 0x1119F1, 0x0000009 gUnk_081119FA:: @ 081119FA .incbin "baserom.gba", 0x1119FA, 0x0000009 @@ -57,16 +56,10 @@ gUnk_08111A0C:: @ 08111A0C .incbin "baserom.gba", 0x111A0C, 0x0000008 gUnk_08111A14:: @ 08111A14 - .incbin "baserom.gba", 0x111A14, 0x0000002 - .incbin "baserom.gba", 0x111A16, 0x0000002 - .incbin "baserom.gba", 0x111A18, 0x0000001 - .incbin "baserom.gba", 0x111A19, 0x0000003 + .incbin "baserom.gba", 0x111A14, 0x0000008 gUnk_08111A1C:: @ 08111A1C - .incbin "baserom.gba", 0x111A1C, 0x0000003 - .incbin "baserom.gba", 0x111A1F, 0x0000002 - .incbin "baserom.gba", 0x111A21, 0x0000001 - .incbin "baserom.gba", 0x111A22, 0x0000002 + .incbin "baserom.gba", 0x111A1C, 0x0000008 gUnk_08111A24:: @ 08111A24 .incbin "baserom.gba", 0x111A24, 0x0000008 diff --git a/data/animations/npc/dog.s b/data/animations/npc/dog.s index af1109f8..8e116f6d 100644 --- a/data/animations/npc/dog.s +++ b/data/animations/npc/dog.s @@ -20,8 +20,7 @@ gUnk_08111FF6:: @ 08111FF6 .incbin "baserom.gba", 0x111FF6, 0x0000011 gUnk_08112007:: @ 08112007 - .incbin "baserom.gba", 0x112007, 0x0000007 - .incbin "baserom.gba", 0x11200E, 0x000000A + .incbin "baserom.gba", 0x112007, 0x0000011 gUnk_08112018:: @ 08112018 .incbin "baserom.gba", 0x112018, 0x0000005 diff --git a/data/animations/npc/drLeft.s b/data/animations/npc/drLeft.s index cbf5d61d..23ab39e2 100644 --- a/data/animations/npc/drLeft.s +++ b/data/animations/npc/drLeft.s @@ -20,8 +20,7 @@ gUnk_08113434:: @ 08113434 .incbin "baserom.gba", 0x113434, 0x0000009 gUnk_0811343D:: @ 0811343D - .incbin "baserom.gba", 0x11343D, 0x0000002 - .incbin "baserom.gba", 0x11343F, 0x0000007 + .incbin "baserom.gba", 0x11343D, 0x0000009 gUnk_08113446:: @ 08113446 .incbin "baserom.gba", 0x113446, 0x0000009 diff --git a/data/animations/npc/farore.s b/data/animations/npc/farore.s index f880531d..8f770287 100644 --- a/data/animations/npc/farore.s +++ b/data/animations/npc/farore.s @@ -5,15 +5,13 @@ .align 2 gUnk_0810F9F4:: @ 0810F9F4 - .incbin "baserom.gba", 0x10F9F4, 0x0000004 - .incbin "baserom.gba", 0x10F9F8, 0x0000001 + .incbin "baserom.gba", 0x10F9F4, 0x0000005 gUnk_0810F9F9:: @ 0810F9F9 .incbin "baserom.gba", 0x10F9F9, 0x0000005 gUnk_0810F9FE:: @ 0810F9FE - .incbin "baserom.gba", 0x10F9FE, 0x0000002 - .incbin "baserom.gba", 0x10FA00, 0x0000003 + .incbin "baserom.gba", 0x10F9FE, 0x0000005 gUnk_0810FA03:: @ 0810FA03 .incbin "baserom.gba", 0x10FA03, 0x0000011 diff --git a/data/animations/npc/forestMinish.s b/data/animations/npc/forestMinish.s index 8390e531..98bf0205 100644 --- a/data/animations/npc/forestMinish.s +++ b/data/animations/npc/forestMinish.s @@ -14,8 +14,7 @@ gUnk_0810A374:: @ 0810A374 .incbin "baserom.gba", 0x10A374, 0x0000005 gUnk_0810A379:: @ 0810A379 - .incbin "baserom.gba", 0x10A379, 0x0000001 - .incbin "baserom.gba", 0x10A37A, 0x0000004 + .incbin "baserom.gba", 0x10A379, 0x0000005 gUnk_0810A37E:: @ 0810A37E .incbin "baserom.gba", 0x10A37E, 0x0000021 @@ -27,15 +26,13 @@ gUnk_0810A3C0:: @ 0810A3C0 .incbin "baserom.gba", 0x10A3C0, 0x0000021 gUnk_0810A3E1:: @ 0810A3E1 - .incbin "baserom.gba", 0x10A3E1, 0x000001F - .incbin "baserom.gba", 0x10A400, 0x0000002 + .incbin "baserom.gba", 0x10A3E1, 0x0000021 gUnk_0810A402:: @ 0810A402 .incbin "baserom.gba", 0x10A402, 0x0000005 gUnk_0810A407:: @ 0810A407 - .incbin "baserom.gba", 0x10A407, 0x0000001 - .incbin "baserom.gba", 0x10A408, 0x0000004 + .incbin "baserom.gba", 0x10A407, 0x0000005 gUnk_0810A40C:: @ 0810A40C .incbin "baserom.gba", 0x10A40C, 0x0000005 diff --git a/data/animations/npc/gentari.s b/data/animations/npc/gentari.s index 32463d65..8408b897 100644 --- a/data/animations/npc/gentari.s +++ b/data/animations/npc/gentari.s @@ -20,8 +20,7 @@ gUnk_08109AEC:: @ 08109AEC .incbin "baserom.gba", 0x109AEC, 0x0000011 gUnk_08109AFD:: @ 08109AFD - .incbin "baserom.gba", 0x109AFD, 0x000000B - .incbin "baserom.gba", 0x109B08, 0x0000006 + .incbin "baserom.gba", 0x109AFD, 0x0000011 gUnk_08109B0E:: @ 08109B0E .incbin "baserom.gba", 0x109B0E, 0x000002D diff --git a/data/animations/npc/gina.s b/data/animations/npc/gina.s index 86ff4431..7453b90a 100644 --- a/data/animations/npc/gina.s +++ b/data/animations/npc/gina.s @@ -9,8 +9,7 @@ gUnk_0811352C:: @ 0811352C .incbin "baserom.gba", 0x11352C, 0x0000021 gUnk_0811354D:: @ 0811354D - .incbin "baserom.gba", 0x11354D, 0x0000019 - .incbin "baserom.gba", 0x113566, 0x0000008 + .incbin "baserom.gba", 0x11354D, 0x0000021 gUnk_0811356E:: @ 0811356E .incbin "baserom.gba", 0x11356E, 0x0000021 diff --git a/data/animations/npc/gorman.s b/data/animations/npc/gorman.s index 4c29d2f1..d608c757 100644 --- a/data/animations/npc/gorman.s +++ b/data/animations/npc/gorman.s @@ -23,13 +23,10 @@ gUnk_08111CE9:: @ 08111CE9 .incbin "baserom.gba", 0x111CE9, 0x0000019 gUnk_08111D02:: @ 08111D02 - .incbin "baserom.gba", 0x111D02, 0x0000015 - .incbin "baserom.gba", 0x111D17, 0x0000004 + .incbin "baserom.gba", 0x111D02, 0x0000019 gUnk_08111D1B:: @ 08111D1B - .incbin "baserom.gba", 0x111D1B, 0x000000F - .incbin "baserom.gba", 0x111D2A, 0x0000001 - .incbin "baserom.gba", 0x111D2B, 0x0000009 + .incbin "baserom.gba", 0x111D1B, 0x0000019 gUnk_08111D34:: @ 08111D34 .4byte gUnk_08111CBC diff --git a/data/animations/npc/goron.s b/data/animations/npc/goron.s index b45e16e9..caddb3f6 100644 --- a/data/animations/npc/goron.s +++ b/data/animations/npc/goron.s @@ -23,13 +23,10 @@ gUnk_08111AF9:: @ 08111AF9 .incbin "baserom.gba", 0x111AF9, 0x0000021 gUnk_08111B1A:: @ 08111B1A - .incbin "baserom.gba", 0x111B1A, 0x0000005 - .incbin "baserom.gba", 0x111B1F, 0x0000007 - .incbin "baserom.gba", 0x111B26, 0x0000015 + .incbin "baserom.gba", 0x111B1A, 0x0000021 gUnk_08111B3B:: @ 08111B3B - .incbin "baserom.gba", 0x111B3B, 0x000000B - .incbin "baserom.gba", 0x111B46, 0x000001A + .incbin "baserom.gba", 0x111B3B, 0x0000025 gUnk_08111B60:: @ 08111B60 .4byte gUnk_08111AC4 diff --git a/data/animations/npc/greatFairy.s b/data/animations/npc/greatFairy.s index 5b1f3466..59a67976 100644 --- a/data/animations/npc/greatFairy.s +++ b/data/animations/npc/greatFairy.s @@ -27,11 +27,7 @@ gUnk_081207D7:: @ 081207D7 .incbin "baserom.gba", 0x1207D7, 0x000001D gUnk_081207F4:: @ 081207F4 - .incbin "baserom.gba", 0x1207F4, 0x000000D - .incbin "baserom.gba", 0x120801, 0x0000003 - .incbin "baserom.gba", 0x120804, 0x0000004 - .incbin "baserom.gba", 0x120808, 0x0000006 - .incbin "baserom.gba", 0x12080E, 0x000000B + .incbin "baserom.gba", 0x1207F4, 0x0000025 gUnk_08120819:: @ 08120819 .incbin "baserom.gba", 0x120819, 0x000000D diff --git a/data/animations/npc/guard.s b/data/animations/npc/guard.s index e82c32b9..80b807e3 100644 --- a/data/animations/npc/guard.s +++ b/data/animations/npc/guard.s @@ -11,9 +11,7 @@ gUnk_0810F59A:: @ 0810F59A .incbin "baserom.gba", 0x10F59A, 0x000003A gUnk_0810F5D4:: @ 0810F5D4 - .incbin "baserom.gba", 0x10F5D4, 0x000001F - .incbin "baserom.gba", 0x10F5F3, 0x0000005 - .incbin "baserom.gba", 0x10F5F8, 0x0000016 + .incbin "baserom.gba", 0x10F5D4, 0x000003A gUnk_0810F60E:: @ 0810F60E .incbin "baserom.gba", 0x10F60E, 0x0000005 diff --git a/data/animations/npc/guardWithSpear.s b/data/animations/npc/guardWithSpear.s index f7509fd4..ec73066c 100644 --- a/data/animations/npc/guardWithSpear.s +++ b/data/animations/npc/guardWithSpear.s @@ -5,15 +5,13 @@ .align 2 gUnk_0810F6E4:: @ 0810F6E4 - .incbin "baserom.gba", 0x10F6E4, 0x0000002 - .incbin "baserom.gba", 0x10F6E6, 0x0000003 + .incbin "baserom.gba", 0x10F6E4, 0x0000005 gUnk_0810F6E9:: @ 0810F6E9 .incbin "baserom.gba", 0x10F6E9, 0x0000005 gUnk_0810F6EE:: @ 0810F6EE - .incbin "baserom.gba", 0x10F6EE, 0x0000001 - .incbin "baserom.gba", 0x10F6EF, 0x0000004 + .incbin "baserom.gba", 0x10F6EE, 0x0000005 gUnk_0810F6F3:: @ 0810F6F3 .incbin "baserom.gba", 0x10F6F3, 0x0000005 @@ -22,8 +20,7 @@ gUnk_0810F6F8:: @ 0810F6F8 .incbin "baserom.gba", 0x10F6F8, 0x0000005 gUnk_0810F6FD:: @ 0810F6FD - .incbin "baserom.gba", 0x10F6FD, 0x0000003 - .incbin "baserom.gba", 0x10F700, 0x0000002 + .incbin "baserom.gba", 0x10F6FD, 0x0000005 gUnk_0810F702:: @ 0810F702 .incbin "baserom.gba", 0x10F702, 0x0000005 @@ -65,22 +62,16 @@ gUnk_0810F7BE:: @ 0810F7BE .incbin "baserom.gba", 0x10F7BE, 0x0000005 gUnk_0810F7C3:: @ 0810F7C3 - .incbin "baserom.gba", 0x10F7C3, 0x0000005 - .incbin "baserom.gba", 0x10F7C8, 0x0000020 + .incbin "baserom.gba", 0x10F7C3, 0x0000025 gUnk_0810F7E8:: @ 0810F7E8 - .incbin "baserom.gba", 0x10F7E8, 0x0000003 - .incbin "baserom.gba", 0x10F7EB, 0x0000003 - .incbin "baserom.gba", 0x10F7EE, 0x000000A - .incbin "baserom.gba", 0x10F7F8, 0x0000005 + .incbin "baserom.gba", 0x10F7E8, 0x0000015 gUnk_0810F7FD:: @ 0810F7FD - .incbin "baserom.gba", 0x10F7FD, 0x0000003 - .incbin "baserom.gba", 0x10F800, 0x0000002 + .incbin "baserom.gba", 0x10F7FD, 0x0000005 gUnk_0810F802:: @ 0810F802 - .incbin "baserom.gba", 0x10F802, 0x0000006 - .incbin "baserom.gba", 0x10F808, 0x000000C + .incbin "baserom.gba", 0x10F802, 0x0000012 gUnk_0810F814:: @ 0810F814 .4byte gUnk_0810F6E4 diff --git a/data/animations/npc/kid.s b/data/animations/npc/kid.s index 54a36244..c1831189 100644 --- a/data/animations/npc/kid.s +++ b/data/animations/npc/kid.s @@ -47,9 +47,7 @@ gUnk_0810C199:: @ 0810C199 .incbin "baserom.gba", 0x10C199, 0x000000D gUnk_0810C1A6:: @ 0810C1A6 - .incbin "baserom.gba", 0x10C1A6, 0x0000018 - .incbin "baserom.gba", 0x10C1BE, 0x000000F - .incbin "baserom.gba", 0x10C1CD, 0x000000A + .incbin "baserom.gba", 0x10C1A6, 0x0000031 gUnk_0810C1D7:: @ 0810C1D7 .incbin "baserom.gba", 0x10C1D7, 0x0000005 diff --git a/data/animations/npc/kingDaltus.s b/data/animations/npc/kingDaltus.s index 02929ba2..2e0a0438 100644 --- a/data/animations/npc/kingDaltus.s +++ b/data/animations/npc/kingDaltus.s @@ -11,8 +11,7 @@ gUnk_08110505:: @ 08110505 .incbin "baserom.gba", 0x110505, 0x0000005 gUnk_0811050A:: @ 0811050A - .incbin "baserom.gba", 0x11050A, 0x0000004 - .incbin "baserom.gba", 0x11050E, 0x0000001 + .incbin "baserom.gba", 0x11050A, 0x0000005 gUnk_0811050F:: @ 0811050F .incbin "baserom.gba", 0x11050F, 0x0000005 @@ -27,8 +26,7 @@ gUnk_08110556:: @ 08110556 .incbin "baserom.gba", 0x110556, 0x0000021 gUnk_08110577:: @ 08110577 - .incbin "baserom.gba", 0x110577, 0x0000009 - .incbin "baserom.gba", 0x110580, 0x0000018 + .incbin "baserom.gba", 0x110577, 0x0000021 gUnk_08110598:: @ 08110598 .incbin "baserom.gba", 0x110598, 0x0000011 @@ -46,8 +44,7 @@ gUnk_081105DC:: @ 081105DC .incbin "baserom.gba", 0x1105DC, 0x0000005 gUnk_081105E1:: @ 081105E1 - .incbin "baserom.gba", 0x1105E1, 0x0000010 - .incbin "baserom.gba", 0x1105F1, 0x0000017 + .incbin "baserom.gba", 0x1105E1, 0x0000027 gUnk_08110608:: @ 08110608 .4byte gUnk_08110500 diff --git a/data/animations/npc/librarians.s b/data/animations/npc/librarians.s index db9b7553..97f95ff3 100644 --- a/data/animations/npc/librarians.s +++ b/data/animations/npc/librarians.s @@ -39,8 +39,7 @@ gUnk_081130EA:: @ 081130EA .incbin "baserom.gba", 0x1130EA, 0x000000D gUnk_081130F7:: @ 081130F7 - .incbin "baserom.gba", 0x1130F7, 0x000000B - .incbin "baserom.gba", 0x113102, 0x0000006 + .incbin "baserom.gba", 0x1130F7, 0x0000011 gUnk_08113108:: @ 08113108 .4byte gUnk_081130D8 diff --git a/data/animations/npc/maid.s b/data/animations/npc/maid.s index aa15da98..009b0bbc 100644 --- a/data/animations/npc/maid.s +++ b/data/animations/npc/maid.s @@ -12,16 +12,13 @@ gUnk_0810F8E9:: @ 0810F8E9 .incbin "baserom.gba", 0x10F8E9, 0x0000005 gUnk_0810F8EE:: @ 0810F8EE - .incbin "baserom.gba", 0x10F8EE, 0x0000001 - .incbin "baserom.gba", 0x10F8EF, 0x0000004 + .incbin "baserom.gba", 0x10F8EE, 0x0000005 gUnk_0810F8F3:: @ 0810F8F3 - .incbin "baserom.gba", 0x10F8F3, 0x0000001 - .incbin "baserom.gba", 0x10F8F4, 0x0000004 + .incbin "baserom.gba", 0x10F8F3, 0x0000005 gUnk_0810F8F8:: @ 0810F8F8 - .incbin "baserom.gba", 0x10F8F8, 0x0000001 - .incbin "baserom.gba", 0x10F8F9, 0x0000010 + .incbin "baserom.gba", 0x10F8F8, 0x0000011 gUnk_0810F909:: @ 0810F909 .incbin "baserom.gba", 0x10F909, 0x0000011 diff --git a/data/animations/npc/mailbox.s b/data/animations/npc/mailbox.s index d33c1771..625538d5 100644 --- a/data/animations/npc/mailbox.s +++ b/data/animations/npc/mailbox.s @@ -8,8 +8,7 @@ gUnk_0810C814:: @ 0810C814 .incbin "baserom.gba", 0x10C814, 0x0000005 gUnk_0810C819:: @ 0810C819 - .incbin "baserom.gba", 0x10C819, 0x0000029 - .incbin "baserom.gba", 0x10C842, 0x0000008 + .incbin "baserom.gba", 0x10C819, 0x0000031 gUnk_0810C84A:: @ 0810C84A .incbin "baserom.gba", 0x10C84A, 0x000001E diff --git a/data/animations/npc/malon.s b/data/animations/npc/malon.s index 0c6b82bc..3c2999f9 100644 --- a/data/animations/npc/malon.s +++ b/data/animations/npc/malon.s @@ -11,8 +11,7 @@ gUnk_0810FF75:: @ 0810FF75 .incbin "baserom.gba", 0x10FF75, 0x0000005 gUnk_0810FF7A:: @ 0810FF7A - .incbin "baserom.gba", 0x10FF7A, 0x0000004 - .incbin "baserom.gba", 0x10FF7E, 0x0000001 + .incbin "baserom.gba", 0x10FF7A, 0x0000005 gUnk_0810FF7F:: @ 0810FF7F .incbin "baserom.gba", 0x10FF7F, 0x0000005 @@ -24,19 +23,13 @@ gUnk_0810FFA5:: @ 0810FFA5 .incbin "baserom.gba", 0x10FFA5, 0x0000011 gUnk_0810FFB6:: @ 0810FFB6 - .incbin "baserom.gba", 0x10FFB6, 0x000000B - .incbin "baserom.gba", 0x10FFC1, 0x0000016 + .incbin "baserom.gba", 0x10FFB6, 0x0000021 gUnk_0810FFD7:: @ 0810FFD7 - .incbin "baserom.gba", 0x10FFD7, 0x000001F - .incbin "baserom.gba", 0x10FFF6, 0x0000008 - .incbin "baserom.gba", 0x10FFFE, 0x0000002 - .incbin "baserom.gba", 0x110000, 0x0000007 - .incbin "baserom.gba", 0x110007, 0x000000D + .incbin "baserom.gba", 0x10FFD7, 0x000003D gUnk_08110014:: @ 08110014 - .incbin "baserom.gba", 0x110014, 0x0000013 - .incbin "baserom.gba", 0x110027, 0x0000001 + .incbin "baserom.gba", 0x110014, 0x0000014 gUnk_08110028:: @ 08110028 .4byte gUnk_0810FF70 diff --git a/data/animations/npc/mama.s b/data/animations/npc/mama.s index 329873ba..bff4f629 100644 --- a/data/animations/npc/mama.s +++ b/data/animations/npc/mama.s @@ -8,8 +8,7 @@ gUnk_081137B0:: @ 081137B0 .incbin "baserom.gba", 0x1137B0, 0x0000039 gUnk_081137E9:: @ 081137E9 - .incbin "baserom.gba", 0x1137E9, 0x0000088 - .incbin "baserom.gba", 0x113871, 0x0000021 + .incbin "baserom.gba", 0x1137E9, 0x00000A9 gUnk_08113892:: @ 08113892 .incbin "baserom.gba", 0x113892, 0x0000005 diff --git a/data/animations/npc/minishEzlo.s b/data/animations/npc/minishEzlo.s index 86e707b7..65abd5ed 100644 --- a/data/animations/npc/minishEzlo.s +++ b/data/animations/npc/minishEzlo.s @@ -23,14 +23,10 @@ gUnk_0810C4C9:: @ 0810C4C9 .incbin "baserom.gba", 0x10C4C9, 0x0000015 gUnk_0810C4DE:: @ 0810C4DE - .incbin "baserom.gba", 0x10C4DE, 0x00000D1 - .incbin "baserom.gba", 0x10C5AF, 0x000000C + .incbin "baserom.gba", 0x10C4DE, 0x00000DD gUnk_0810C5BB:: @ 0810C5BB - .incbin "baserom.gba", 0x10C5BB, 0x0000008 - .incbin "baserom.gba", 0x10C5C3, 0x00000AB - .incbin "baserom.gba", 0x10C66E, 0x000001E - .incbin "baserom.gba", 0x10C68C, 0x000000C + .incbin "baserom.gba", 0x10C5BB, 0x00000DD gUnk_0810C698:: @ 0810C698 .incbin "baserom.gba", 0x10C698, 0x000004D @@ -39,8 +35,7 @@ gUnk_0810C6E5:: @ 0810C6E5 .incbin "baserom.gba", 0x10C6E5, 0x000008D gUnk_0810C772:: @ 0810C772 - .incbin "baserom.gba", 0x10C772, 0x0000003 - .incbin "baserom.gba", 0x10C775, 0x000000A + .incbin "baserom.gba", 0x10C772, 0x000000D gUnk_0810C77F:: @ 0810C77F .incbin "baserom.gba", 0x10C77F, 0x000002D diff --git a/data/animations/npc/mountainMinish.s b/data/animations/npc/mountainMinish.s index b8c0cd3f..f86b854a 100644 --- a/data/animations/npc/mountainMinish.s +++ b/data/animations/npc/mountainMinish.s @@ -26,12 +26,7 @@ gUnk_081113DE:: @ 081113DE .incbin "baserom.gba", 0x1113DE, 0x0000021 gUnk_081113FF:: @ 081113FF - .incbin "baserom.gba", 0x1113FF, 0x0000008 - .incbin "baserom.gba", 0x111407, 0x0000005 - .incbin "baserom.gba", 0x11140C, 0x0000002 - .incbin "baserom.gba", 0x11140E, 0x0000005 - .incbin "baserom.gba", 0x111413, 0x0000009 - .incbin "baserom.gba", 0x11141C, 0x0000008 + .incbin "baserom.gba", 0x1113FF, 0x0000025 gUnk_08111424:: @ 08111424 .incbin "baserom.gba", 0x111424, 0x0000025 diff --git a/data/animations/npc/npc4F.s b/data/animations/npc/npc4F.s index 751a1362..d078059a 100644 --- a/data/animations/npc/npc4F.s +++ b/data/animations/npc/npc4F.s @@ -8,8 +8,7 @@ gUnk_08114208:: @ 08114208 .incbin "baserom.gba", 0x114208, 0x0000005 gUnk_0811420D:: @ 0811420D - .incbin "baserom.gba", 0x11420D, 0x0000004 - .incbin "baserom.gba", 0x114211, 0x0000005 + .incbin "baserom.gba", 0x11420D, 0x0000009 gUnk_08114216:: @ 08114216 .incbin "baserom.gba", 0x114216, 0x0000009 diff --git a/data/animations/npc/npc5.s b/data/animations/npc/npc5.s index 4fabe605..507a336a 100644 --- a/data/animations/npc/npc5.s +++ b/data/animations/npc/npc5.s @@ -35,8 +35,7 @@ gUnk_0810AD71:: @ 0810AD71 .incbin "baserom.gba", 0x10AD71, 0x0000021 gUnk_0810AD92:: @ 0810AD92 - .incbin "baserom.gba", 0x10AD92, 0x000001B - .incbin "baserom.gba", 0x10ADAD, 0x0000006 + .incbin "baserom.gba", 0x10AD92, 0x0000021 gUnk_0810ADB3:: @ 0810ADB3 .incbin "baserom.gba", 0x10ADB3, 0x0000021 @@ -57,8 +56,7 @@ gUnk_0810AE58:: @ 0810AE58 .incbin "baserom.gba", 0x10AE58, 0x0000024 gUnk_0810AE7C:: @ 0810AE7C - .incbin "baserom.gba", 0x10AE7C, 0x0000021 - .incbin "baserom.gba", 0x10AE9D, 0x0000003 + .incbin "baserom.gba", 0x10AE7C, 0x0000024 gUnk_0810AEA0:: @ 0810AEA0 .incbin "baserom.gba", 0x10AEA0, 0x0000024 @@ -67,12 +65,10 @@ gUnk_0810AEC4:: @ 0810AEC4 .incbin "baserom.gba", 0x10AEC4, 0x0000024 gUnk_0810AEE8:: @ 0810AEE8 - .incbin "baserom.gba", 0x10AEE8, 0x000001F - .incbin "baserom.gba", 0x10AF07, 0x0000012 + .incbin "baserom.gba", 0x10AEE8, 0x0000031 gUnk_0810AF19:: @ 0810AF19 - .incbin "baserom.gba", 0x10AF19, 0x000002B - .incbin "baserom.gba", 0x10AF44, 0x0000006 + .incbin "baserom.gba", 0x10AF19, 0x0000031 gUnk_0810AF4A:: @ 0810AF4A .incbin "baserom.gba", 0x10AF4A, 0x0000031 @@ -87,8 +83,7 @@ gUnk_0810AFCD:: @ 0810AFCD .incbin "baserom.gba", 0x10AFCD, 0x0000021 gUnk_0810AFEE:: @ 0810AFEE - .incbin "baserom.gba", 0x10AFEE, 0x000001A - .incbin "baserom.gba", 0x10B008, 0x0000007 + .incbin "baserom.gba", 0x10AFEE, 0x0000021 gUnk_0810B00F:: @ 0810B00F .incbin "baserom.gba", 0x10B00F, 0x0000021 @@ -160,8 +155,7 @@ gUnk_0810B18C:: @ 0810B18C .incbin "baserom.gba", 0x10B18C, 0x000001C gUnk_0810B1A8:: @ 0810B1A8 - .incbin "baserom.gba", 0x10B1A8, 0x0000009 - .incbin "baserom.gba", 0x10B1B1, 0x0000013 + .incbin "baserom.gba", 0x10B1A8, 0x000001C gUnk_0810B1C4:: @ 0810B1C4 .incbin "baserom.gba", 0x10B1C4, 0x000001C @@ -200,15 +194,13 @@ gUnk_0810B370:: @ 0810B370 .incbin "baserom.gba", 0x10B370, 0x0000030 gUnk_0810B3A0:: @ 0810B3A0 - .incbin "baserom.gba", 0x10B3A0, 0x0000022 - .incbin "baserom.gba", 0x10B3C2, 0x000000E + .incbin "baserom.gba", 0x10B3A0, 0x0000030 gUnk_0810B3D0:: @ 0810B3D0 .incbin "baserom.gba", 0x10B3D0, 0x0000028 gUnk_0810B3F8:: @ 0810B3F8 - .incbin "baserom.gba", 0x10B3F8, 0x000000F - .incbin "baserom.gba", 0x10B407, 0x0000019 + .incbin "baserom.gba", 0x10B3F8, 0x0000028 gUnk_0810B420:: @ 0810B420 .incbin "baserom.gba", 0x10B420, 0x0000028 diff --git a/data/animations/npc/pina.s b/data/animations/npc/pina.s index 3dd417e4..54bd88c7 100644 --- a/data/animations/npc/pina.s +++ b/data/animations/npc/pina.s @@ -5,8 +5,7 @@ .align 2 gUnk_0810CE54:: @ 0810CE54 - .incbin "baserom.gba", 0x10CE54, 0x0000013 - .incbin "baserom.gba", 0x10CE67, 0x000003A + .incbin "baserom.gba", 0x10CE54, 0x000004D gUnk_0810CEA1:: @ 0810CEA1 .incbin "baserom.gba", 0x10CEA1, 0x000004D diff --git a/data/animations/npc/rem.s b/data/animations/npc/rem.s index 74963ff3..48e012b8 100644 --- a/data/animations/npc/rem.s +++ b/data/animations/npc/rem.s @@ -38,8 +38,7 @@ gUnk_081123EE:: @ 081123EE .incbin "baserom.gba", 0x1123EE, 0x0000079 gUnk_08112467:: @ 08112467 - .incbin "baserom.gba", 0x112467, 0x0000032 - .incbin "baserom.gba", 0x112499, 0x0000013 + .incbin "baserom.gba", 0x112467, 0x0000045 gUnk_081124AC:: @ 081124AC .incbin "baserom.gba", 0x1124AC, 0x0000009 diff --git a/data/animations/npc/smith.s b/data/animations/npc/smith.s index 51015cc2..eff0b192 100644 --- a/data/animations/npc/smith.s +++ b/data/animations/npc/smith.s @@ -17,9 +17,7 @@ gUnk_081103F3:: @ 081103F3 .incbin "baserom.gba", 0x1103F3, 0x0000005 gUnk_081103F8:: @ 081103F8 - .incbin "baserom.gba", 0x1103F8, 0x0000006 - .incbin "baserom.gba", 0x1103FE, 0x0000002 - .incbin "baserom.gba", 0x110400, 0x0000009 + .incbin "baserom.gba", 0x1103F8, 0x0000011 gUnk_08110409:: @ 08110409 .incbin "baserom.gba", 0x110409, 0x0000011 diff --git a/data/animations/npc/stockwell.s b/data/animations/npc/stockwell.s index e99e3111..239ef3f4 100644 --- a/data/animations/npc/stockwell.s +++ b/data/animations/npc/stockwell.s @@ -17,8 +17,7 @@ gUnk_0810FDF7:: @ 0810FDF7 .incbin "baserom.gba", 0x10FDF7, 0x000000C gUnk_0810FE03:: @ 0810FE03 - .incbin "baserom.gba", 0x10FE03, 0x0000005 - .incbin "baserom.gba", 0x10FE08, 0x0000017 + .incbin "baserom.gba", 0x10FE03, 0x000001C gUnk_0810FE1F:: @ 0810FE1F .incbin "baserom.gba", 0x10FE1F, 0x0000049 diff --git a/data/animations/npc/talon.s b/data/animations/npc/talon.s index 2a5a73c9..2c7291a6 100644 --- a/data/animations/npc/talon.s +++ b/data/animations/npc/talon.s @@ -14,26 +14,19 @@ gUnk_0810FEEA:: @ 0810FEEA .incbin "baserom.gba", 0x10FEEA, 0x0000005 gUnk_0810FEEF:: @ 0810FEEF - .incbin "baserom.gba", 0x10FEEF, 0x0000002 - .incbin "baserom.gba", 0x10FEF1, 0x0000003 + .incbin "baserom.gba", 0x10FEEF, 0x0000005 gUnk_0810FEF4:: @ 0810FEF4 - .incbin "baserom.gba", 0x10FEF4, 0x0000001 - .incbin "baserom.gba", 0x10FEF5, 0x0000003 - .incbin "baserom.gba", 0x10FEF8, 0x000000B - .incbin "baserom.gba", 0x10FF03, 0x0000002 + .incbin "baserom.gba", 0x10FEF4, 0x0000011 gUnk_0810FF05:: @ 0810FF05 - .incbin "baserom.gba", 0x10FF05, 0x000000A - .incbin "baserom.gba", 0x10FF0F, 0x0000001 - .incbin "baserom.gba", 0x10FF10, 0x0000006 + .incbin "baserom.gba", 0x10FF05, 0x0000011 gUnk_0810FF16:: @ 0810FF16 .incbin "baserom.gba", 0x10FF16, 0x0000011 gUnk_0810FF27:: @ 0810FF27 - .incbin "baserom.gba", 0x10FF27, 0x0000001 - .incbin "baserom.gba", 0x10FF28, 0x0000010 + .incbin "baserom.gba", 0x10FF27, 0x0000011 gUnk_0810FF38:: @ 0810FF38 .4byte gUnk_0810FEE5 diff --git a/data/animations/npc/tingleSiblings.s b/data/animations/npc/tingleSiblings.s index 8dd574b0..b2b53e69 100644 --- a/data/animations/npc/tingleSiblings.s +++ b/data/animations/npc/tingleSiblings.s @@ -17,9 +17,7 @@ gUnk_0810FCAD:: @ 0810FCAD .incbin "baserom.gba", 0x10FCAD, 0x0000021 gUnk_0810FCCE:: @ 0810FCCE - .incbin "baserom.gba", 0x10FCCE, 0x0000026 - .incbin "baserom.gba", 0x10FCF4, 0x0000022 - .incbin "baserom.gba", 0x10FD16, 0x0000056 + .incbin "baserom.gba", 0x10FCCE, 0x000009E gUnk_0810FD6C:: @ 0810FD6C .4byte gUnk_0810FC5E diff --git a/data/animations/npc/vaati.s b/data/animations/npc/vaati.s index 78c44aff..a4e84641 100644 --- a/data/animations/npc/vaati.s +++ b/data/animations/npc/vaati.s @@ -105,8 +105,7 @@ gUnk_081108F2:: @ 081108F2 .incbin "baserom.gba", 0x1108F2, 0x000000D gUnk_081108FF:: @ 081108FF - .incbin "baserom.gba", 0x1108FF, 0x000000D - .incbin "baserom.gba", 0x11090C, 0x000000C + .incbin "baserom.gba", 0x1108FF, 0x0000019 gUnk_08110918:: @ 08110918 .incbin "baserom.gba", 0x110918, 0x0000005 @@ -127,15 +126,13 @@ gUnk_08110931:: @ 08110931 .incbin "baserom.gba", 0x110931, 0x00000C1 gUnk_081109F2:: @ 081109F2 - .incbin "baserom.gba", 0x1109F2, 0x0000006 - .incbin "baserom.gba", 0x1109F8, 0x00000DF + .incbin "baserom.gba", 0x1109F2, 0x00000E5 gUnk_08110AD7:: @ 08110AD7 .incbin "baserom.gba", 0x110AD7, 0x0000015 gUnk_08110AEC:: @ 08110AEC - .incbin "baserom.gba", 0x110AEC, 0x0000010 - .incbin "baserom.gba", 0x110AFC, 0x0000008 + .incbin "baserom.gba", 0x110AEC, 0x0000018 gUnk_08110B04:: @ 08110B04 .4byte gUnk_08110840 diff --git a/data/animations/object/beanstalk.s b/data/animations/object/beanstalk.s index be83d930..f98756a0 100644 --- a/data/animations/object/beanstalk.s +++ b/data/animations/object/beanstalk.s @@ -5,9 +5,7 @@ @ .align 2 gUnk_08120EF9:: @ 08120EF9 - .incbin "baserom.gba", 0x120EF9, 0x000000A - .incbin "baserom.gba", 0x120F03, 0x0000018 - .incbin "baserom.gba", 0x120F1B, 0x000000F + .incbin "baserom.gba", 0x120EF9, 0x0000031 gUnk_08120F2A:: @ 08120F2A .incbin "baserom.gba", 0x120F2A, 0x0000004 @@ -40,14 +38,7 @@ gUnk_08120FF2:: @ 08120FF2 .incbin "baserom.gba", 0x120FF2, 0x0000004 gUnk_08120FF6:: @ 08120FF6 - .incbin "baserom.gba", 0x120FF6, 0x0000013 - .incbin "baserom.gba", 0x121009, 0x0000002 - .incbin "baserom.gba", 0x12100B, 0x0000001 - .incbin "baserom.gba", 0x12100C, 0x0000001 - .incbin "baserom.gba", 0x12100D, 0x0000002 - .incbin "baserom.gba", 0x12100F, 0x0000003 - .incbin "baserom.gba", 0x121012, 0x0000002 - .incbin "baserom.gba", 0x121014, 0x0000002 + .incbin "baserom.gba", 0x120FF6, 0x0000020 gUnk_08121016:: @ 08121016 .incbin "baserom.gba", 0x121016, 0x0000006 diff --git a/data/animations/object/bossDoor.s b/data/animations/object/bossDoor.s index b66f5809..84c57ba4 100644 --- a/data/animations/object/bossDoor.s +++ b/data/animations/object/bossDoor.s @@ -5,8 +5,7 @@ .align 2 gUnk_08121514:: @ 08121514 - .incbin "baserom.gba", 0x121514, 0x0000007 - .incbin "baserom.gba", 0x12151B, 0x000001D + .incbin "baserom.gba", 0x121514, 0x0000024 gUnk_08121538:: @ 08121538 .incbin "baserom.gba", 0x121538, 0x0000024 diff --git a/data/animations/object/deathFx.s b/data/animations/object/deathFx.s index e2df04be..8c456e43 100644 --- a/data/animations/object/deathFx.s +++ b/data/animations/object/deathFx.s @@ -14,9 +14,7 @@ gUnk_0811ED86:: @ 0811ED86 .incbin "baserom.gba", 0x11ED86, 0x0000031 gUnk_0811EDB7:: @ 0811EDB7 - .incbin "baserom.gba", 0x11EDB7, 0x0000034 - .incbin "baserom.gba", 0x11EDEB, 0x0000014 - .incbin "baserom.gba", 0x11EDFF, 0x0000011 + .incbin "baserom.gba", 0x11EDB7, 0x0000059 gUnk_0811EE10:: @ 0811EE10 .4byte gUnk_0811ECD4 diff --git a/data/animations/object/fan.s b/data/animations/object/fan.s index 30277362..5785aee0 100644 --- a/data/animations/object/fan.s +++ b/data/animations/object/fan.s @@ -5,8 +5,7 @@ .align 2 gUnk_081243F4:: @ 081243F4 - .incbin "baserom.gba", 0x1243F4, 0x000003F - .incbin "baserom.gba", 0x124433, 0x0000032 + .incbin "baserom.gba", 0x1243F4, 0x0000071 gUnk_08124465:: @ 08124465 .incbin "baserom.gba", 0x124465, 0x0000071 diff --git a/data/animations/object/figurineDevice.s b/data/animations/object/figurineDevice.s index 8e44ea0c..83a7946f 100644 --- a/data/animations/object/figurineDevice.s +++ b/data/animations/object/figurineDevice.s @@ -11,9 +11,7 @@ gUnk_08120AED:: @ 08120AED .incbin "baserom.gba", 0x120AED, 0x0000014 gUnk_08120B01:: @ 08120B01 - .incbin "baserom.gba", 0x120B01, 0x0000003 - .incbin "baserom.gba", 0x120B04, 0x0000006 - .incbin "baserom.gba", 0x120B0A, 0x0000006 + .incbin "baserom.gba", 0x120B01, 0x000000F gUnk_08120B10:: @ 08120B10 .4byte gUnk_08120AE8 diff --git a/data/animations/object/fileScreenObjects.s b/data/animations/object/fileScreenObjects.s index e68503c3..be90ed5a 100644 --- a/data/animations/object/fileScreenObjects.s +++ b/data/animations/object/fileScreenObjects.s @@ -5,8 +5,7 @@ .align 2 gUnk_08121E24:: @ 08121E24 - .incbin "baserom.gba", 0x121E24, 0x0000005 - .incbin "baserom.gba", 0x121E29, 0x0000008 + .incbin "baserom.gba", 0x121E24, 0x000000D gUnk_08121E31:: @ 08121E31 .incbin "baserom.gba", 0x121E31, 0x000001F diff --git a/data/animations/object/furniture.s b/data/animations/object/furniture.s index e049b5d7..e4bd071e 100644 --- a/data/animations/object/furniture.s +++ b/data/animations/object/furniture.s @@ -5,8 +5,7 @@ .align 2 gUnk_08122128:: @ 08122128 - .incbin "baserom.gba", 0x122128, 0x000000A - .incbin "baserom.gba", 0x122132, 0x0000066 + .incbin "baserom.gba", 0x122128, 0x0000070 gUnk_08122198:: @ 08122198 .incbin "baserom.gba", 0x122198, 0x0000010 diff --git a/data/animations/object/gentariCurtains.s b/data/animations/object/gentariCurtains.s index 26c65908..b52a88ef 100644 --- a/data/animations/object/gentariCurtains.s +++ b/data/animations/object/gentariCurtains.s @@ -5,8 +5,7 @@ .align 2 gUnk_0812261C:: @ 0812261C - .incbin "baserom.gba", 0x12261C, 0x000000E - .incbin "baserom.gba", 0x12262A, 0x0000007 + .incbin "baserom.gba", 0x12261C, 0x0000015 gUnk_08122631:: @ 08122631 .incbin "baserom.gba", 0x122631, 0x0000007 diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s index fd057151..ee51437c 100644 --- a/data/animations/object/minecart.s +++ b/data/animations/object/minecart.s @@ -17,8 +17,7 @@ gUnk_08122402:: @ 08122402 .incbin "baserom.gba", 0x122402, 0x000001A gUnk_0812241C:: @ 0812241C - .incbin "baserom.gba", 0x12241C, 0x0000011 - .incbin "baserom.gba", 0x12242D, 0x0000009 + .incbin "baserom.gba", 0x12241C, 0x000001A gUnk_08122436:: @ 08122436 .incbin "baserom.gba", 0x122436, 0x000001A diff --git a/data/animations/object/object1E.s b/data/animations/object/object1E.s index 2e01b0a2..fe78dc8a 100644 --- a/data/animations/object/object1E.s +++ b/data/animations/object/object1E.s @@ -8,9 +8,7 @@ gUnk_081208C8:: @ 081208C8 .incbin "baserom.gba", 0x1208C8, 0x0000034 gUnk_081208FC:: @ 081208FC - .incbin "baserom.gba", 0x1208FC, 0x0000005 - .incbin "baserom.gba", 0x120901, 0x0000005 - .incbin "baserom.gba", 0x120906, 0x000002A + .incbin "baserom.gba", 0x1208FC, 0x0000034 gUnk_08120930:: @ 08120930 .incbin "baserom.gba", 0x120930, 0x0000034 diff --git a/data/animations/object/object24.s b/data/animations/object/object24.s index 778e2d9f..ac45287b 100644 --- a/data/animations/object/object24.s +++ b/data/animations/object/object24.s @@ -5,19 +5,16 @@ @ .align 2 gUnk_08120BF1:: @ 08120BF1 - .incbin "baserom.gba", 0x120BF1, 0x0000003 - .incbin "baserom.gba", 0x120BF4, 0x0000001 + .incbin "baserom.gba", 0x120BF1, 0x0000004 gUnk_08120BF5:: @ 08120BF5 .incbin "baserom.gba", 0x120BF5, 0x0000004 gUnk_08120BF9:: @ 08120BF9 - .incbin "baserom.gba", 0x120BF9, 0x0000003 - .incbin "baserom.gba", 0x120BFC, 0x0000001 + .incbin "baserom.gba", 0x120BF9, 0x0000004 gUnk_08120BFD:: @ 08120BFD - .incbin "baserom.gba", 0x120BFD, 0x0000001 - .incbin "baserom.gba", 0x120BFE, 0x0000003 + .incbin "baserom.gba", 0x120BFD, 0x0000004 gUnk_08120C01:: @ 08120C01 .incbin "baserom.gba", 0x120C01, 0x0000007 diff --git a/data/animations/object/object35.s b/data/animations/object/object35.s index 44eb4d52..0948e415 100644 --- a/data/animations/object/object35.s +++ b/data/animations/object/object35.s @@ -5,16 +5,13 @@ .align 2 gUnk_081213FC:: @ 081213FC - .incbin "baserom.gba", 0x1213FC, 0x0000009 - .incbin "baserom.gba", 0x121405, 0x0000008 + .incbin "baserom.gba", 0x1213FC, 0x0000011 gUnk_0812140D:: @ 0812140D - .incbin "baserom.gba", 0x12140D, 0x000000A - .incbin "baserom.gba", 0x121417, 0x0000007 + .incbin "baserom.gba", 0x12140D, 0x0000011 gUnk_0812141E:: @ 0812141E - .incbin "baserom.gba", 0x12141E, 0x0000004 - .incbin "baserom.gba", 0x121422, 0x000000E + .incbin "baserom.gba", 0x12141E, 0x0000012 gUnk_08121430:: @ 08121430 .4byte gUnk_081213FC diff --git a/data/animations/object/object4.s b/data/animations/object/object4.s index e5e1fd0d..34b7d891 100644 --- a/data/animations/object/object4.s +++ b/data/animations/object/object4.s @@ -74,8 +74,7 @@ gUnk_0811EFD9:: @ 0811EFD9 .incbin "baserom.gba", 0x11EFD9, 0x0000015 gUnk_0811EFEE:: @ 0811EFEE - .incbin "baserom.gba", 0x11EFEE, 0x000000E - .incbin "baserom.gba", 0x11EFFC, 0x0000007 + .incbin "baserom.gba", 0x11EFEE, 0x0000015 gUnk_0811F003:: @ 0811F003 .incbin "baserom.gba", 0x11F003, 0x0000015 diff --git a/data/animations/object/object43.s b/data/animations/object/object43.s index 7c739fde..1bf13295 100644 --- a/data/animations/object/object43.s +++ b/data/animations/object/object43.s @@ -5,36 +5,19 @@ .align 2 gUnk_081217E0:: @ 081217E0 - .incbin "baserom.gba", 0x1217E0, 0x000003A - .incbin "baserom.gba", 0x12181A, 0x0000001 - .incbin "baserom.gba", 0x12181B, 0x0000001 - .incbin "baserom.gba", 0x12181C, 0x0000001 - .incbin "baserom.gba", 0x12181D, 0x0000047 + .incbin "baserom.gba", 0x1217E0, 0x0000084 gUnk_08121864:: @ 08121864 .incbin "baserom.gba", 0x121864, 0x0000084 gUnk_081218E8:: @ 081218E8 - .incbin "baserom.gba", 0x1218E8, 0x0000031 - .incbin "baserom.gba", 0x121919, 0x0000001 - .incbin "baserom.gba", 0x12191A, 0x0000002 - .incbin "baserom.gba", 0x12191C, 0x0000001 - .incbin "baserom.gba", 0x12191D, 0x0000001 - .incbin "baserom.gba", 0x12191E, 0x0000001 - .incbin "baserom.gba", 0x12191F, 0x0000001 - .incbin "baserom.gba", 0x121920, 0x0000001 - .incbin "baserom.gba", 0x121921, 0x000004B + .incbin "baserom.gba", 0x1218E8, 0x0000084 gUnk_0812196C:: @ 0812196C .incbin "baserom.gba", 0x12196C, 0x0000084 gUnk_081219F0:: @ 081219F0 - .incbin "baserom.gba", 0x1219F0, 0x000000C - .incbin "baserom.gba", 0x1219FC, 0x0000020 - .incbin "baserom.gba", 0x121A1C, 0x0000002 - .incbin "baserom.gba", 0x121A1E, 0x0000001 - .incbin "baserom.gba", 0x121A1F, 0x0000001 - .incbin "baserom.gba", 0x121A20, 0x000000D + .incbin "baserom.gba", 0x1219F0, 0x000003D gUnk_08121A2D:: @ 08121A2D .incbin "baserom.gba", 0x121A2D, 0x000003D @@ -43,8 +26,7 @@ gUnk_08121A6A:: @ 08121A6A .incbin "baserom.gba", 0x121A6A, 0x000003D gUnk_08121AA7:: @ 08121AA7 - .incbin "baserom.gba", 0x121AA7, 0x0000001 - .incbin "baserom.gba", 0x121AA8, 0x000003C + .incbin "baserom.gba", 0x121AA7, 0x000003D gUnk_08121AE4:: @ 08121AE4 .incbin "baserom.gba", 0x121AE4, 0x0000010 @@ -56,9 +38,7 @@ gUnk_08121B04:: @ 08121B04 .incbin "baserom.gba", 0x121B04, 0x0000010 gUnk_08121B14:: @ 08121B14 - .incbin "baserom.gba", 0x121B14, 0x000000B - .incbin "baserom.gba", 0x121B1F, 0x0000004 - .incbin "baserom.gba", 0x121B23, 0x0000001 + .incbin "baserom.gba", 0x121B14, 0x0000010 gUnk_08121B24:: @ 08121B24 .incbin "baserom.gba", 0x121B24, 0x0000024 diff --git a/data/animations/object/object45.s b/data/animations/object/object45.s index b97e0f1f..a9077f5d 100644 --- a/data/animations/object/object45.s +++ b/data/animations/object/object45.s @@ -8,9 +8,7 @@ gUnk_08121BE0:: @ 08121BE0 .incbin "baserom.gba", 0x121BE0, 0x0000018 gUnk_08121BF8:: @ 08121BF8 - .incbin "baserom.gba", 0x121BF8, 0x0000022 - .incbin "baserom.gba", 0x121C1A, 0x000000B - .incbin "baserom.gba", 0x121C25, 0x000000F + .incbin "baserom.gba", 0x121BF8, 0x000003C gUnk_08121C34:: @ 08121C34 .4byte gUnk_08121BE0 diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s index 8d82b5df..ff0da8bd 100644 --- a/data/animations/object/object6A.s +++ b/data/animations/object/object6A.s @@ -6,8 +6,7 @@ gUnk_08122B4C:: @ 08122B4C - .incbin "baserom.gba", 0x122B4C, 0x0000001 - .incbin "baserom.gba", 0x122B4D, 0x0000008 + .incbin "baserom.gba", 0x122B4C, 0x0000009 gUnk_08122B55:: @ 08122B55 .incbin "baserom.gba", 0x122B55, 0x000000F @@ -138,8 +137,7 @@ gUnk_08122D22:: @ 08122D22 .incbin "baserom.gba", 0x122D22, 0x0000009 gUnk_08122D2B:: @ 08122D2B - .incbin "baserom.gba", 0x122D2B, 0x0000004 - .incbin "baserom.gba", 0x122D2F, 0x0000005 + .incbin "baserom.gba", 0x122D2B, 0x0000009 gUnk_08122D34:: @ 08122D34 .incbin "baserom.gba", 0x122D34, 0x0000021 diff --git a/data/animations/object/object9B.s b/data/animations/object/object9B.s index dca3e7c9..2664994b 100644 --- a/data/animations/object/object9B.s +++ b/data/animations/object/object9B.s @@ -5,8 +5,7 @@ .align 2 gUnk_081242E8:: @ 081242E8 - .incbin "baserom.gba", 0x1242E8, 0x000002C - .incbin "baserom.gba", 0x124314, 0x000000C + .incbin "baserom.gba", 0x1242E8, 0x0000038 gUnk_08124320:: @ 08124320 .incbin "baserom.gba", 0x124320, 0x0000028 diff --git a/data/animations/object/pot.s b/data/animations/object/pot.s index 6d82034b..73b08ea1 100644 --- a/data/animations/object/pot.s +++ b/data/animations/object/pot.s @@ -20,15 +20,13 @@ gUnk_0811F0F0:: @ 0811F0F0 .incbin "baserom.gba", 0x11F0F0, 0x0000005 gUnk_0811F0F5:: @ 0811F0F5 - .incbin "baserom.gba", 0x11F0F5, 0x0000003 - .incbin "baserom.gba", 0x11F0F8, 0x0000002 + .incbin "baserom.gba", 0x11F0F5, 0x0000005 gUnk_0811F0FA:: @ 0811F0FA .incbin "baserom.gba", 0x11F0FA, 0x0000005 gUnk_0811F0FF:: @ 0811F0FF - .incbin "baserom.gba", 0x11F0FF, 0x0000001 - .incbin "baserom.gba", 0x11F100, 0x0000004 + .incbin "baserom.gba", 0x11F0FF, 0x0000005 gUnk_0811F104:: @ 0811F104 .incbin "baserom.gba", 0x11F104, 0x0000005 diff --git a/data/animations/object/pullableLever.s b/data/animations/object/pullableLever.s index dd92ce2c..3aa4daa4 100644 --- a/data/animations/object/pullableLever.s +++ b/data/animations/object/pullableLever.s @@ -68,8 +68,7 @@ gUnk_08122314:: @ 08122314 .incbin "baserom.gba", 0x122314, 0x0000004 gUnk_08122318:: @ 08122318 - .incbin "baserom.gba", 0x122318, 0x0000003 - .incbin "baserom.gba", 0x12231B, 0x0000001 + .incbin "baserom.gba", 0x122318, 0x0000004 gUnk_0812231C:: @ 0812231C .incbin "baserom.gba", 0x12231C, 0x0000004 @@ -78,8 +77,7 @@ gUnk_08122320:: @ 08122320 .incbin "baserom.gba", 0x122320, 0x0000004 gUnk_08122324:: @ 08122324 - .incbin "baserom.gba", 0x122324, 0x0000003 - .incbin "baserom.gba", 0x122327, 0x0000001 + .incbin "baserom.gba", 0x122324, 0x0000004 gUnk_08122328:: @ 08122328 .incbin "baserom.gba", 0x122328, 0x0000004 diff --git a/data/animations/object/pullableMushroom.s b/data/animations/object/pullableMushroom.s index 0f36d55c..ab8154da 100644 --- a/data/animations/object/pullableMushroom.s +++ b/data/animations/object/pullableMushroom.s @@ -8,16 +8,13 @@ gUnk_08121204:: @ 08121204 .incbin "baserom.gba", 0x121204, 0x0000004 gUnk_08121208:: @ 08121208 - .incbin "baserom.gba", 0x121208, 0x000000C - .incbin "baserom.gba", 0x121214, 0x0000011 + .incbin "baserom.gba", 0x121208, 0x000001D gUnk_08121225:: @ 08121225 - .incbin "baserom.gba", 0x121225, 0x000000F - .incbin "baserom.gba", 0x121234, 0x0000001 + .incbin "baserom.gba", 0x121225, 0x0000010 gUnk_08121235:: @ 08121235 - .incbin "baserom.gba", 0x121235, 0x0000002 - .incbin "baserom.gba", 0x121237, 0x000001B + .incbin "baserom.gba", 0x121235, 0x000001D gUnk_08121252:: @ 08121252 .incbin "baserom.gba", 0x121252, 0x0000011 diff --git a/data/animations/object/pushableRock.s b/data/animations/object/pushableRock.s index 2b780a20..0b7a0b11 100644 --- a/data/animations/object/pushableRock.s +++ b/data/animations/object/pushableRock.s @@ -11,15 +11,10 @@ gUnk_08121094:: @ 08121094 .incbin "baserom.gba", 0x121094, 0x000003C gUnk_081210D0:: @ 081210D0 - .incbin "baserom.gba", 0x1210D0, 0x0000036 - .incbin "baserom.gba", 0x121106, 0x0000005 - .incbin "baserom.gba", 0x12110B, 0x0000001 + .incbin "baserom.gba", 0x1210D0, 0x000003C gUnk_0812110C:: @ 0812110C - .incbin "baserom.gba", 0x12110C, 0x0000007 - .incbin "baserom.gba", 0x121113, 0x0000006 - .incbin "baserom.gba", 0x121119, 0x0000003 - .incbin "baserom.gba", 0x12111C, 0x000002C + .incbin "baserom.gba", 0x12110C, 0x000003C gUnk_08121148:: @ 08121148 .incbin "baserom.gba", 0x121148, 0x000000C diff --git a/data/animations/object/specialFx.s b/data/animations/object/specialFx.s index 2d1b976c..9e6a1ede 100644 --- a/data/animations/object/specialFx.s +++ b/data/animations/object/specialFx.s @@ -17,8 +17,7 @@ gUnk_0811FBC1:: @ 0811FBC1 .incbin "baserom.gba", 0x11FBC1, 0x0000020 gUnk_0811FBE1:: @ 0811FBE1 - .incbin "baserom.gba", 0x11FBE1, 0x000000C - .incbin "baserom.gba", 0x11FBED, 0x0000010 + .incbin "baserom.gba", 0x11FBE1, 0x000001C gUnk_0811FBFD:: @ 0811FBFD .incbin "baserom.gba", 0x11FBFD, 0x0000014 @@ -135,46 +134,31 @@ gUnk_0811FFDF:: @ 0811FFDF .incbin "baserom.gba", 0x11FFDF, 0x0000018 gUnk_0811FFF7:: @ 0811FFF7 - .incbin "baserom.gba", 0x11FFF7, 0x0000009 - .incbin "baserom.gba", 0x120000, 0x0000004 - .incbin "baserom.gba", 0x120004, 0x0000006 - .incbin "baserom.gba", 0x12000A, 0x0000004 - .incbin "baserom.gba", 0x12000E, 0x0000001 - .incbin "baserom.gba", 0x12000F, 0x0000001 - .incbin "baserom.gba", 0x120010, 0x0000007 + .incbin "baserom.gba", 0x11FFF7, 0x0000020 gUnk_08120017:: @ 08120017 - .incbin "baserom.gba", 0x120017, 0x0000011 - .incbin "baserom.gba", 0x120028, 0x0000004 - .incbin "baserom.gba", 0x12002C, 0x000000F + .incbin "baserom.gba", 0x120017, 0x0000024 gUnk_0812003B:: @ 0812003B - .incbin "baserom.gba", 0x12003B, 0x0000017 - .incbin "baserom.gba", 0x120052, 0x000000A - .incbin "baserom.gba", 0x12005C, 0x0000007 + .incbin "baserom.gba", 0x12003B, 0x0000028 gUnk_08120063:: @ 08120063 .incbin "baserom.gba", 0x120063, 0x000001C gUnk_0812007F:: @ 0812007F - .incbin "baserom.gba", 0x12007F, 0x0000009 - .incbin "baserom.gba", 0x120088, 0x0000013 + .incbin "baserom.gba", 0x12007F, 0x000001C gUnk_0812009B:: @ 0812009B .incbin "baserom.gba", 0x12009B, 0x0000014 gUnk_081200AF:: @ 081200AF - .incbin "baserom.gba", 0x1200AF, 0x000001B - .incbin "baserom.gba", 0x1200CA, 0x0000001 + .incbin "baserom.gba", 0x1200AF, 0x000001C gUnk_081200CB:: @ 081200CB - .incbin "baserom.gba", 0x1200CB, 0x0000005 - .incbin "baserom.gba", 0x1200D0, 0x0000012 - .incbin "baserom.gba", 0x1200E2, 0x0000009 + .incbin "baserom.gba", 0x1200CB, 0x0000020 gUnk_081200EB:: @ 081200EB - .incbin "baserom.gba", 0x1200EB, 0x0000013 - .incbin "baserom.gba", 0x1200FE, 0x0000001 + .incbin "baserom.gba", 0x1200EB, 0x0000014 gUnk_081200FF:: @ 081200FF .incbin "baserom.gba", 0x1200FF, 0x0000024 @@ -189,8 +173,7 @@ gUnk_08120167:: @ 08120167 .incbin "baserom.gba", 0x120167, 0x0000018 gUnk_0812017F:: @ 0812017F - .incbin "baserom.gba", 0x12017F, 0x0000011 - .incbin "baserom.gba", 0x120190, 0x0000007 + .incbin "baserom.gba", 0x12017F, 0x0000018 gUnk_08120197:: @ 08120197 .incbin "baserom.gba", 0x120197, 0x0000018 @@ -199,9 +182,7 @@ gUnk_081201AF:: @ 081201AF .incbin "baserom.gba", 0x1201AF, 0x0000031 gUnk_081201E0:: @ 081201E0 - .incbin "baserom.gba", 0x1201E0, 0x000000D - .incbin "baserom.gba", 0x1201ED, 0x000000B - .incbin "baserom.gba", 0x1201F8, 0x0000011 + .incbin "baserom.gba", 0x1201E0, 0x0000029 gUnk_08120209:: @ 08120209 .incbin "baserom.gba", 0x120209, 0x0000038 @@ -210,8 +191,7 @@ gUnk_08120241:: @ 08120241 .incbin "baserom.gba", 0x120241, 0x0000038 gUnk_08120279:: @ 08120279 - .incbin "baserom.gba", 0x120279, 0x0000007 - .incbin "baserom.gba", 0x120280, 0x000002D + .incbin "baserom.gba", 0x120279, 0x0000034 gUnk_081202AD:: @ 081202AD .incbin "baserom.gba", 0x1202AD, 0x0000011 @@ -220,12 +200,10 @@ gUnk_081202BE:: @ 081202BE .incbin "baserom.gba", 0x1202BE, 0x0000025 gUnk_081202E3:: @ 081202E3 - .incbin "baserom.gba", 0x1202E3, 0x0000009 - .incbin "baserom.gba", 0x1202EC, 0x0000020 + .incbin "baserom.gba", 0x1202E3, 0x0000029 gUnk_0812030C:: @ 0812030C - .incbin "baserom.gba", 0x12030C, 0x0000014 - .incbin "baserom.gba", 0x120320, 0x0000030 + .incbin "baserom.gba", 0x12030C, 0x0000044 gUnk_08120350:: @ 08120350 .incbin "baserom.gba", 0x120350, 0x000001C @@ -237,8 +215,7 @@ gUnk_0812038C:: @ 0812038C .incbin "baserom.gba", 0x12038C, 0x0000038 gUnk_081203C4:: @ 081203C4 - .incbin "baserom.gba", 0x1203C4, 0x0000026 - .incbin "baserom.gba", 0x1203EA, 0x0000012 + .incbin "baserom.gba", 0x1203C4, 0x0000038 gUnk_081203FC:: @ 081203FC .4byte gUnk_0811FB10 diff --git a/data/const/code_08049D30.s b/data/const/code_08049D30.s index 704e9d84..abc012bb 100644 --- a/data/const/code_08049D30.s +++ b/data/const/code_08049D30.s @@ -78,8 +78,7 @@ gUnk_080D2C58:: @ 080D2C58 .4byte gUnk_080D3598 .incbin "baserom.gba", 0x0D2E10, 0x000000C .4byte gUnk_080FD318 - .incbin "baserom.gba", 0x0D2E20, 0x0000006 - .incbin "baserom.gba", 0x0D2E26, 0x0000006 + .incbin "baserom.gba", 0x0D2E20, 0x000000C .4byte gUnk_080FD2C0 .incbin "baserom.gba", 0x0D2E30, 0x000000C .4byte gUnk_080FD150 diff --git a/data/const/demoScreen.s b/data/const/demoScreen.s index d9a787fc..f9cd54be 100644 --- a/data/const/demoScreen.s +++ b/data/const/demoScreen.s @@ -12,7 +12,7 @@ demoFunctions:: .4byte sub_080A2F8C gUnk_08127C98:: -.incbin "baserom_demo.gba", 0x127c98, 0x30 + .incbin "baserom_demo.gba", 0x127C98, 0x0000030 gUnk_08127CC8:: -.incbin "baserom_demo.gba", 0x127CC8, 0x8 + .incbin "baserom_demo.gba", 0x127CC8, 0x0000008 .endif diff --git a/data/const/enemy/cuccoAggr.s b/data/const/enemy/cuccoAggr.s index 6ae74a7c..fc789b41 100644 --- a/data/const/enemy/cuccoAggr.s +++ b/data/const/enemy/cuccoAggr.s @@ -37,9 +37,7 @@ gUnk_080CF7C2:: @ 080CF7C2 .incbin "baserom.gba", 0x0CF7C2, 0x0000002 gUnk_080CF7C4:: @ 080CF7C4 - .incbin "baserom.gba", 0x0CF7C4, 0x0000037 - .incbin "baserom.gba", 0x0CF7FB, 0x0000018 - .incbin "baserom.gba", 0x0CF813, 0x0000011 + .incbin "baserom.gba", 0x0CF7C4, 0x0000060 gUnk_080CF824:: @ 080CF824 .incbin "baserom.gba", 0x0CF824, 0x0000004 diff --git a/data/const/enemy/spinyBeetle.s b/data/const/enemy/spinyBeetle.s index 6505833c..9367a26b 100644 --- a/data/const/enemy/spinyBeetle.s +++ b/data/const/enemy/spinyBeetle.s @@ -5,7 +5,7 @@ .align 2 unusedLabel_0CEBDC:: - .incbin "baserom.gba", 0x0CEBDC, 0x000010 + .incbin "baserom.gba", 0x0CEBDC, 0x0000010 gUnk_080CEBEC:: @ 080CEBEC .4byte sub_080337BC diff --git a/data/const/enemy/vaatiArm.s b/data/const/enemy/vaatiArm.s index 825025af..1bbf0782 100644 --- a/data/const/enemy/vaatiArm.s +++ b/data/const/enemy/vaatiArm.s @@ -88,8 +88,7 @@ gUnk_080D12D0:: @ 080D12D0 .4byte sub_080431E8 gUnk_080D12F8:: @ 080D12F8 - .incbin "baserom.gba", 0x0D12F8, 0x0000006 - .incbin "baserom.gba", 0x0D12FE, 0x0000002 + .incbin "baserom.gba", 0x0D12F8, 0x0000008 gUnk_080D1300:: @ 080D1300 .incbin "baserom.gba", 0x0D1300, 0x0000004 @@ -98,8 +97,7 @@ gUnk_080D1304:: @ 080D1304 .incbin "baserom.gba", 0x0D1304, 0x0000008 gUnk_080D130C:: @ 080D130C - .incbin "baserom.gba", 0x0D130C, 0x0000001 - .incbin "baserom.gba", 0x0D130D, 0x0000003 + .incbin "baserom.gba", 0x0D130C, 0x0000004 gUnk_080D1310:: @ 080D1310 .incbin "baserom.gba", 0x0D1310, 0x0000004 @@ -163,15 +161,10 @@ gUnk_080D13EC:: @ 080D13EC .incbin "baserom.gba", 0x0D13EC, 0x0000014 gUnk_080D1400:: @ 080D1400 - .incbin "baserom.gba", 0x0D1400, 0x000000D - .incbin "baserom.gba", 0x0D140D, 0x0000005 - .incbin "baserom.gba", 0x0D1412, 0x0000002 + .incbin "baserom.gba", 0x0D1400, 0x0000014 gUnk_080D1414:: @ 080D1414 - .incbin "baserom.gba", 0x0D1414, 0x0000003 - .incbin "baserom.gba", 0x0D1417, 0x0000001 - .incbin "baserom.gba", 0x0D1418, 0x0000001 + .incbin "baserom.gba", 0x0D1414, 0x0000005 gUnk_080D1419:: @ 080D1419 - .incbin "baserom.gba", 0x0D1419, 0x0000003 - .incbin "baserom.gba", 0x0D141C, 0x0000002 + .incbin "baserom.gba", 0x0D1419, 0x0000005 diff --git a/data/const/enemy/vaatiBall.s b/data/const/enemy/vaatiBall.s index e26f99d1..43cd37df 100644 --- a/data/const/enemy/vaatiBall.s +++ b/data/const/enemy/vaatiBall.s @@ -17,5 +17,4 @@ gUnk_080D1620:: @ 080D1620 .incbin "baserom.gba", 0x0D1620, 0x0000008 gUnk_080D1628:: @ 080D1628 - .incbin "baserom.gba", 0x0D1628, 0x0000007 - .incbin "baserom.gba", 0x0D162F, 0x0000009 + .incbin "baserom.gba", 0x0D1628, 0x0000010 diff --git a/data/const/enemy/vaatiTransfigured.s b/data/const/enemy/vaatiTransfigured.s index 40e34921..43251730 100644 --- a/data/const/enemy/vaatiTransfigured.s +++ b/data/const/enemy/vaatiTransfigured.s @@ -47,8 +47,7 @@ gUnk_080D0B0C:: @ 080D0B0C .4byte sub_080405D8 gUnk_080D0B18:: @ 080D0B18 - .incbin "baserom.gba", 0x0D0B18, 0x0000011 - .incbin "baserom.gba", 0x0D0B29, 0x000002F + .incbin "baserom.gba", 0x0D0B18, 0x0000040 gUnk_080D0B58:: @ 080D0B58 .incbin "baserom.gba", 0x0D0B58, 0x000000C diff --git a/data/const/manager/manager1.s b/data/const/manager/manager1.s index 9a21cd36..67076fa2 100644 --- a/data/const/manager/manager1.s +++ b/data/const/manager/manager1.s @@ -5,8 +5,7 @@ .align 2 gUnk_08107C1C:: @ 08107C1C - .incbin "baserom.gba", 0x107C1C, 0x000000E - .incbin "baserom.gba", 0x107C2A, 0x0000006 + .incbin "baserom.gba", 0x107C1C, 0x0000014 gUnk_08107C30:: @ 08107C30 .incbin "baserom.gba", 0x107C30, 0x0000010 diff --git a/data/const/manager/manager13.s b/data/const/manager/manager13.s index f6627b4d..8fcab1fa 100644 --- a/data/const/manager/manager13.s +++ b/data/const/manager/manager13.s @@ -5,8 +5,7 @@ .align 2 gUnk_081084C8:: @ 081084C8 - .incbin "baserom.gba", 0x1084C8, 0x000004A - .incbin "baserom.gba", 0x108512, 0x000001E + .incbin "baserom.gba", 0x1084C8, 0x0000068 gUnk_08108530:: @ 08108530 .incbin "baserom.gba", 0x108530, 0x0000058 diff --git a/data/const/manager/manager1A.s b/data/const/manager/manager1A.s index 392f3273..205ecd48 100644 --- a/data/const/manager/manager1A.s +++ b/data/const/manager/manager1A.s @@ -103,8 +103,7 @@ gUnk_081086FC:: @ 081086FC .incbin "baserom.gba", 0x1086FC, 0x0000008 gUnk_08108704:: @ 08108704 - .incbin "baserom.gba", 0x108704, 0x0000003 - .incbin "baserom.gba", 0x108707, 0x0000005 + .incbin "baserom.gba", 0x108704, 0x0000008 gUnk_0810870C:: @ 0810870C .incbin "baserom.gba", 0x10870C, 0x0000008 @@ -128,8 +127,7 @@ gUnk_0810873C:: @ 0810873C .incbin "baserom.gba", 0x10873C, 0x0000008 gUnk_08108744:: @ 08108744 - .incbin "baserom.gba", 0x108744, 0x0000006 - .incbin "baserom.gba", 0x10874A, 0x0000002 + .incbin "baserom.gba", 0x108744, 0x0000008 gUnk_0810874C:: @ 0810874C .incbin "baserom.gba", 0x10874C, 0x0000008 @@ -138,8 +136,7 @@ gUnk_08108754:: @ 08108754 .incbin "baserom.gba", 0x108754, 0x0000008 gUnk_0810875C:: @ 0810875C - .incbin "baserom.gba", 0x10875C, 0x0000002 - .incbin "baserom.gba", 0x10875E, 0x0000006 + .incbin "baserom.gba", 0x10875C, 0x0000008 gUnk_08108764:: @ 08108764 .incbin "baserom.gba", 0x108764, 0x0000020 @@ -154,18 +151,15 @@ gUnk_08108764:: @ 08108764 .4byte gUnk_081086A0 .incbin "baserom.gba", 0x1087D8, 0x0000010 .4byte gUnk_081086AC - .incbin "baserom.gba", 0x1087EC, 0x0000027 - .incbin "baserom.gba", 0x108813, 0x0000001 + .incbin "baserom.gba", 0x1087EC, 0x0000028 .4byte gUnk_081086DC .incbin "baserom.gba", 0x108818, 0x0000010 .4byte gUnk_081086E4 .incbin "baserom.gba", 0x10882C, 0x0000010 .4byte gUnk_081086EC - .incbin "baserom.gba", 0x108840, 0x0000004 - .incbin "baserom.gba", 0x108844, 0x000000C + .incbin "baserom.gba", 0x108840, 0x0000010 .4byte gUnk_081086F4 - .incbin "baserom.gba", 0x108854, 0x0000010 - .incbin "baserom.gba", 0x108864, 0x0000010 + .incbin "baserom.gba", 0x108854, 0x0000020 .4byte gUnk_0810867C .incbin "baserom.gba", 0x108878, 0x00001B8 .4byte gUnk_081086FC @@ -177,8 +171,7 @@ gUnk_08108764:: @ 08108764 .4byte gUnk_08108714 .incbin "baserom.gba", 0x108A84, 0x0000010 .4byte gUnk_0810871C - .incbin "baserom.gba", 0x108A98, 0x0000003 - .incbin "baserom.gba", 0x108A9B, 0x0000021 + .incbin "baserom.gba", 0x108A98, 0x0000024 .4byte gUnk_08108724 .incbin "baserom.gba", 0x108AC0, 0x0000010 .4byte gUnk_0810872C @@ -198,5 +191,4 @@ gUnk_08108764:: @ 08108764 .4byte gUnk_081086C4 .incbin "baserom.gba", 0x108B98, 0x0000010 .4byte gUnk_081086D0 - .incbin "baserom.gba", 0x108BAC, 0x0000066 - .incbin "baserom.gba", 0x108C12, 0x0000016 + .incbin "baserom.gba", 0x108BAC, 0x000007C diff --git a/data/const/manager/manager1C.s b/data/const/manager/manager1C.s index bf71a685..d9f3a0ad 100644 --- a/data/const/manager/manager1C.s +++ b/data/const/manager/manager1C.s @@ -9,8 +9,7 @@ gUnk_08108C64:: @ 08108C64 .4byte sub_0805B55C gUnk_08108C6C:: @ 08108C6C - .incbin "baserom.gba", 0x108C6C, 0x000000B - .incbin "baserom.gba", 0x108C77, 0x0000005 + .incbin "baserom.gba", 0x108C6C, 0x0000010 gUnk_08108C7C:: @ 08108C7C .incbin "baserom.gba", 0x108C7C, 0x0000004 diff --git a/data/const/manager/manager39.s b/data/const/manager/manager39.s index ddc4a570..fd012d35 100644 --- a/data/const/manager/manager39.s +++ b/data/const/manager/manager39.s @@ -15,8 +15,7 @@ gUnk_08108E30:: @ 08108E30 .incbin "baserom.gba", 0x108E30, 0x0000018 gUnk_08108E48:: @ 08108E48 - .incbin "baserom.gba", 0x108E48, 0x0000002 - .incbin "baserom.gba", 0x108E4A, 0x0000016 + .incbin "baserom.gba", 0x108E48, 0x0000018 gUnk_08108E60:: @ 08108E60 .incbin "baserom.gba", 0x108E60, 0x000000C diff --git a/data/const/manager/manager4.s b/data/const/manager/manager4.s index 90b5d2de..dba352c3 100644 --- a/data/const/manager/manager4.s +++ b/data/const/manager/manager4.s @@ -27,8 +27,7 @@ gUnk_08107CE0:: @ 08107CE0 .incbin "baserom.gba", 0x107CE0, 0x0000018 gUnk_08107CF8:: @ 08107CF8 - .incbin "baserom.gba", 0x107CF8, 0x000000A - .incbin "baserom.gba", 0x107D02, 0x0000006 + .incbin "baserom.gba", 0x107CF8, 0x0000010 gUnk_08107D08:: @ 08107D08 .incbin "baserom.gba", 0x107D08, 0x0000018 diff --git a/data/const/npc/beedle.s b/data/const/npc/beedle.s index 6d9eaf5a..cb20f9e2 100644 --- a/data/const/npc/beedle.s +++ b/data/const/npc/beedle.s @@ -11,8 +11,7 @@ gUnk_0810C894:: @ 0810C894 .incbin "baserom.gba", 0x10C894, 0x0000008 gUnk_0810C89C:: @ 0810C89C - .incbin "baserom.gba", 0x10C89C, 0x0000011 - .incbin "baserom.gba", 0x10C8AD, 0x0000027 + .incbin "baserom.gba", 0x10C89C, 0x0000038 gUnk_0810C8D4:: @ 0810C8D4 .incbin "baserom.gba", 0x10C8D4, 0x000000C diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s index abf45f41..3be658d4 100644 --- a/data/const/npc/bladeBrothers.s +++ b/data/const/npc/bladeBrothers.s @@ -31,16 +31,13 @@ gUnk_081115EC:: @ 081115EC .incbin "baserom.gba", 0x111610, 0x0000008 gUnk_08111618:: @ 08111618 - .incbin "baserom.gba", 0x111618, 0x0000003 - .incbin "baserom.gba", 0x11161B, 0x0000005 - .incbin "baserom.gba", 0x111620, 0x0000003 + .incbin "baserom.gba", 0x111618, 0x000000B gUnk_08111623:: @ 08111623 .incbin "baserom.gba", 0x111623, 0x0000008 gUnk_0811162B:: @ 0811162B - .incbin "baserom.gba", 0x11162B, 0x000000D - .incbin "baserom.gba", 0x111638, 0x000002C + .incbin "baserom.gba", 0x11162B, 0x0000039 gUnk_08111664:: @ 08111664 .incbin "baserom.gba", 0x111664, 0x0000016 @@ -67,11 +64,7 @@ gUnk_081116FE:: @ 081116FE .incbin "baserom.gba", 0x1116FE, 0x0000016 gUnk_08111714:: @ 08111714 - .incbin "baserom.gba", 0x111714, 0x0000003 - .incbin "baserom.gba", 0x111717, 0x0000001 - .incbin "baserom.gba", 0x111718, 0x0000001 - .incbin "baserom.gba", 0x111719, 0x0000001 - .incbin "baserom.gba", 0x11171A, 0x0000010 + .incbin "baserom.gba", 0x111714, 0x0000016 gUnk_0811172A:: @ 0811172A .incbin "baserom.gba", 0x11172A, 0x0000016 diff --git a/data/const/npc/carpenter.s b/data/const/npc/carpenter.s index cc7da4ba..8ffa071c 100644 --- a/data/const/npc/carpenter.s +++ b/data/const/npc/carpenter.s @@ -8,10 +8,7 @@ gUnk_08110CA8:: @ 08110CA8 .incbin "baserom.gba", 0x110CA8, 0x0000040 gUnk_08110CE8:: @ 08110CE8 - .incbin "baserom.gba", 0x110CE8, 0x000000A - .incbin "baserom.gba", 0x110CF2, 0x000000C - .incbin "baserom.gba", 0x110CFE, 0x0000002 + .incbin "baserom.gba", 0x110CE8, 0x0000018 gUnk_08110D00:: @ 08110D00 - .incbin "baserom.gba", 0x110D00, 0x0000002 - .incbin "baserom.gba", 0x110D02, 0x0000006 + .incbin "baserom.gba", 0x110D00, 0x0000008 diff --git a/data/const/npc/cat.s b/data/const/npc/cat.s index a62b4909..f0282149 100644 --- a/data/const/npc/cat.s +++ b/data/const/npc/cat.s @@ -8,15 +8,7 @@ gUnk_08110EF0:: @ 08110EF0 .incbin "baserom.gba", 0x110EF0, 0x0000008 gUnk_08110EF8:: @ 08110EF8 - .incbin "baserom.gba", 0x110EF8, 0x0000002 - .incbin "baserom.gba", 0x110EFA, 0x000000F - .incbin "baserom.gba", 0x110F09, 0x0000001 - .incbin "baserom.gba", 0x110F0A, 0x0000002 - .incbin "baserom.gba", 0x110F0C, 0x000000A - .incbin "baserom.gba", 0x110F16, 0x00000EA - .incbin "baserom.gba", 0x111000, 0x0000003 - .incbin "baserom.gba", 0x111003, 0x000000A - .incbin "baserom.gba", 0x11100D, 0x00000CB + .incbin "baserom.gba", 0x110EF8, 0x00001E0 gCat:: @ 081110D8 .4byte sub_080677EC @@ -36,11 +28,7 @@ gUnk_08111104:: @ 08111104 .incbin "baserom.gba", 0x111104, 0x0000008 gUnk_0811110C:: @ 0811110C - .incbin "baserom.gba", 0x11110C, 0x0000001 - .incbin "baserom.gba", 0x11110D, 0x0000001 - .incbin "baserom.gba", 0x11110E, 0x0000001 + .incbin "baserom.gba", 0x11110C, 0x0000003 gUnk_0811110F:: @ 0811110F - .incbin "baserom.gba", 0x11110F, 0x0000002 - .incbin "baserom.gba", 0x111111, 0x0000002 - .incbin "baserom.gba", 0x111113, 0x0000001 + .incbin "baserom.gba", 0x11110F, 0x0000005 diff --git a/data/const/npc/dog.s b/data/const/npc/dog.s index 714b0481..3057911f 100644 --- a/data/const/npc/dog.s +++ b/data/const/npc/dog.s @@ -26,8 +26,7 @@ gUnk_08111DA8:: @ 08111DA8 .incbin "baserom.gba", 0x111DA8, 0x0000008 gUnk_08111DB0:: @ 08111DB0 - .incbin "baserom.gba", 0x111DB0, 0x0000066 - .incbin "baserom.gba", 0x111E16, 0x000001A + .incbin "baserom.gba", 0x111DB0, 0x0000080 gUnk_08111E30:: @ 08111E30 .incbin "baserom.gba", 0x111E30, 0x0000004 diff --git a/data/const/npc/forestMinish.s b/data/const/npc/forestMinish.s index d2f84ac1..e409da20 100644 --- a/data/const/npc/forestMinish.s +++ b/data/const/npc/forestMinish.s @@ -54,10 +54,7 @@ gUnk_08109D18:: @ 08109D18 .4byte script_0800CD04 gUnk_08109DC8:: @ 08109DC8 - .incbin "baserom.gba", 0x109DC8, 0x000003F - .incbin "baserom.gba", 0x109E07, 0x000010E - .incbin "baserom.gba", 0x109F15, 0x0000052 - .incbin "baserom.gba", 0x109F67, 0x0000005 + .incbin "baserom.gba", 0x109DC8, 0x00001A4 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x109C30, 0x000002B @@ -98,9 +95,7 @@ gUnk_08109DC8:: @ 08109DC8 .4byte sub_080601D4 .incbin "baserom.gba", 0x10A080, 0x0000004 .4byte sub_080601D4 - .incbin "baserom.gba", 0x10A088, 0x00000D1 - .incbin "baserom.gba", 0x10A159, 0x0000048 - .incbin "baserom.gba", 0x10A1A1, 0x00001A7 + .incbin "baserom.gba", 0x10A088, 0x00002C0 gUnk_0810A348:: @ 0810A348 .incbin "baserom.gba", 0x10A348, 0x000000C diff --git a/data/const/npc/ghostBrothers.s b/data/const/npc/ghostBrothers.s index 6fdc653a..9a43d4b3 100644 --- a/data/const/npc/ghostBrothers.s +++ b/data/const/npc/ghostBrothers.s @@ -21,9 +21,7 @@ gUnk_0811017C:: @ 0811017C .4byte sub_08065DB8 gUnk_08110188:: @ 08110188 - .incbin "baserom.gba", 0x110188, 0x0000055 - .incbin "baserom.gba", 0x1101DD, 0x000001A - .incbin "baserom.gba", 0x1101F7, 0x0000037 + .incbin "baserom.gba", 0x110188, 0x00000A6 gUnk_0811022E:: @ 0811022E .incbin "baserom.gba", 0x11022E, 0x0000046 diff --git a/data/const/npc/guard.s b/data/const/npc/guard.s index 7c8084f8..cecede1b 100644 --- a/data/const/npc/guard.s +++ b/data/const/npc/guard.s @@ -5,96 +5,10 @@ .align 2 gUnk_0810CF4C:: @ 0810CF4C - .incbin "baserom.gba", 0x10CF4C, 0x000002B - .incbin "baserom.gba", 0x10CF77, 0x0000010 - .incbin "baserom.gba", 0x10CF87, 0x0000057 - .incbin "baserom.gba", 0x10CFDE, 0x0000039 - .incbin "baserom.gba", 0x10D017, 0x000008D + .incbin "baserom.gba", 0x10CF4C, 0x0000158 gUnk_0810D0A4:: @ 0810D0A4 - .incbin "baserom.gba", 0x10D0A4, 0x0000008 - .incbin "baserom.gba", 0x10D0AC, 0x000001E - .incbin "baserom.gba", 0x10D0CA, 0x0000009 - .incbin "baserom.gba", 0x10D0D3, 0x0000079 - .incbin "baserom.gba", 0x10D14C, 0x0000227 - .incbin "baserom.gba", 0x10D373, 0x0000003 - .incbin "baserom.gba", 0x10D376, 0x0000013 - .incbin "baserom.gba", 0x10D389, 0x000003E - .incbin "baserom.gba", 0x10D3C7, 0x0000040 - .incbin "baserom.gba", 0x10D407, 0x00000C7 - .incbin "baserom.gba", 0x10D4CE, 0x0000007 - .incbin "baserom.gba", 0x10D4D5, 0x000003C - .incbin "baserom.gba", 0x10D511, 0x0000006 - .incbin "baserom.gba", 0x10D517, 0x0000039 - .incbin "baserom.gba", 0x10D550, 0x0000024 - .incbin "baserom.gba", 0x10D574, 0x000005F - .incbin "baserom.gba", 0x10D5D3, 0x00000DE - .incbin "baserom.gba", 0x10D6B1, 0x0000056 - .incbin "baserom.gba", 0x10D707, 0x00000D2 - .incbin "baserom.gba", 0x10D7D9, 0x000002E - .incbin "baserom.gba", 0x10D807, 0x0000021 - .incbin "baserom.gba", 0x10D828, 0x00000DF - .incbin "baserom.gba", 0x10D907, 0x0000100 - .incbin "baserom.gba", 0x10DA07, 0x0000007 - .incbin "baserom.gba", 0x10DA0E, 0x00000B2 - .incbin "baserom.gba", 0x10DAC0, 0x0000041 - .incbin "baserom.gba", 0x10DB01, 0x0000003 - .incbin "baserom.gba", 0x10DB04, 0x0000005 - .incbin "baserom.gba", 0x10DB09, 0x00000FB - .incbin "baserom.gba", 0x10DC04, 0x0000017 - .incbin "baserom.gba", 0x10DC1B, 0x00000C0 - .incbin "baserom.gba", 0x10DCDB, 0x0000001 - .incbin "baserom.gba", 0x10DCDC, 0x000012B - .incbin "baserom.gba", 0x10DE07, 0x0000046 - .incbin "baserom.gba", 0x10DE4D, 0x0000293 - .incbin "baserom.gba", 0x10E0E0, 0x0000011 - .incbin "baserom.gba", 0x10E0F1, 0x000000C - .incbin "baserom.gba", 0x10E0FD, 0x00000C6 - .incbin "baserom.gba", 0x10E1C3, 0x000002D - .incbin "baserom.gba", 0x10E1F0, 0x00000FD - .incbin "baserom.gba", 0x10E2ED, 0x0000116 - .incbin "baserom.gba", 0x10E403, 0x000000A - .incbin "baserom.gba", 0x10E40D, 0x0000009 - .incbin "baserom.gba", 0x10E416, 0x0000072 - .incbin "baserom.gba", 0x10E488, 0x000008E - .incbin "baserom.gba", 0x10E516, 0x000007B - .incbin "baserom.gba", 0x10E591, 0x000005A - .incbin "baserom.gba", 0x10E5EB, 0x000001C - .incbin "baserom.gba", 0x10E607, 0x00000E1 - .incbin "baserom.gba", 0x10E6E8, 0x0000021 - .incbin "baserom.gba", 0x10E709, 0x00000DB - .incbin "baserom.gba", 0x10E7E4, 0x000000B - .incbin "baserom.gba", 0x10E7EF, 0x0000009 - .incbin "baserom.gba", 0x10E7F8, 0x000000F - .incbin "baserom.gba", 0x10E807, 0x0000001 - .incbin "baserom.gba", 0x10E808, 0x00000F0 - .incbin "baserom.gba", 0x10E8F8, 0x00000F8 - .incbin "baserom.gba", 0x10E9F0, 0x0000100 - .incbin "baserom.gba", 0x10EAF0, 0x000000E - .incbin "baserom.gba", 0x10EAFE, 0x000003E - .incbin "baserom.gba", 0x10EB3C, 0x000001F - .incbin "baserom.gba", 0x10EB5B, 0x0000064 - .incbin "baserom.gba", 0x10EBBF, 0x0000010 - .incbin "baserom.gba", 0x10EBCF, 0x0000010 - .incbin "baserom.gba", 0x10EBDF, 0x0000029 - .incbin "baserom.gba", 0x10EC08, 0x00000FC - .incbin "baserom.gba", 0x10ED04, 0x0000005 - .incbin "baserom.gba", 0x10ED09, 0x00000E0 - .incbin "baserom.gba", 0x10EDE9, 0x0000008 - .incbin "baserom.gba", 0x10EDF1, 0x0000036 - .incbin "baserom.gba", 0x10EE27, 0x0000056 - .incbin "baserom.gba", 0x10EE7D, 0x0000080 - .incbin "baserom.gba", 0x10EEFD, 0x0000148 - .incbin "baserom.gba", 0x10F045, 0x00000AA - .incbin "baserom.gba", 0x10F0EF, 0x0000001 - .incbin "baserom.gba", 0x10F0F0, 0x0000208 - .incbin "baserom.gba", 0x10F2F8, 0x0000006 - .incbin "baserom.gba", 0x10F2FE, 0x0000100 - .incbin "baserom.gba", 0x10F3FE, 0x0000002 - .incbin "baserom.gba", 0x10F400, 0x00000E6 - .incbin "baserom.gba", 0x10F4E6, 0x000000B - .incbin "baserom.gba", 0x10F4F1, 0x0000007 - .incbin "baserom.gba", 0x10F4F8, 0x000002C + .incbin "baserom.gba", 0x10D0A4, 0x0002480 gUnk_0810F524:: @ 0810F524 .incbin "baserom.gba", 0x10F524, 0x0000020 diff --git a/data/const/npc/hurdyGurdyMan.s b/data/const/npc/hurdyGurdyMan.s index b0b01bc2..a8497296 100644 --- a/data/const/npc/hurdyGurdyMan.s +++ b/data/const/npc/hurdyGurdyMan.s @@ -8,5 +8,4 @@ gUnk_081144F0:: @ 081144F0 .incbin "baserom.gba", 0x1144F0, 0x000000C gUnk_081144FC:: @ 081144FC - .incbin "baserom.gba", 0x1144FC, 0x0000035 - .incbin "baserom.gba", 0x114531, 0x000000B + .incbin "baserom.gba", 0x1144FC, 0x0000040 diff --git a/data/const/npc/kid.s b/data/const/npc/kid.s index 5995cbd9..25fb1fa2 100644 --- a/data/const/npc/kid.s +++ b/data/const/npc/kid.s @@ -39,10 +39,7 @@ gUnk_0810BE0C:: @ 0810BE0C gUnk_0810BE10:: @ 0810BE10 .4byte sub_08062130 .4byte sub_08062194 - .incbin "baserom.gba", 0x10BE18, 0x0000029 - .incbin "baserom.gba", 0x10BE41, 0x00000C2 - .incbin "baserom.gba", 0x10BF03, 0x0000104 - .incbin "baserom.gba", 0x10C007, 0x0000008 + .incbin "baserom.gba", 0x10BE18, 0x00001F7 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x10BCD3, 0x0000091 diff --git a/data/const/npc/maid.s b/data/const/npc/maid.s index 4923ced9..ba290716 100644 --- a/data/const/npc/maid.s +++ b/data/const/npc/maid.s @@ -11,6 +11,4 @@ gUnk_0810F88C:: @ 0810F88C .incbin "baserom.gba", 0x10F88C, 0x0000008 gUnk_0810F894:: @ 0810F894 - .incbin "baserom.gba", 0x10F894, 0x0000024 - .incbin "baserom.gba", 0x10F8B8, 0x0000018 - .incbin "baserom.gba", 0x10F8D0, 0x0000014 + .incbin "baserom.gba", 0x10F894, 0x0000050 diff --git a/data/const/npc/melari.s b/data/const/npc/melari.s index 8f74cd36..1e6b85aa 100644 --- a/data/const/npc/melari.s +++ b/data/const/npc/melari.s @@ -5,9 +5,7 @@ .align 2 gUnk_08111520:: @ 08111520 - .incbin "baserom.gba", 0x111520, 0x0000007 - .incbin "baserom.gba", 0x111527, 0x0000002 - .incbin "baserom.gba", 0x111529, 0x0000007 + .incbin "baserom.gba", 0x111520, 0x0000010 gUnk_08111530:: @ 08111530 .4byte sub_08068708 diff --git a/data/const/npc/mountainMinish.s b/data/const/npc/mountainMinish.s index 3da31b19..3fa00d84 100644 --- a/data/const/npc/mountainMinish.s +++ b/data/const/npc/mountainMinish.s @@ -8,15 +8,10 @@ gUnk_08111284:: @ 08111284 .incbin "baserom.gba", 0x111284, 0x0000080 gUnk_08111304:: @ 08111304 - .incbin "baserom.gba", 0x111304, 0x0000009 - .incbin "baserom.gba", 0x11130D, 0x0000001 + .incbin "baserom.gba", 0x111304, 0x000000A gUnk_0811130E:: @ 0811130E - .incbin "baserom.gba", 0x11130E, 0x0000001 - .incbin "baserom.gba", 0x11130F, 0x0000009 - .incbin "baserom.gba", 0x111318, 0x0000006 - .incbin "baserom.gba", 0x11131E, 0x0000025 - .incbin "baserom.gba", 0x111343, 0x0000015 + .incbin "baserom.gba", 0x11130E, 0x000004A gUnk_08111358:: @ 08111358 .incbin "baserom.gba", 0x111358, 0x0000010 diff --git a/data/const/npc/postman.s b/data/const/npc/postman.s index f8c4a66a..fdcf2128 100644 --- a/data/const/npc/postman.s +++ b/data/const/npc/postman.s @@ -5,8 +5,7 @@ .align 2 gUnk_0810A66C:: @ 0810A66C - .incbin "baserom.gba", 0x10A66C, 0x00000BC - .incbin "baserom.gba", 0x10A728, 0x0000040 + .incbin "baserom.gba", 0x10A66C, 0x00000FC gUnk_0810A768:: @ 0810A768 .incbin "baserom.gba", 0x10A768, 0x0000005 diff --git a/data/const/npc/sittingPerson.s b/data/const/npc/sittingPerson.s index b20eaaae..4ad51425 100644 --- a/data/const/npc/sittingPerson.s +++ b/data/const/npc/sittingPerson.s @@ -8,8 +8,7 @@ gUnk_0810CB78:: @ 0810CB78 .incbin "baserom.gba", 0x10CB78, 0x0000048 gUnk_0810CBC0:: @ 0810CBC0 - .incbin "baserom.gba", 0x10CBC0, 0x000000D - .incbin "baserom.gba", 0x10CBCD, 0x000000B + .incbin "baserom.gba", 0x10CBC0, 0x0000018 gUnk_0810CBD8:: @ 0810CBD8 .4byte sub_08063758 diff --git a/data/const/npc/smallTownMinish.s b/data/const/npc/smallTownMinish.s index 2d55f9ea..165c6a42 100644 --- a/data/const/npc/smallTownMinish.s +++ b/data/const/npc/smallTownMinish.s @@ -11,7 +11,4 @@ gUnk_08114304:: @ 08114304 .incbin "baserom.gba", 0x114304, 0x0000004 gUnk_08114308:: @ 08114308 - .incbin "baserom.gba", 0x114308, 0x0000128 - .incbin "baserom.gba", 0x114430, 0x0000002 - .incbin "baserom.gba", 0x114432, 0x0000012 - .incbin "baserom.gba", 0x114444, 0x0000084 + .incbin "baserom.gba", 0x114308, 0x00001C0 diff --git a/data/const/npc/smith.s b/data/const/npc/smith.s index 6ad5530e..b118b1af 100644 --- a/data/const/npc/smith.s +++ b/data/const/npc/smith.s @@ -26,8 +26,7 @@ gUnk_08110390:: @ 08110390 .incbin "baserom.gba", 0x110390, 0x0000040 gUnk_081103D0:: @ 081103D0 - .incbin "baserom.gba", 0x1103D0, 0x000000B - .incbin "baserom.gba", 0x1103DB, 0x0000005 + .incbin "baserom.gba", 0x1103D0, 0x0000010 gUnk_081103E0:: @ 081103E0 .incbin "baserom.gba", 0x1103E0, 0x0000004 diff --git a/data/const/npc/sturgeon.s b/data/const/npc/sturgeon.s index 338ea85b..f5ddac83 100644 --- a/data/const/npc/sturgeon.s +++ b/data/const/npc/sturgeon.s @@ -17,10 +17,7 @@ gUnk_0810FA54:: @ 0810FA54 .incbin "baserom.gba", 0x10FA54, 0x0000006 gUnk_0810FA5A:: @ 0810FA5A - .incbin "baserom.gba", 0x10FA5A, 0x0000097 - .incbin "baserom.gba", 0x10FAF1, 0x0000002 - .incbin "baserom.gba", 0x10FAF3, 0x0000004 - .incbin "baserom.gba", 0x10FAF7, 0x000002D + .incbin "baserom.gba", 0x10FA5A, 0x00000CA gUnk_0810FB24:: @ 0810FB24 .incbin "baserom.gba", 0x10FB24, 0x0000015 diff --git a/data/const/npc/townMinish.s b/data/const/npc/townMinish.s index 5db87830..cbdee4d8 100644 --- a/data/const/npc/townMinish.s +++ b/data/const/npc/townMinish.s @@ -5,8 +5,7 @@ .align 2 gUnk_081125F4:: @ 081125F4 - .incbin "baserom.gba", 0x1125F4, 0x000000C - .incbin "baserom.gba", 0x112600, 0x0000074 + .incbin "baserom.gba", 0x1125F4, 0x0000080 gUnk_08112674:: @ 08112674 .incbin "baserom.gba", 0x112674, 0x0000060 diff --git a/data/const/npc/townsperson.s b/data/const/npc/townsperson.s index 6580cef7..5e0d50a2 100644 --- a/data/const/npc/townsperson.s +++ b/data/const/npc/townsperson.s @@ -5,9 +5,7 @@ .align 2 gUnk_0810B680:: @ 0810B680 - .incbin "baserom.gba", 0x10B680, 0x000002A - .incbin "baserom.gba", 0x10B6AA, 0x0000009 - .incbin "baserom.gba", 0x10B6B3, 0x0000021 + .incbin "baserom.gba", 0x10B680, 0x0000054 gUnk_0810B6D4:: @ 0810B6D4 .incbin "baserom.gba", 0x10B6D4, 0x000000C @@ -45,8 +43,7 @@ gUnk_0810B748:: @ 0810B748 .incbin "baserom.gba", 0x10B748, 0x0000002 gUnk_0810B74A:: @ 0810B74A - .incbin "baserom.gba", 0x10B74A, 0x0000018 - .incbin "baserom.gba", 0x10B762, 0x0000012 + .incbin "baserom.gba", 0x10B74A, 0x000002A gUnk_0810B774:: @ 0810B774 .4byte sub_08061BC8 @@ -62,15 +59,13 @@ gUnk_0810B78C:: @ 0810B78C .incbin "baserom.gba", 0x10B78C, 0x0000004 gUnk_0810B790:: @ 0810B790 - .incbin "baserom.gba", 0x10B790, 0x000001C - .incbin "baserom.gba", 0x10B7AC, 0x000000E + .incbin "baserom.gba", 0x10B790, 0x000002A gUnk_0810B7BA:: @ 0810B7BA .incbin "baserom.gba", 0x10B7BA, 0x0000006 gUnk_0810B7C0:: @ 0810B7C0 - .incbin "baserom.gba", 0x10B7C0, 0x000012B - .incbin "baserom.gba", 0x10B8EB, 0x0000037 + .incbin "baserom.gba", 0x10B7C0, 0x0000162 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x10B5E6, 0x0000049 @@ -121,8 +116,7 @@ gUnk_0810B7C0:: @ 0810B7C0 .endif .incbin "baserom.gba", 0x10BB18, 0x0000044 .4byte sub_0806200C - .incbin "baserom.gba", 0x10BB60, 0x0000011 - .incbin "baserom.gba", 0x10BB71, 0x000005B + .incbin "baserom.gba", 0x10BB60, 0x000006C .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x10B890, 0x000009C diff --git a/data/const/npc/zelda.s b/data/const/npc/zelda.s index ff167e21..01526464 100644 --- a/data/const/npc/zelda.s +++ b/data/const/npc/zelda.s @@ -9,9 +9,7 @@ gUnk_08110BD8:: @ 08110BD8 .4byte sub_08066CF8 gUnk_08110BE0:: @ 08110BE0 - .incbin "baserom.gba", 0x110BE0, 0x000001F - .incbin "baserom.gba", 0x110BFF, 0x0000001 + .incbin "baserom.gba", 0x110BE0, 0x0000020 gUnk_08110C00:: @ 08110C00 - .incbin "baserom.gba", 0x110C00, 0x0000003 - .incbin "baserom.gba", 0x110C03, 0x0000009 + .incbin "baserom.gba", 0x110C00, 0x000000C diff --git a/data/const/object/beanstalk.s b/data/const/object/beanstalk.s index c8078cd3..a88e9a0f 100644 --- a/data/const/object/beanstalk.s +++ b/data/const/object/beanstalk.s @@ -9,12 +9,7 @@ gUnk_08120DF4:: @ 08120DF4 .4byte sub_08089F08 gUnk_08120DFC:: @ 08120DFC - .incbin "baserom.gba", 0x120DFC, 0x0000004 - .incbin "baserom.gba", 0x120E00, 0x0000001 - .incbin "baserom.gba", 0x120E01, 0x0000001 - .incbin "baserom.gba", 0x120E02, 0x0000006 - .incbin "baserom.gba", 0x120E08, 0x000000B - .incbin "baserom.gba", 0x120E13, 0x0000001 + .incbin "baserom.gba", 0x120DFC, 0x0000018 gUnk_08120E14:: @ 08120E14 .incbin "baserom.gba", 0x120E14, 0x0000028 diff --git a/data/const/object/bossDoor.s b/data/const/object/bossDoor.s index 09761f96..adb2f638 100644 --- a/data/const/object/bossDoor.s +++ b/data/const/object/bossDoor.s @@ -20,6 +20,4 @@ gUnk_081214FC:: @ 081214FC .incbin "baserom.gba", 0x1214FC, 0x0000010 gUnk_0812150C:: @ 0812150C - .incbin "baserom.gba", 0x12150C, 0x0000001 - .incbin "baserom.gba", 0x12150D, 0x0000005 - .incbin "baserom.gba", 0x121512, 0x0000002 + .incbin "baserom.gba", 0x12150C, 0x0000008 diff --git a/data/const/object/fileScreenObjects.s b/data/const/object/fileScreenObjects.s index 416cbb64..b0efbd2a 100644 --- a/data/const/object/fileScreenObjects.s +++ b/data/const/object/fileScreenObjects.s @@ -52,5 +52,4 @@ gUnk_08121D48:: @ 08121D48 .incbin "baserom.gba", 0x121D48, 0x000000C gUnk_08121D54:: @ 08121D54 - .incbin "baserom.gba", 0x121D54, 0x00000BD - .incbin "baserom.gba", 0x121E11, 0x0000013 + .incbin "baserom.gba", 0x121D54, 0x00000D0 diff --git a/data/const/object/furniture.s b/data/const/object/furniture.s index 96aed5df..a243d7f6 100644 --- a/data/const/object/furniture.s +++ b/data/const/object/furniture.s @@ -5,8 +5,4 @@ .align 2 gUnk_08121EF8:: @ 08121EF8 - .incbin "baserom.gba", 0x121EF8, 0x0000036 - .incbin "baserom.gba", 0x121F2E, 0x00000D2 - .incbin "baserom.gba", 0x122000, 0x000001C - .incbin "baserom.gba", 0x12201C, 0x0000016 - .incbin "baserom.gba", 0x122032, 0x00000F6 + .incbin "baserom.gba", 0x121EF8, 0x0000230 diff --git a/data/const/object/itemOnGround.s b/data/const/object/itemOnGround.s index 410c8c80..78fbd7f4 100644 --- a/data/const/object/itemOnGround.s +++ b/data/const/object/itemOnGround.s @@ -49,9 +49,4 @@ gUnk_0811E840:: @ 0811E840 .4byte sub_080813F0 gUnk_0811E84C:: @ 0811E84C - .incbin "baserom.gba", 0x11E84C, 0x00000B0 - .incbin "baserom.gba", 0x11E8FC, 0x00000FA - .incbin "baserom.gba", 0x11E9F6, 0x0000001 - .incbin "baserom.gba", 0x11E9F7, 0x0000124 - .incbin "baserom.gba", 0x11EB1B, 0x00000DE - .incbin "baserom.gba", 0x11EBF9, 0x0000003 + .incbin "baserom.gba", 0x11E84C, 0x00003B0 diff --git a/data/const/object/jailBars.s b/data/const/object/jailBars.s index b67a833d..70d96c8f 100644 --- a/data/const/object/jailBars.s +++ b/data/const/object/jailBars.s @@ -11,8 +11,7 @@ gUnk_08124950:: @ 08124950 .4byte nullsub_127 gUnk_08124960:: @ 08124960 - .incbin "baserom.gba", 0x124960, 0x0000005 - .incbin "baserom.gba", 0x124965, 0x0000015 + .incbin "baserom.gba", 0x124960, 0x000001A gUnk_0812497A:: @ 0812497A .incbin "baserom.gba", 0x12497A, 0x000001A diff --git a/data/const/object/object3A.s b/data/const/object/object3A.s index 1e0e25c1..e7ce38b9 100644 --- a/data/const/object/object3A.s +++ b/data/const/object/object3A.s @@ -5,10 +5,7 @@ .align 2 gUnk_081215E8:: @ 081215E8 - .incbin "baserom.gba", 0x1215E8, 0x000002A - .incbin "baserom.gba", 0x121612, 0x0000002 - .incbin "baserom.gba", 0x121614, 0x000000D - .incbin "baserom.gba", 0x121621, 0x0000017 + .incbin "baserom.gba", 0x1215E8, 0x0000050 gUnk_08121638:: @ 08121638 .4byte sub_0808C6D4 diff --git a/data/const/object/object3E.s b/data/const/object/object3E.s index fabfbe5c..8d47e38d 100644 --- a/data/const/object/object3E.s +++ b/data/const/object/object3E.s @@ -17,11 +17,7 @@ gUnk_081216DC:: @ 081216DC .4byte sub_0808D194 gUnk_08121704:: @ 08121704 - .incbin "baserom.gba", 0x121704, 0x0000010 - .incbin "baserom.gba", 0x121714, 0x0000002 - .incbin "baserom.gba", 0x121716, 0x0000001 - .incbin "baserom.gba", 0x121717, 0x0000002 - .incbin "baserom.gba", 0x121719, 0x0000007 + .incbin "baserom.gba", 0x121704, 0x000001C gUnk_08121720:: @ 08121720 .incbin "baserom.gba", 0x121720, 0x000000C diff --git a/data/const/object/pushableGrave.s b/data/const/object/pushableGrave.s index aabd1cee..6fa8858d 100644 --- a/data/const/object/pushableGrave.s +++ b/data/const/object/pushableGrave.s @@ -12,8 +12,7 @@ gUnk_081232AC:: @ 081232AC .4byte nullsub_528 gUnk_081232C0:: @ 081232C0 - .incbin "baserom.gba", 0x1232C0, 0x000001D - .incbin "baserom.gba", 0x1232DD, 0x0000001 + .incbin "baserom.gba", 0x1232C0, 0x000001E gUnk_081232DE:: @ 081232DE .incbin "baserom.gba", 0x1232DE, 0x0000006 diff --git a/data/const/object/pushableStatue.s b/data/const/object/pushableStatue.s index 5fe2b449..409e89f0 100644 --- a/data/const/object/pushableStatue.s +++ b/data/const/object/pushableStatue.s @@ -22,8 +22,7 @@ gUnk_08120CBC:: @ 08120CBC .incbin "baserom.gba", 0x120CBC, 0x0000010 gUnk_08120CCC:: @ 08120CCC - .incbin "baserom.gba", 0x120CCC, 0x000003D - .incbin "baserom.gba", 0x120D09, 0x0000063 + .incbin "baserom.gba", 0x120CCC, 0x00000A0 gUnk_08120D6C:: @ 08120D6C .incbin "baserom.gba", 0x120D6C, 0x000001A diff --git a/data/const/playerItem/playerItemGustJar.s b/data/const/playerItem/playerItemGustJar.s index 1672d03f..a2118096 100644 --- a/data/const/playerItem/playerItemGustJar.s +++ b/data/const/playerItem/playerItemGustJar.s @@ -22,9 +22,7 @@ gUnk_08132714:: @ 08132714 .4byte gUnk_08132B0C gUnk_08132734:: @ 08132734 - .incbin "baserom.gba", 0x132734, 0x0000001 - .incbin "baserom.gba", 0x132735, 0x0000001 - .incbin "baserom.gba", 0x132736, 0x000000E + .incbin "baserom.gba", 0x132734, 0x0000010 gUnk_08132744:: @ 08132744 .incbin "baserom.gba", 0x132744, 0x0000010 @@ -66,8 +64,7 @@ gUnk_081327DC:: @ 081327DC .4byte 00000000 gUnk_08132810:: @ 08132810 - .incbin "baserom.gba", 0x132810, 0x0000017 - .incbin "baserom.gba", 0x132827, 0x00002B9 + .incbin "baserom.gba", 0x132810, 0x00002D0 gUnk_08132AE0:: @ 08132AE0 .incbin "baserom.gba", 0x132AE0, 0x000000A diff --git a/data/data_08000360.s b/data/data_08000360.s index 8ac31629..2e6d4891 100644 --- a/data/data_08000360.s +++ b/data/data_08000360.s @@ -5,136 +5,4 @@ .align 2 gUnk_08000360:: @ 08000360 - .incbin "baserom.gba", 0x000360, 0x0000098 - .incbin "baserom.gba", 0x0003F8, 0x0000008 - .incbin "baserom.gba", 0x000400, 0x0000001 - .incbin "baserom.gba", 0x000401, 0x0000001 - .incbin "baserom.gba", 0x000402, 0x0000002 - .incbin "baserom.gba", 0x000404, 0x0000002 - .incbin "baserom.gba", 0x000406, 0x0000003 - .incbin "baserom.gba", 0x000409, 0x0000003 - .incbin "baserom.gba", 0x00040C, 0x0000002 - .incbin "baserom.gba", 0x00040E, 0x0000001 - .incbin "baserom.gba", 0x00040F, 0x0000005 - .incbin "baserom.gba", 0x000414, 0x0000001 - .incbin "baserom.gba", 0x000415, 0x0000004 - .incbin "baserom.gba", 0x000419, 0x0000007 - .incbin "baserom.gba", 0x000420, 0x0000020 - .incbin "baserom.gba", 0x000440, 0x0000040 - .incbin "baserom.gba", 0x000480, 0x0000001 - .incbin "baserom.gba", 0x000481, 0x0000085 - .incbin "baserom.gba", 0x000506, 0x0000002 - .incbin "baserom.gba", 0x000508, 0x0000001 - .incbin "baserom.gba", 0x000509, 0x0000007 - .incbin "baserom.gba", 0x000510, 0x0000017 - .incbin "baserom.gba", 0x000527, 0x0000019 - .incbin "baserom.gba", 0x000540, 0x00000B7 - .incbin "baserom.gba", 0x0005F7, 0x0000009 - .incbin "baserom.gba", 0x000600, 0x0000004 - .incbin "baserom.gba", 0x000604, 0x0000008 - .incbin "baserom.gba", 0x00060C, 0x0000004 - .incbin "baserom.gba", 0x000610, 0x000000A - .incbin "baserom.gba", 0x00061A, 0x0000006 - .incbin "baserom.gba", 0x000620, 0x0000008 - .incbin "baserom.gba", 0x000628, 0x0000008 - .incbin "baserom.gba", 0x000630, 0x0000010 - .incbin "baserom.gba", 0x000640, 0x0000040 - .incbin "baserom.gba", 0x000680, 0x0000005 - .incbin "baserom.gba", 0x000685, 0x0000001 - .incbin "baserom.gba", 0x000686, 0x0000065 - .incbin "baserom.gba", 0x0006EB, 0x0000011 - .incbin "baserom.gba", 0x0006FC, 0x0000004 - .incbin "baserom.gba", 0x000700, 0x0000001 - .incbin "baserom.gba", 0x000701, 0x0000005 - .incbin "baserom.gba", 0x000706, 0x0000002 - .incbin "baserom.gba", 0x000708, 0x0000005 - .incbin "baserom.gba", 0x00070D, 0x0000002 - .incbin "baserom.gba", 0x00070F, 0x0000001 - .incbin "baserom.gba", 0x000710, 0x0000009 - .incbin "baserom.gba", 0x000719, 0x0000007 - .incbin "baserom.gba", 0x000720, 0x0000010 - .incbin "baserom.gba", 0x000730, 0x0000010 - .incbin "baserom.gba", 0x000740, 0x0000010 - .incbin "baserom.gba", 0x000750, 0x0000010 - .incbin "baserom.gba", 0x000760, 0x0000020 - .incbin "baserom.gba", 0x000780, 0x0000004 - .incbin "baserom.gba", 0x000784, 0x0000001 - .incbin "baserom.gba", 0x000785, 0x000000B - .incbin "baserom.gba", 0x000790, 0x0000010 - .incbin "baserom.gba", 0x0007A0, 0x0000030 - .incbin "baserom.gba", 0x0007D0, 0x0000020 - .incbin "baserom.gba", 0x0007F0, 0x0000010 - .incbin "baserom.gba", 0x000800, 0x0000002 - .incbin "baserom.gba", 0x000802, 0x0000002 - .incbin "baserom.gba", 0x000804, 0x0000001 - .incbin "baserom.gba", 0x000805, 0x0000001 - .incbin "baserom.gba", 0x000806, 0x0000001 - .incbin "baserom.gba", 0x000807, 0x0000001 - .incbin "baserom.gba", 0x000808, 0x0000003 - .incbin "baserom.gba", 0x00080B, 0x0000001 - .incbin "baserom.gba", 0x00080C, 0x0000003 - .incbin "baserom.gba", 0x00080F, 0x0000001 - .incbin "baserom.gba", 0x000810, 0x0000001 - .incbin "baserom.gba", 0x000811, 0x0000005 - .incbin "baserom.gba", 0x000816, 0x0000002 - .incbin "baserom.gba", 0x000818, 0x0000009 - .incbin "baserom.gba", 0x000821, 0x0000004 - .incbin "baserom.gba", 0x000825, 0x0000011 - .incbin "baserom.gba", 0x000836, 0x0000001 - .incbin "baserom.gba", 0x000837, 0x0000001 - .incbin "baserom.gba", 0x000838, 0x0000008 - .incbin "baserom.gba", 0x000840, 0x0000030 - .incbin "baserom.gba", 0x000870, 0x000002C - .incbin "baserom.gba", 0x00089C, 0x0000004 - .incbin "baserom.gba", 0x0008A0, 0x000005D - .incbin "baserom.gba", 0x0008FD, 0x0000003 - .incbin "baserom.gba", 0x000900, 0x0000001 - .incbin "baserom.gba", 0x000901, 0x0000004 - .incbin "baserom.gba", 0x000905, 0x0000009 - .incbin "baserom.gba", 0x00090E, 0x0000001 - .incbin "baserom.gba", 0x00090F, 0x0000002 - .incbin "baserom.gba", 0x000911, 0x000002F - .incbin "baserom.gba", 0x000940, 0x000001A - .incbin "baserom.gba", 0x00095A, 0x0000026 - .incbin "baserom.gba", 0x000980, 0x000004E - .incbin "baserom.gba", 0x0009CE, 0x0000028 - .incbin "baserom.gba", 0x0009F6, 0x0000004 - .incbin "baserom.gba", 0x0009FA, 0x0000006 - .incbin "baserom.gba", 0x000A00, 0x0000005 - .incbin "baserom.gba", 0x000A05, 0x0000003 - .incbin "baserom.gba", 0x000A08, 0x0000001 - .incbin "baserom.gba", 0x000A09, 0x0000007 - .incbin "baserom.gba", 0x000A10, 0x0000002 - .incbin "baserom.gba", 0x000A12, 0x0000001 - .incbin "baserom.gba", 0x000A13, 0x0000001 - .incbin "baserom.gba", 0x000A14, 0x0000001 - .incbin "baserom.gba", 0x000A15, 0x0000023 - .incbin "baserom.gba", 0x000A38, 0x0000008 - .incbin "baserom.gba", 0x000A40, 0x0000044 - .incbin "baserom.gba", 0x000A84, 0x000008F - .incbin "baserom.gba", 0x000B13, 0x0000002 - .incbin "baserom.gba", 0x000B15, 0x0000001 - .incbin "baserom.gba", 0x000B16, 0x000000A - .incbin "baserom.gba", 0x000B20, 0x0000020 - .incbin "baserom.gba", 0x000B40, 0x00000C0 - .incbin "baserom.gba", 0x000C00, 0x0000004 - .incbin "baserom.gba", 0x000C04, 0x0000005 - .incbin "baserom.gba", 0x000C09, 0x0000007 - .incbin "baserom.gba", 0x000C10, 0x0000006 - .incbin "baserom.gba", 0x000C16, 0x000000F - .incbin "baserom.gba", 0x000C25, 0x0000002 - .incbin "baserom.gba", 0x000C27, 0x0000001 - .incbin "baserom.gba", 0x000C28, 0x0000001 - .incbin "baserom.gba", 0x000C29, 0x000000A - .incbin "baserom.gba", 0x000C33, 0x000001D - .incbin "baserom.gba", 0x000C50, 0x00000C3 - .incbin "baserom.gba", 0x000D13, 0x00000DC - .incbin "baserom.gba", 0x000DEF, 0x0000007 - .incbin "baserom.gba", 0x000DF6, 0x000000A - .incbin "baserom.gba", 0x000E00, 0x0000001 - .incbin "baserom.gba", 0x000E01, 0x0000001 - .incbin "baserom.gba", 0x000E02, 0x0000001 - .incbin "baserom.gba", 0x000E03, 0x000001D - .incbin "baserom.gba", 0x000E20, 0x0000006 - .incbin "baserom.gba", 0x000E26, 0x0000017 - .incbin "baserom.gba", 0x000E3D, 0x0000007 + .incbin "baserom.gba", 0x000360, 0x0000AE4 diff --git a/data/data_08000F54.s b/data/data_08000F54.s index 2ec64ed1..5ebb57bf 100644 --- a/data/data_08000F54.s +++ b/data/data_08000F54.s @@ -22,38 +22,25 @@ gUnk_08000F84:: @ 08000F84 .incbin "baserom.gba", 0x000F84, 0x0000040 gUnk_08000FC4:: @ 08000FC4 - .incbin "baserom.gba", 0x000FC4, 0x000002D - .incbin "baserom.gba", 0x000FF1, 0x0000009 - .incbin "baserom.gba", 0x000FFA, 0x0000006 - .incbin "baserom.gba", 0x001000, 0x0000004 + .incbin "baserom.gba", 0x000FC4, 0x0000040 gUnk_08001004:: @ 08001004 - .incbin "baserom.gba", 0x001004, 0x000000C - .incbin "baserom.gba", 0x001010, 0x000000C - .incbin "baserom.gba", 0x00101C, 0x0000004 - .incbin "baserom.gba", 0x001020, 0x0000005 - .incbin "baserom.gba", 0x001025, 0x000000C - .incbin "baserom.gba", 0x001031, 0x0000013 + .incbin "baserom.gba", 0x001004, 0x0000040 gUnk_08001044:: @ 08001044 - .incbin "baserom.gba", 0x001044, 0x000000C - .incbin "baserom.gba", 0x001050, 0x0000034 + .incbin "baserom.gba", 0x001044, 0x0000040 gUnk_08001084:: @ 08001084 .incbin "baserom.gba", 0x001084, 0x0000040 gUnk_080010C4:: @ 080010C4 - .incbin "baserom.gba", 0x0010C4, 0x0000033 - .incbin "baserom.gba", 0x0010F7, 0x000000A - .incbin "baserom.gba", 0x001101, 0x0000003 + .incbin "baserom.gba", 0x0010C4, 0x0000040 gUnk_08001104:: @ 08001104 - .incbin "baserom.gba", 0x001104, 0x0000011 - .incbin "baserom.gba", 0x001115, 0x000002F + .incbin "baserom.gba", 0x001104, 0x0000040 gUnk_08001144:: @ 08001144 - .incbin "baserom.gba", 0x001144, 0x000002B - .incbin "baserom.gba", 0x00116F, 0x0000015 + .incbin "baserom.gba", 0x001144, 0x0000040 gUnk_08001184:: @ 08001184 .incbin "baserom.gba", 0x001184, 0x0000040 diff --git a/data/data_080029B4.s b/data/data_080029B4.s index 544a7b9d..50c84c7f 100644 --- a/data/data_080029B4.s +++ b/data/data_080029B4.s @@ -1399,7 +1399,4 @@ gUnk_08003DD4:: @ 08003DD4 .4byte 00000000 gUnk_08003E44:: @ 08003E44 - .incbin "baserom.gba", 0x003E44, 0x0000032 - .incbin "baserom.gba", 0x003E76, 0x000000A - .incbin "baserom.gba", 0x003E80, 0x0000087 - .incbin "baserom.gba", 0x003F07, 0x00000BD + .incbin "baserom.gba", 0x003E44, 0x0000180 diff --git a/data/data_08007DF4.s b/data/data_08007DF4.s index 6e8ed015..f66e60f6 100644 --- a/data/data_08007DF4.s +++ b/data/data_08007DF4.s @@ -23,8 +23,7 @@ gUnk_08007E7C:: @ 08007E7C .incbin "baserom.gba", 0x007E7C, 0x0000020 gUnk_08007E9C:: @ 08007E9C - .incbin "baserom.gba", 0x007E9C, 0x0000017 - .incbin "baserom.gba", 0x007EB3, 0x0000009 + .incbin "baserom.gba", 0x007E9C, 0x0000020 gUnk_08007EBC:: @ 08007EBC .incbin "baserom.gba", 0x007EBC, 0x0000020 @@ -45,12 +44,10 @@ gUnk_08007F5C:: @ 08007F5C .incbin "baserom.gba", 0x007F5C, 0x0000020 gUnk_08007F7C:: @ 08007F7C - .incbin "baserom.gba", 0x007F7C, 0x000000A - .incbin "baserom.gba", 0x007F86, 0x0000016 + .incbin "baserom.gba", 0x007F7C, 0x0000020 gUnk_08007F9C:: @ 08007F9C - .incbin "baserom.gba", 0x007F9C, 0x0000003 - .incbin "baserom.gba", 0x007F9F, 0x000001D + .incbin "baserom.gba", 0x007F9C, 0x0000020 gUnk_08007FBC:: @ 08007FBC .incbin "baserom.gba", 0x007FBC, 0x0000020 @@ -62,8 +59,7 @@ gUnk_08007FFC:: @ 08007FFC .incbin "baserom.gba", 0x007FFC, 0x0000020 gUnk_0800801C:: @ 0800801C - .incbin "baserom.gba", 0x00801C, 0x0000007 - .incbin "baserom.gba", 0x008023, 0x0000019 + .incbin "baserom.gba", 0x00801C, 0x0000020 gUnk_0800803C:: @ 0800803C .incbin "baserom.gba", 0x00803C, 0x0000020 @@ -93,8 +89,7 @@ gUnk_0800813C:: @ 0800813C .incbin "baserom.gba", 0x00813C, 0x0000020 gUnk_0800815C:: @ 0800815C - .incbin "baserom.gba", 0x00815C, 0x000000D - .incbin "baserom.gba", 0x008169, 0x0000013 + .incbin "baserom.gba", 0x00815C, 0x0000020 gUnk_0800817C:: @ 0800817C .incbin "baserom.gba", 0x00817C, 0x0000020 @@ -103,19 +98,16 @@ gUnk_0800819C:: @ 0800819C .incbin "baserom.gba", 0x00819C, 0x0000020 gUnk_080081BC:: @ 080081BC - .incbin "baserom.gba", 0x0081BC, 0x0000002 - .incbin "baserom.gba", 0x0081BE, 0x000001E + .incbin "baserom.gba", 0x0081BC, 0x0000020 gUnk_080081DC:: @ 080081DC - .incbin "baserom.gba", 0x0081DC, 0x0000012 - .incbin "baserom.gba", 0x0081EE, 0x000000E + .incbin "baserom.gba", 0x0081DC, 0x0000020 gUnk_080081FC:: @ 080081FC .incbin "baserom.gba", 0x0081FC, 0x0000020 gUnk_0800821C:: @ 0800821C - .incbin "baserom.gba", 0x00821C, 0x0000016 - .incbin "baserom.gba", 0x008232, 0x000000A + .incbin "baserom.gba", 0x00821C, 0x0000020 gUnk_0800823C:: @ 0800823C .4byte gUnk_08007FDC @@ -163,26 +155,19 @@ gUnk_080082DC:: @ 080082DC .incbin "baserom.gba", 0x0082DC, 0x0000060 gUnk_0800833C:: @ 0800833C - .incbin "baserom.gba", 0x00833C, 0x000001D - .incbin "baserom.gba", 0x008359, 0x0000043 + .incbin "baserom.gba", 0x00833C, 0x0000060 gUnk_0800839C:: @ 0800839C - .incbin "baserom.gba", 0x00839C, 0x0000012 - .incbin "baserom.gba", 0x0083AE, 0x0000013 - .incbin "baserom.gba", 0x0083C1, 0x0000006 - .incbin "baserom.gba", 0x0083C7, 0x0000035 + .incbin "baserom.gba", 0x00839C, 0x0000060 gUnk_080083FC:: @ 080083FC - .incbin "baserom.gba", 0x0083FC, 0x000002A - .incbin "baserom.gba", 0x008426, 0x0000036 + .incbin "baserom.gba", 0x0083FC, 0x0000060 gUnk_0800845C:: @ 0800845C - .incbin "baserom.gba", 0x00845C, 0x0000024 - .incbin "baserom.gba", 0x008480, 0x000003C + .incbin "baserom.gba", 0x00845C, 0x0000060 gUnk_080084BC:: @ 080084BC - .incbin "baserom.gba", 0x0084BC, 0x0000048 - .incbin "baserom.gba", 0x008504, 0x0000018 + .incbin "baserom.gba", 0x0084BC, 0x0000060 gUnk_0800851C:: @ 0800851C .incbin "baserom.gba", 0x00851C, 0x0000060 diff --git a/data/data_080B3E70.s b/data/data_080B3E70.s index d6d5d870..9b440c27 100644 --- a/data/data_080B3E70.s +++ b/data/data_080B3E70.s @@ -5,12 +5,10 @@ .align 2 gUnk_080B3E70:: @ 080B3E70 - .incbin "baserom.gba", 0x0B3E70, 0x0000001 - .incbin "baserom.gba", 0x0B3E71, 0x0000007 + .incbin "baserom.gba", 0x0B3E70, 0x0000008 gUnk_080B3E78:: @ 080B3E78 .incbin "baserom.gba", 0x0B3E78, 0x0000008 gUnk_080B3E80:: @ 080B3E80 - .incbin "baserom.gba", 0x0B3E80, 0x0000180 - .incbin "baserom.gba", 0x0B4000, 0x00003F4 + .incbin "baserom.gba", 0x0B3E80, 0x0000574 diff --git a/data/data_080B4410.s b/data/data_080B4410.s index 5a12bbfd..9dfc4515 100644 --- a/data/data_080B4410.s +++ b/data/data_080B4410.s @@ -7,10 +7,10 @@ gUnk_080B4410:: @ 080B4410 .ifdef JP @ TODO only small differences - .incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 + .incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 .else .ifdef EU - .incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 + .incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 .else .ifdef DEMO_JP .incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 @ TODO deduplicate diff --git a/data/data_080B7B74.s b/data/data_080B7B74.s index cf7fde9f..7919608c 100644 --- a/data/data_080B7B74.s +++ b/data/data_080B7B74.s @@ -5,206 +5,13 @@ .align 2 gUnk_080B7B74:: @ 080B7B74 - .incbin "baserom.gba", 0x0B7B74, 0x00004BA - .incbin "baserom.gba", 0x0B802E, 0x0002292 - .incbin "baserom.gba", 0x0BA2C0, 0x0000FE0 + .incbin "baserom.gba", 0x0B7B74, 0x000372C .ifdef EU .incbin "baserom_eu.gba", 0x0BA9C8, 0x0001100 @ TODO only small differences .else .incbin "baserom.gba", 0x0BB2A0, 0x0001100 .endif - .incbin "baserom.gba", 0x0BC3A0, 0x000080A - .incbin "baserom.gba", 0x0BCBAA, 0x0001E48 - .incbin "baserom.gba", 0x0BE9F2, 0x00003C5 - .incbin "baserom.gba", 0x0BEDB7, 0x0000133 - .incbin "baserom.gba", 0x0BEEEA, 0x00001BC - .incbin "baserom.gba", 0x0BF0A6, 0x0000446 - .incbin "baserom.gba", 0x0BF4EC, 0x0000025 - .incbin "baserom.gba", 0x0BF511, 0x0000101 - .incbin "baserom.gba", 0x0BF612, 0x00000DD - .incbin "baserom.gba", 0x0BF6EF, 0x0000013 - .incbin "baserom.gba", 0x0BF702, 0x00000CE - .incbin "baserom.gba", 0x0BF7D0, 0x000000F - .incbin "baserom.gba", 0x0BF7DF, 0x0000111 - .incbin "baserom.gba", 0x0BF8F0, 0x0000004 - .incbin "baserom.gba", 0x0BF8F4, 0x000001B - .incbin "baserom.gba", 0x0BF90F, 0x00000E9 - .incbin "baserom.gba", 0x0BF9F8, 0x00000DF - .incbin "baserom.gba", 0x0BFAD7, 0x0000014 - .incbin "baserom.gba", 0x0BFAEB, 0x0000011 - .incbin "baserom.gba", 0x0BFAFC, 0x00000EE - .incbin "baserom.gba", 0x0BFBEA, 0x0000005 - .incbin "baserom.gba", 0x0BFBEF, 0x00000F8 - .incbin "baserom.gba", 0x0BFCE7, 0x0000007 - .incbin "baserom.gba", 0x0BFCEE, 0x0000009 - .incbin "baserom.gba", 0x0BFCF7, 0x00001ED - .incbin "baserom.gba", 0x0BFEE4, 0x000001D - .incbin "baserom.gba", 0x0BFF01, 0x00000FF - .incbin "baserom.gba", 0x0C0000, 0x0000007 - .incbin "baserom.gba", 0x0C0007, 0x0000005 - .incbin "baserom.gba", 0x0C000C, 0x00000B7 - .incbin "baserom.gba", 0x0C00C3, 0x0000040 - .incbin "baserom.gba", 0x0C0103, 0x0000032 - .incbin "baserom.gba", 0x0C0135, 0x0000001 - .incbin "baserom.gba", 0x0C0136, 0x00000CD - .incbin "baserom.gba", 0x0C0203, 0x00000EB - .incbin "baserom.gba", 0x0C02EE, 0x000000B - .incbin "baserom.gba", 0x0C02F9, 0x0000004 - .incbin "baserom.gba", 0x0C02FD, 0x0000006 - .incbin "baserom.gba", 0x0C0303, 0x00000F5 - .incbin "baserom.gba", 0x0C03F8, 0x0000004 - .incbin "baserom.gba", 0x0C03FC, 0x000000E - .incbin "baserom.gba", 0x0C040A, 0x0000002 - .incbin "baserom.gba", 0x0C040C, 0x00000FA - .incbin "baserom.gba", 0x0C0506, 0x0000001 - .incbin "baserom.gba", 0x0C0507, 0x000000B - .incbin "baserom.gba", 0x0C0512, 0x0000003 - .incbin "baserom.gba", 0x0C0515, 0x00000E5 - .incbin "baserom.gba", 0x0C05FA, 0x0000001 - .incbin "baserom.gba", 0x0C05FB, 0x0000001 - .incbin "baserom.gba", 0x0C05FC, 0x0000001 - .incbin "baserom.gba", 0x0C05FD, 0x0000003 - .incbin "baserom.gba", 0x0C0600, 0x0000002 - .incbin "baserom.gba", 0x0C0602, 0x000000F - .incbin "baserom.gba", 0x0C0611, 0x00000F0 - .incbin "baserom.gba", 0x0C0701, 0x0000002 - .incbin "baserom.gba", 0x0C0703, 0x0000002 - .incbin "baserom.gba", 0x0C0705, 0x0000007 - .incbin "baserom.gba", 0x0C070C, 0x0000004 - .incbin "baserom.gba", 0x0C0710, 0x00000E7 - .incbin "baserom.gba", 0x0C07F7, 0x0000001 - .incbin "baserom.gba", 0x0C07F8, 0x0000004 - .incbin "baserom.gba", 0x0C07FC, 0x0000004 - .incbin "baserom.gba", 0x0C0800, 0x0000001 - .incbin "baserom.gba", 0x0C0801, 0x0000002 - .incbin "baserom.gba", 0x0C0803, 0x0000001 - .incbin "baserom.gba", 0x0C0804, 0x0000001 - .incbin "baserom.gba", 0x0C0805, 0x0000001 - .incbin "baserom.gba", 0x0C0806, 0x0000001 - .incbin "baserom.gba", 0x0C0807, 0x000000A - .incbin "baserom.gba", 0x0C0811, 0x0000001 - .incbin "baserom.gba", 0x0C0812, 0x00000E2 - .incbin "baserom.gba", 0x0C08F4, 0x0000008 - .incbin "baserom.gba", 0x0C08FC, 0x0000006 - .incbin "baserom.gba", 0x0C0902, 0x0000001 - .incbin "baserom.gba", 0x0C0903, 0x0000001 - .incbin "baserom.gba", 0x0C0904, 0x0000005 - .incbin "baserom.gba", 0x0C0909, 0x0000002 - .incbin "baserom.gba", 0x0C090B, 0x0000001 - .incbin "baserom.gba", 0x0C090C, 0x0000001 - .incbin "baserom.gba", 0x0C090D, 0x00000E7 - .incbin "baserom.gba", 0x0C09F4, 0x000000A - .incbin "baserom.gba", 0x0C09FE, 0x0000003 - .incbin "baserom.gba", 0x0C0A01, 0x0000004 - .incbin "baserom.gba", 0x0C0A05, 0x0000002 - .incbin "baserom.gba", 0x0C0A07, 0x0000001 - .incbin "baserom.gba", 0x0C0A08, 0x0000002 - .incbin "baserom.gba", 0x0C0A0A, 0x0000001 - .incbin "baserom.gba", 0x0C0A0B, 0x0000004 - .incbin "baserom.gba", 0x0C0A0F, 0x00000EB - .incbin "baserom.gba", 0x0C0AFA, 0x0000006 - .incbin "baserom.gba", 0x0C0B00, 0x0000004 - .incbin "baserom.gba", 0x0C0B04, 0x0000001 - .incbin "baserom.gba", 0x0C0B05, 0x0000001 - .incbin "baserom.gba", 0x0C0B06, 0x0000002 - .incbin "baserom.gba", 0x0C0B08, 0x0000001 - .incbin "baserom.gba", 0x0C0B09, 0x0000001 - .incbin "baserom.gba", 0x0C0B0A, 0x0000001 - .incbin "baserom.gba", 0x0C0B0B, 0x0000001 - .incbin "baserom.gba", 0x0C0B0C, 0x0000001 - .incbin "baserom.gba", 0x0C0B0D, 0x0000003 - .incbin "baserom.gba", 0x0C0B10, 0x0000003 - .incbin "baserom.gba", 0x0C0B13, 0x00000ED - .incbin "baserom.gba", 0x0C0C00, 0x0000005 - .incbin "baserom.gba", 0x0C0C05, 0x0000003 - .incbin "baserom.gba", 0x0C0C08, 0x0000001 - .incbin "baserom.gba", 0x0C0C09, 0x0000001 - .incbin "baserom.gba", 0x0C0C0A, 0x0000002 - .incbin "baserom.gba", 0x0C0C0C, 0x0000003 - .incbin "baserom.gba", 0x0C0C0F, 0x0000010 - .incbin "baserom.gba", 0x0C0C1F, 0x00000E6 - .incbin "baserom.gba", 0x0C0D05, 0x0000001 - .incbin "baserom.gba", 0x0C0D06, 0x0000004 - .incbin "baserom.gba", 0x0C0D0A, 0x0000001 - .incbin "baserom.gba", 0x0C0D0B, 0x0000001 - .incbin "baserom.gba", 0x0C0D0C, 0x0000001 - .incbin "baserom.gba", 0x0C0D0D, 0x0000001 - .incbin "baserom.gba", 0x0C0D0E, 0x0000002 - .incbin "baserom.gba", 0x0C0D10, 0x0000001 - .incbin "baserom.gba", 0x0C0D11, 0x0000004 - .incbin "baserom.gba", 0x0C0D15, 0x00000F0 - .incbin "baserom.gba", 0x0C0E05, 0x0000001 - .incbin "baserom.gba", 0x0C0E06, 0x0000003 - .incbin "baserom.gba", 0x0C0E09, 0x0000003 - .incbin "baserom.gba", 0x0C0E0C, 0x0000001 - .incbin "baserom.gba", 0x0C0E0D, 0x0000001 - .incbin "baserom.gba", 0x0C0E0E, 0x0000001 - .incbin "baserom.gba", 0x0C0E0F, 0x0000001 - .incbin "baserom.gba", 0x0C0E10, 0x0000002 - .incbin "baserom.gba", 0x0C0E12, 0x0000001 - .incbin "baserom.gba", 0x0C0E13, 0x0000002 - .incbin "baserom.gba", 0x0C0E15, 0x0000014 - .incbin "baserom.gba", 0x0C0E29, 0x00000E3 - .incbin "baserom.gba", 0x0C0F0C, 0x0000003 - .incbin "baserom.gba", 0x0C0F0F, 0x0000001 - .incbin "baserom.gba", 0x0C0F10, 0x0000001 - .incbin "baserom.gba", 0x0C0F11, 0x0000001 - .incbin "baserom.gba", 0x0C0F12, 0x0000001 - .incbin "baserom.gba", 0x0C0F13, 0x0000001 - .incbin "baserom.gba", 0x0C0F14, 0x0000002 - .incbin "baserom.gba", 0x0C0F16, 0x0000007 - .incbin "baserom.gba", 0x0C0F1D, 0x00000E3 - .incbin "baserom.gba", 0x0C1000, 0x000000C - .incbin "baserom.gba", 0x0C100C, 0x0000003 - .incbin "baserom.gba", 0x0C100F, 0x0000001 - .incbin "baserom.gba", 0x0C1010, 0x0000002 - .incbin "baserom.gba", 0x0C1012, 0x0000001 - .incbin "baserom.gba", 0x0C1013, 0x0000001 - .incbin "baserom.gba", 0x0C1014, 0x0000001 - .incbin "baserom.gba", 0x0C1015, 0x0000003 - .incbin "baserom.gba", 0x0C1018, 0x00000F8 - .incbin "baserom.gba", 0x0C1110, 0x0000001 - .incbin "baserom.gba", 0x0C1111, 0x0000002 - .incbin "baserom.gba", 0x0C1113, 0x0000002 - .incbin "baserom.gba", 0x0C1115, 0x0000001 - .incbin "baserom.gba", 0x0C1116, 0x0000001 - .incbin "baserom.gba", 0x0C1117, 0x0000002 - .incbin "baserom.gba", 0x0C1119, 0x0000004 - .incbin "baserom.gba", 0x0C111D, 0x00000EA - .incbin "baserom.gba", 0x0C1207, 0x0000007 - .incbin "baserom.gba", 0x0C120E, 0x0000001 - .incbin "baserom.gba", 0x0C120F, 0x0000005 - .incbin "baserom.gba", 0x0C1214, 0x0000004 - .incbin "baserom.gba", 0x0C1218, 0x0000003 - .incbin "baserom.gba", 0x0C121B, 0x00000F1 - .incbin "baserom.gba", 0x0C130C, 0x0000004 - .incbin "baserom.gba", 0x0C1310, 0x0000002 - .incbin "baserom.gba", 0x0C1312, 0x0000001 - .incbin "baserom.gba", 0x0C1313, 0x0000001 - .incbin "baserom.gba", 0x0C1314, 0x0000004 - .incbin "baserom.gba", 0x0C1318, 0x0000002 - .incbin "baserom.gba", 0x0C131A, 0x0000003 - .incbin "baserom.gba", 0x0C131D, 0x0000003 - .incbin "baserom.gba", 0x0C1320, 0x00000E0 - .incbin "baserom.gba", 0x0C1400, 0x0000017 - .incbin "baserom.gba", 0x0C1417, 0x0000101 - .incbin "baserom.gba", 0x0C1518, 0x000000A - .incbin "baserom.gba", 0x0C1522, 0x00000DD - .incbin "baserom.gba", 0x0C15FF, 0x0000112 - .incbin "baserom.gba", 0x0C1711, 0x00000EF - .incbin "baserom.gba", 0x0C1800, 0x0000011 - .incbin "baserom.gba", 0x0C1811, 0x0000011 - .incbin "baserom.gba", 0x0C1822, 0x0000006 - .incbin "baserom.gba", 0x0C1828, 0x0000008 - .incbin "baserom.gba", 0x0C1830, 0x00001F4 - .incbin "baserom.gba", 0x0C1A24, 0x00001FF - .incbin "baserom.gba", 0x0C1C23, 0x00001F5 - .incbin "baserom.gba", 0x0C1E18, 0x00001E8 - .incbin "baserom.gba", 0x0C2000, 0x0000011 - .incbin "baserom.gba", 0x0C2011, 0x000012E - .incbin "baserom.gba", 0x0C213F, 0x00003DD - .incbin "baserom.gba", 0x0C251C, 0x0000A19 - .incbin "baserom.gba", 0x0C2F35, 0x000010A + .incbin "baserom.gba", 0x0BC3A0, 0x0006C9F .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0C2DDF, 0x00032A4 diff --git a/data/data_080CEBDC.s b/data/data_080CEBDC.s index f75577a4..67dd5613 100644 --- a/data/data_080CEBDC.s +++ b/data/data_080CEBDC.s @@ -5,5 +5,5 @@ .align 2 unusedLabel_0CEBDC:: @ 080CEBDC - .incbin "baserom.gba", 0x0CEBDC, 0x000010 + .incbin "baserom.gba", 0x0CEBDC, 0x0000010 diff --git a/data/data_080D5360.s b/data/data_080D5360.s index 7278b263..269c3f8e 100644 --- a/data/data_080D5360.s +++ b/data/data_080D5360.s @@ -1488,8 +1488,7 @@ gUnk_080D807C:: @ 080D807C .incbin "baserom.gba", 0x0D808C, 0x0000010 gUnk_080D809C:: @ 080D809C - .incbin "baserom.gba", 0x0D809C, 0x0000038 - .incbin "baserom.gba", 0x0D80D4, 0x0000048 + .incbin "baserom.gba", 0x0D809C, 0x0000080 gUnk_080D811C:: @ 080D811C .incbin "baserom.gba", 0x0D811C, 0x0000010 @@ -2583,13 +2582,13 @@ Room_GardenFountains_East:: @ 080DA514 gUnk_080DA534:: @ 080DA534 .ifdef JP - .incbin "baserom_jp.gba", 0x0DA2D4, 0x40 + .incbin "baserom_jp.gba", 0x0DA2D4, 0x0000040 .else .ifdef EU - .incbin "baserom_jp.gba", 0x0DA2D4, 0x40 + .incbin "baserom_jp.gba", 0x0DA2D4, 0x0000040 .else .ifdef DEMO_JP - .incbin "baserom_jp.gba", 0x0DA2D4, 0x40 + .incbin "baserom_jp.gba", 0x0DA2D4, 0x0000040 .else .incbin "baserom.gba", 0x0DA534, 0x0000050 .endif @@ -4409,8 +4408,7 @@ gUnk_080DD8F0:: @ 080DD8F0 .4byte script_0800D6B4 .incbin "baserom.gba", 0x0DD9DC, 0x000000C .4byte script_0800D6B4 - .incbin "baserom.gba", 0x0DD9EC, 0x0000003 - .incbin "baserom.gba", 0x0DD9EF, 0x0000009 + .incbin "baserom.gba", 0x0DD9EC, 0x000000C .4byte script_0800D6B4 .incbin "baserom.gba", 0x0DD9FC, 0x000000C .4byte script_0800D6B4 @@ -4431,8 +4429,7 @@ gUnk_080DDA70:: @ 080DDA70 .4byte script_08014C94 .incbin "baserom.gba", 0x0DDACC, 0x000000C .4byte script_08014C94 - .incbin "baserom.gba", 0x0DDADC, 0x0000002 - .incbin "baserom.gba", 0x0DDADE, 0x0000012 + .incbin "baserom.gba", 0x0DDADC, 0x0000014 gUnk_080DDAF0:: @ 080DDAF0 .incbin "baserom.gba", 0x0DDAF0, 0x0000070 @@ -4819,8 +4816,7 @@ Room_DeepwoodShrine_Madderpillar:: @ 080DE550 .4byte gUnk_080DE4E8 gUnk_080DE574:: @ 080DE574 - .incbin "baserom.gba", 0x0DE574, 0x000008D - .incbin "baserom.gba", 0x0DE601, 0x00000E3 + .incbin "baserom.gba", 0x0DE574, 0x0000170 gUnk_080DE6E4:: @ 080DE6E4 .incbin "baserom.gba", 0x0DE6E4, 0x0000020 @@ -5064,12 +5060,10 @@ Room_DeepwoodShrine_Entrance:: @ 080DF1B0 .4byte gUnk_080DF180 gUnk_080DF1D4:: @ 080DF1D4 - .incbin "baserom.gba", 0x0DF1D4, 0x0000022 - .incbin "baserom.gba", 0x0DF1F6, 0x00000AE + .incbin "baserom.gba", 0x0DF1D4, 0x00000D0 gUnk_080DF2A4:: @ 080DF2A4 - .incbin "baserom.gba", 0x0DF2A4, 0x0000020 - .incbin "baserom.gba", 0x0DF2C4, 0x0000040 + .incbin "baserom.gba", 0x0DF2A4, 0x0000060 gUnk_080DF304:: @ 080DF304 .incbin "baserom.gba", 0x0DF304, 0x0000020 @@ -5085,9 +5079,7 @@ Room_DeepwoodShrine_Torch:: @ 080DF324 .4byte nullsub_252 gUnk_080DF344:: @ 080DF344 - .incbin "baserom.gba", 0x0DF344, 0x00000A2 - .incbin "baserom.gba", 0x0DF3E6, 0x000000A - .incbin "baserom.gba", 0x0DF3F0, 0x0000054 + .incbin "baserom.gba", 0x0DF344, 0x0000100 gUnk_080DF444:: @ 080DF444 .incbin "baserom.gba", 0x0DF444, 0x0000010 @@ -5155,8 +5147,7 @@ gUnk_080DF64C:: @ 080DF64C .incbin "baserom.gba", 0x0DF64C, 0x0000040 gUnk_080DF68C:: @ 080DF68C - .incbin "baserom.gba", 0x0DF68C, 0x000006F - .incbin "baserom.gba", 0x0DF6FB, 0x0000001 + .incbin "baserom.gba", 0x0DF68C, 0x0000070 gUnk_080DF6FC:: @ 080DF6FC .incbin "baserom.gba", 0x0DF6FC, 0x0000010 @@ -5204,8 +5195,7 @@ Room_DeepwoodShrine_LilyPadEast:: @ 080DF86C .4byte nullsub_257 gUnk_080DF88C:: @ 080DF88C - .incbin "baserom.gba", 0x0DF88C, 0x000008A - .incbin "baserom.gba", 0x0DF916, 0x0000006 + .incbin "baserom.gba", 0x0DF88C, 0x0000090 gUnk_080DF91C:: @ 080DF91C .incbin "baserom.gba", 0x0DF91C, 0x0000030 @@ -5233,10 +5223,7 @@ Room_DeepwoodShrineBoss_Main:: @ 080DF9AC .4byte gUnk_080DF94C gUnk_080DF9D8:: @ 080DF9D8 - .incbin "baserom.gba", 0x0DF9D8, 0x0000004 - .incbin "baserom.gba", 0x0DF9DC, 0x0000015 - .incbin "baserom.gba", 0x0DF9F1, 0x0000008 - .incbin "baserom.gba", 0x0DF9F9, 0x000004F + .incbin "baserom.gba", 0x0DF9D8, 0x0000070 gUnk_080DFA48:: @ 080DFA48 .incbin "baserom.gba", 0x0DFA48, 0x0000010 @@ -5255,9 +5242,7 @@ Room_DeepwoodShrine_PreBoss:: @ 080DFA70 .4byte nullsub_258 gUnk_080DFA90:: @ 080DFA90 - .incbin "baserom.gba", 0x0DFA90, 0x0000068 - .incbin "baserom.gba", 0x0DFAF8, 0x000000A - .incbin "baserom.gba", 0x0DFB02, 0x000002E + .incbin "baserom.gba", 0x0DFA90, 0x00000A0 gUnk_080DFB30:: @ 080DFB30 .incbin "baserom.gba", 0x0DFB30, 0x0000010 @@ -5335,8 +5320,7 @@ gUnk_080DFDD4:: @ 080DFDD4 .incbin "baserom.gba", 0x0DFDD4, 0x0000010 gUnk_080DFDE4:: @ 080DFDE4 - .incbin "baserom.gba", 0x0DFDE4, 0x0000015 - .incbin "baserom.gba", 0x0DFDF9, 0x0000013 + .incbin "baserom.gba", 0x0DFDE4, 0x0000028 gUnk_080DFE0C:: @ 080DFE0C .incbin "baserom.gba", 0x0DFE0C, 0x0000090 @@ -5359,15 +5343,10 @@ gUnk_080DFF30:: @ 080DFF30 .incbin "baserom.gba", 0x0DFF30, 0x0000060 gUnk_080DFF90:: @ 080DFF90 - .incbin "baserom.gba", 0x0DFF90, 0x0000069 - .incbin "baserom.gba", 0x0DFFF9, 0x0000007 - .incbin "baserom.gba", 0x0E0000, 0x0000001 - .incbin "baserom.gba", 0x0E0001, 0x000000D - .incbin "baserom.gba", 0x0E000E, 0x0000022 + .incbin "baserom.gba", 0x0DFF90, 0x00000A0 gUnk_080E0030:: @ 080E0030 - .incbin "baserom.gba", 0x0E0030, 0x0000002 - .incbin "baserom.gba", 0x0E0032, 0x0000016 + .incbin "baserom.gba", 0x0E0030, 0x0000018 Room_CaveOfFlames_CartToSpinyChus:: @ 080E0048 .4byte gUnk_080DFEC0 @@ -5380,14 +5359,10 @@ Room_CaveOfFlames_CartToSpinyChus:: @ 080E0048 .4byte nullsub_261 gUnk_080E0068:: @ 080E0068 - .incbin "baserom.gba", 0x0E0068, 0x0000017 - .incbin "baserom.gba", 0x0E007F, 0x0000069 + .incbin "baserom.gba", 0x0E0068, 0x0000080 gUnk_080E00E8:: @ 080E00E8 - .incbin "baserom.gba", 0x0E00E8, 0x0000005 - .incbin "baserom.gba", 0x0E00ED, 0x0000006 - .incbin "baserom.gba", 0x0E00F3, 0x000001F - .incbin "baserom.gba", 0x0E0112, 0x0000016 + .incbin "baserom.gba", 0x0E00E8, 0x0000040 gUnk_080E0128:: @ 080E0128 .incbin "baserom.gba", 0x0E0128, 0x0000010 @@ -5410,19 +5385,13 @@ Room_CaveOfFlames_Entrance:: @ 080E0188 .4byte gUnk_080E0148 gUnk_080E01AC:: @ 080E01AC - .incbin "baserom.gba", 0x0E01AC, 0x000003C - .incbin "baserom.gba", 0x0E01E8, 0x0000009 - .incbin "baserom.gba", 0x0E01F1, 0x0000004 - .incbin "baserom.gba", 0x0E01F5, 0x000001B - .incbin "baserom.gba", 0x0E0210, 0x000004C + .incbin "baserom.gba", 0x0E01AC, 0x00000B0 gUnk_080E025C:: @ 080E025C .incbin "baserom.gba", 0x0E025C, 0x0000070 gUnk_080E02CC:: @ 080E02CC - .incbin "baserom.gba", 0x0E02CC, 0x0000027 - .incbin "baserom.gba", 0x0E02F3, 0x000000C - .incbin "baserom.gba", 0x0E02FF, 0x000004D + .incbin "baserom.gba", 0x0E02CC, 0x0000080 gUnk_080E034C:: @ 080E034C .incbin "baserom.gba", 0x0E034C, 0x0000010 @@ -5438,8 +5407,7 @@ Room_CaveOfFlames_MainCart:: @ 080E035C .4byte nullsub_263 gUnk_080E037C:: @ 080E037C - .incbin "baserom.gba", 0x0E037C, 0x000007E - .incbin "baserom.gba", 0x0E03FA, 0x0000032 + .incbin "baserom.gba", 0x0E037C, 0x00000B0 gUnk_080E042C:: @ 080E042C .incbin "baserom.gba", 0x0E042C, 0x0000040 @@ -5465,21 +5433,13 @@ Room_CaveOfFlames_NorthEntrance:: @ 080E04AC .4byte gUnk_080E049C gUnk_080E04D0:: @ 080E04D0 - .incbin "baserom.gba", 0x0E04D0, 0x0000031 - .incbin "baserom.gba", 0x0E0501, 0x0000007 - .incbin "baserom.gba", 0x0E0508, 0x0000098 + .incbin "baserom.gba", 0x0E04D0, 0x00000D0 gUnk_080E05A0:: @ 080E05A0 - .incbin "baserom.gba", 0x0E05A0, 0x0000057 - .incbin "baserom.gba", 0x0E05F7, 0x0000005 - .incbin "baserom.gba", 0x0E05FC, 0x000000A - .incbin "baserom.gba", 0x0E0606, 0x000007A + .incbin "baserom.gba", 0x0E05A0, 0x00000E0 gUnk_080E0680:: @ 080E0680 - .incbin "baserom.gba", 0x0E0680, 0x000006C - .incbin "baserom.gba", 0x0E06EC, 0x0000005 - .incbin "baserom.gba", 0x0E06F1, 0x0000014 - .incbin "baserom.gba", 0x0E0705, 0x000004B + .incbin "baserom.gba", 0x0E0680, 0x00000D0 gUnk_080E0750:: @ 080E0750 .incbin "baserom.gba", 0x0E0750, 0x0000020 @@ -5498,14 +5458,10 @@ gUnk_080E0790:: @ 080E0790 .incbin "baserom.gba", 0x0E0790, 0x0000050 gUnk_080E07E0:: @ 080E07E0 - .incbin "baserom.gba", 0x0E07E0, 0x000001C - .incbin "baserom.gba", 0x0E07FC, 0x0000004 + .incbin "baserom.gba", 0x0E07E0, 0x0000020 gUnk_080E0800:: @ 080E0800 - .incbin "baserom.gba", 0x0E0800, 0x0000004 - .incbin "baserom.gba", 0x0E0804, 0x0000001 - .incbin "baserom.gba", 0x0E0805, 0x0000007 - .incbin "baserom.gba", 0x0E080C, 0x0000004 + .incbin "baserom.gba", 0x0E0800, 0x0000010 gUnk_080E0810:: @ 080E0810 .incbin "baserom.gba", 0x0E0810, 0x0000018 @@ -5525,10 +5481,7 @@ Room_CaveOfFlames_Helmasaur:: @ 080E0878 .4byte gUnk_080E0828 gUnk_080E089C:: @ 080E089C - .incbin "baserom.gba", 0x0E089C, 0x0000061 - .incbin "baserom.gba", 0x0E08FD, 0x0000004 - .incbin "baserom.gba", 0x0E0901, 0x0000001 - .incbin "baserom.gba", 0x0E0902, 0x000003A + .incbin "baserom.gba", 0x0E089C, 0x00000A0 gUnk_080E093C:: @ 080E093C .incbin "baserom.gba", 0x0E093C, 0x0000030 @@ -5544,12 +5497,7 @@ gUnk_080E09DC:: @ 080E09DC .incbin "baserom.gba", 0x0E09E0, 0x000001C gUnk_080E09FC:: @ 080E09FC - .incbin "baserom.gba", 0x0E09FC, 0x0000002 - .incbin "baserom.gba", 0x0E09FE, 0x0000003 - .incbin "baserom.gba", 0x0E0A01, 0x0000001 - .incbin "baserom.gba", 0x0E0A02, 0x0000006 - .incbin "baserom.gba", 0x0E0A08, 0x000000F - .incbin "baserom.gba", 0x0E0A17, 0x0000009 + .incbin "baserom.gba", 0x0E09FC, 0x0000024 Room_CaveOfFlames_Rollobite:: @ 080E0A20 .4byte gUnk_080E089C @@ -5563,12 +5511,10 @@ Room_CaveOfFlames_Rollobite:: @ 080E0A20 .4byte gUnk_080E09DC gUnk_080E0A44:: @ 080E0A44 - .incbin "baserom.gba", 0x0E0A44, 0x00000BE - .incbin "baserom.gba", 0x0E0B02, 0x0000002 + .incbin "baserom.gba", 0x0E0A44, 0x00000C0 gUnk_080E0B04:: @ 080E0B04 - .incbin "baserom.gba", 0x0E0B04, 0x0000009 - .incbin "baserom.gba", 0x0E0B0D, 0x0000017 + .incbin "baserom.gba", 0x0E0B04, 0x0000020 gUnk_080E0B24:: @ 080E0B24 .incbin "baserom.gba", 0x0E0B24, 0x0000040 @@ -5577,10 +5523,7 @@ gUnk_080E0B64:: @ 080E0B64 .incbin "baserom.gba", 0x0E0B64, 0x0000020 gUnk_080E0B84:: @ 080E0B84 - .incbin "baserom.gba", 0x0E0B84, 0x000007A - .incbin "baserom.gba", 0x0E0BFE, 0x000000A - .incbin "baserom.gba", 0x0E0C08, 0x0000001 - .incbin "baserom.gba", 0x0E0C09, 0x000000B + .incbin "baserom.gba", 0x0E0B84, 0x0000090 Room_CaveOfFlames_MinishLava:: @ 080E0C14 .4byte gUnk_080E0A44 @@ -5594,14 +5537,7 @@ Room_CaveOfFlames_MinishLava:: @ 080E0C14 .4byte gUnk_080E0B84 gUnk_080E0C38:: @ 080E0C38 - .incbin "baserom.gba", 0x0E0C38, 0x000008E - .incbin "baserom.gba", 0x0E0CC6, 0x0000016 - .incbin "baserom.gba", 0x0E0CDC, 0x0000026 - .incbin "baserom.gba", 0x0E0D02, 0x0000001 - .incbin "baserom.gba", 0x0E0D03, 0x0000002 - .incbin "baserom.gba", 0x0E0D05, 0x0000001 - .incbin "baserom.gba", 0x0E0D06, 0x0000006 - .incbin "baserom.gba", 0x0E0D0C, 0x000000C + .incbin "baserom.gba", 0x0E0C38, 0x00000E0 gUnk_080E0D18:: @ 080E0D18 .incbin "baserom.gba", 0x0E0D18, 0x0000010 @@ -5613,12 +5549,7 @@ gUnk_080E0DD8:: @ 080E0DD8 .incbin "baserom.gba", 0x0E0DD8, 0x0000020 gUnk_080E0DF8:: @ 080E0DF8 - .incbin "baserom.gba", 0x0E0DF8, 0x0000008 - .incbin "baserom.gba", 0x0E0E00, 0x0000005 - .incbin "baserom.gba", 0x0E0E05, 0x0000003 - .incbin "baserom.gba", 0x0E0E08, 0x0000003 - .incbin "baserom.gba", 0x0E0E0B, 0x0000001 - .incbin "baserom.gba", 0x0E0E0C, 0x000000A + .incbin "baserom.gba", 0x0E0DF8, 0x000001E gUnk_080E0E16:: @ 080E0E16 .incbin "baserom.gba", 0x0E0E16, 0x000001E @@ -5642,20 +5573,7 @@ gUnk_080E0EDC:: @ 080E0EDC .incbin "baserom.gba", 0x0E0EDC, 0x0000010 gUnk_080E0EEC:: @ 080E0EEC - .incbin "baserom.gba", 0x0E0EEC, 0x000000F - .incbin "baserom.gba", 0x0E0EFB, 0x0000005 - .incbin "baserom.gba", 0x0E0F00, 0x0000008 - .incbin "baserom.gba", 0x0E0F08, 0x0000001 - .incbin "baserom.gba", 0x0E0F09, 0x0000001 - .incbin "baserom.gba", 0x0E0F0A, 0x0000002 - .incbin "baserom.gba", 0x0E0F0C, 0x0000001 - .incbin "baserom.gba", 0x0E0F0D, 0x0000001 - .incbin "baserom.gba", 0x0E0F0E, 0x0000003 - .incbin "baserom.gba", 0x0E0F11, 0x0000001 - .incbin "baserom.gba", 0x0E0F12, 0x0000001 - .incbin "baserom.gba", 0x0E0F13, 0x0000004 - .incbin "baserom.gba", 0x0E0F17, 0x0000001 - .incbin "baserom.gba", 0x0E0F18, 0x0000024 + .incbin "baserom.gba", 0x0E0EEC, 0x0000050 gUnk_080E0F3C:: @ 080E0F3C .incbin "baserom.gba", 0x0E0F3C, 0x0000010 @@ -5671,18 +5589,10 @@ Room_CaveOfFlames_RollobiteSwitch:: @ 080E0F4C .4byte nullsub_270 gUnk_080E0F6C:: @ 080E0F6C - .incbin "baserom.gba", 0x0E0F6C, 0x0000097 - .incbin "baserom.gba", 0x0E1003, 0x0000002 - .incbin "baserom.gba", 0x0E1005, 0x0000003 - .incbin "baserom.gba", 0x0E1008, 0x0000002 - .incbin "baserom.gba", 0x0E100A, 0x0000001 - .incbin "baserom.gba", 0x0E100B, 0x0000003 - .incbin "baserom.gba", 0x0E100E, 0x0000001 - .incbin "baserom.gba", 0x0E100F, 0x000000D + .incbin "baserom.gba", 0x0E0F6C, 0x00000B0 gUnk_080E101C:: @ 080E101C - .incbin "baserom.gba", 0x0E101C, 0x0000008 - .incbin "baserom.gba", 0x0E1024, 0x0000018 + .incbin "baserom.gba", 0x0E101C, 0x0000020 gUnk_080E103C:: @ 080E103C .incbin "baserom.gba", 0x0E103C, 0x0000020 @@ -5735,8 +5645,7 @@ gUnk_080E115C:: @ 080E115C .incbin "baserom.gba", 0x0E115C, 0x0000040 gUnk_080E119C:: @ 080E119C - .incbin "baserom.gba", 0x0E119C, 0x0000007 - .incbin "baserom.gba", 0x0E11A3, 0x0000011 + .incbin "baserom.gba", 0x0E119C, 0x0000018 gUnk_080E11B4:: @ 080E11B4 .incbin "baserom.gba", 0x0E11B4, 0x000001E @@ -5757,8 +5666,7 @@ Room_CaveOfFlames_PathBossKey2:: @ 080E11F0 .4byte gUnk_080E11D2 gUnk_080E1218:: @ 080E1218 - .incbin "baserom.gba", 0x0E1218, 0x0000001 - .incbin "baserom.gba", 0x0E1219, 0x000004F + .incbin "baserom.gba", 0x0E1218, 0x0000050 gUnk_080E1268:: @ 080E1268 .incbin "baserom.gba", 0x0E1268, 0x0000030 @@ -5784,13 +5692,7 @@ Room_CaveOfFlames_Compass:: @ 080E12F0 .4byte gUnk_080E12C0 gUnk_080E1314:: @ 080E1314 - .incbin "baserom.gba", 0x0E1314, 0x0000001 - .incbin "baserom.gba", 0x0E1315, 0x0000001 - .incbin "baserom.gba", 0x0E1316, 0x0000001 - .incbin "baserom.gba", 0x0E1317, 0x0000001 - .incbin "baserom.gba", 0x0E1318, 0x0000001 - .incbin "baserom.gba", 0x0E1319, 0x0000001 - .incbin "baserom.gba", 0x0E131A, 0x000006A + .incbin "baserom.gba", 0x0E1314, 0x0000070 gUnk_080E1384:: @ 080E1384 .incbin "baserom.gba", 0x0E1384, 0x0000030 @@ -5799,16 +5701,7 @@ gUnk_080E13B4:: @ 080E13B4 .incbin "baserom.gba", 0x0E13B4, 0x0000050 gUnk_080E1404:: @ 080E1404 - .incbin "baserom.gba", 0x0E1404, 0x000000A - .incbin "baserom.gba", 0x0E140E, 0x0000003 - .incbin "baserom.gba", 0x0E1411, 0x0000004 - .incbin "baserom.gba", 0x0E1415, 0x0000001 - .incbin "baserom.gba", 0x0E1416, 0x0000001 - .incbin "baserom.gba", 0x0E1417, 0x0000001 - .incbin "baserom.gba", 0x0E1418, 0x0000001 - .incbin "baserom.gba", 0x0E1419, 0x0000001 - .incbin "baserom.gba", 0x0E141A, 0x0000001 - .incbin "baserom.gba", 0x0E141B, 0x0000001 + .incbin "baserom.gba", 0x0E1404, 0x0000018 Room_CaveOfFlames_Bobomb:: @ 080E141C .4byte gUnk_080E1314 @@ -5821,13 +5714,7 @@ Room_CaveOfFlames_Bobomb:: @ 080E141C .4byte nullsub_275 gUnk_080E143C:: @ 080E143C - .incbin "baserom.gba", 0x0E143C, 0x00000D7 - .incbin "baserom.gba", 0x0E1513, 0x0000002 - .incbin "baserom.gba", 0x0E1515, 0x0000001 - .incbin "baserom.gba", 0x0E1516, 0x0000005 - .incbin "baserom.gba", 0x0E151B, 0x0000001 - .incbin "baserom.gba", 0x0E151C, 0x0000001 - .incbin "baserom.gba", 0x0E151D, 0x000004F + .incbin "baserom.gba", 0x0E143C, 0x0000130 gUnk_080E156C:: @ 080E156C .incbin "baserom.gba", 0x0E156C, 0x0000020 @@ -5845,16 +5732,9 @@ gUnk_080E15C4:: @ 080E15C4 .4byte gUnk_080E16AA .incbin "baserom.gba", 0x0E15F8, 0x000000C .4byte gUnk_080E16CE - .incbin "baserom.gba", 0x0E1608, 0x0000005 - .incbin "baserom.gba", 0x0E160D, 0x0000002 - .incbin "baserom.gba", 0x0E160F, 0x0000003 - .incbin "baserom.gba", 0x0E1612, 0x0000002 + .incbin "baserom.gba", 0x0E1608, 0x000000C .4byte gUnk_080E16EC - .incbin "baserom.gba", 0x0E1618, 0x0000002 - .incbin "baserom.gba", 0x0E161A, 0x0000003 - .incbin "baserom.gba", 0x0E161D, 0x0000003 - .incbin "baserom.gba", 0x0E1620, 0x0000001 - .incbin "baserom.gba", 0x0E1621, 0x0000003 + .incbin "baserom.gba", 0x0E1618, 0x000000C .4byte gUnk_080E170A .incbin "baserom.gba", 0x0E1628, 0x000000C .4byte gUnk_080E16EC @@ -5877,12 +5757,7 @@ gUnk_080E16EC:: @ 080E16EC .incbin "baserom.gba", 0x0E16EC, 0x000001E gUnk_080E170A:: @ 080E170A - .incbin "baserom.gba", 0x0E170A, 0x0000007 - .incbin "baserom.gba", 0x0E1711, 0x0000007 - .incbin "baserom.gba", 0x0E1718, 0x0000005 - .incbin "baserom.gba", 0x0E171D, 0x0000002 - .incbin "baserom.gba", 0x0E171F, 0x0000002 - .incbin "baserom.gba", 0x0E1721, 0x0000007 + .incbin "baserom.gba", 0x0E170A, 0x000001E Room_CaveOfFlames_BossDoor:: @ 080E1728 .4byte gUnk_080E143C @@ -5921,14 +5796,10 @@ gUnk_080E17A4:: @ 080E17A4 .incbin "baserom.gba", 0x0E17A4, 0x0000040 gUnk_080E17E4:: @ 080E17E4 - .incbin "baserom.gba", 0x0E17E4, 0x000002B - .incbin "baserom.gba", 0x0E180F, 0x0000005 + .incbin "baserom.gba", 0x0E17E4, 0x0000030 gUnk_080E1814:: @ 080E1814 - .incbin "baserom.gba", 0x0E1814, 0x0000005 - .incbin "baserom.gba", 0x0E1819, 0x0000008 - .incbin "baserom.gba", 0x0E1821, 0x0000003 - .incbin "baserom.gba", 0x0E1824, 0x0000020 + .incbin "baserom.gba", 0x0E1814, 0x0000030 gUnk_080E1844:: @ 080E1844 .incbin "baserom.gba", 0x0E1844, 0x0000020 @@ -5950,10 +5821,7 @@ Room_CaveOfFlamesBoss_Main:: @ 080E1874 .4byte gUnk_080E1814 gUnk_080E18A0:: @ 080E18A0 - .incbin "baserom.gba", 0x0E18A0, 0x0000053 - .incbin "baserom.gba", 0x0E18F3, 0x000002E - .incbin "baserom.gba", 0x0E1921, 0x0000001 - .incbin "baserom.gba", 0x0E1922, 0x000000E + .incbin "baserom.gba", 0x0E18A0, 0x0000090 gUnk_080E1930:: @ 080E1930 .incbin "baserom.gba", 0x0E1930, 0x0000010 @@ -5976,12 +5844,7 @@ Room_FortressOfWinds_Eyegore:: @ 080E1998 .4byte gUnk_080E1958 gUnk_080E19BC:: @ 080E19BC - .incbin "baserom.gba", 0x0E19BC, 0x0000042 - .incbin "baserom.gba", 0x0E19FE, 0x000001B - .incbin "baserom.gba", 0x0E1A19, 0x0000001 - .incbin "baserom.gba", 0x0E1A1A, 0x0000005 - .incbin "baserom.gba", 0x0E1A1F, 0x0000002 - .incbin "baserom.gba", 0x0E1A21, 0x000006B + .incbin "baserom.gba", 0x0E19BC, 0x00000D0 gUnk_080E1A8C:: @ 080E1A8C .incbin "baserom.gba", 0x0E1A8C, 0x0000030 @@ -6000,22 +5863,13 @@ Room_FortressOfWinds_BeforeMazaal:: @ 080E1ACC .4byte sub_0804CF44 gUnk_080E1AEC:: @ 080E1AEC - .incbin "baserom.gba", 0x0E1AEC, 0x000001C - .incbin "baserom.gba", 0x0E1B08, 0x000000F - .incbin "baserom.gba", 0x0E1B17, 0x000000C - .incbin "baserom.gba", 0x0E1B23, 0x0000002 - .incbin "baserom.gba", 0x0E1B25, 0x000000E - .incbin "baserom.gba", 0x0E1B33, 0x00000E0 - .incbin "baserom.gba", 0x0E1C13, 0x00000D9 + .incbin "baserom.gba", 0x0E1AEC, 0x0000200 gUnk_080E1CEC:: @ 080E1CEC .incbin "baserom.gba", 0x0E1CEC, 0x0000030 gUnk_080E1D1C:: @ 080E1D1C - .incbin "baserom.gba", 0x0E1D1C, 0x000000D - .incbin "baserom.gba", 0x0E1D29, 0x0000001 - .incbin "baserom.gba", 0x0E1D2A, 0x0000003 - .incbin "baserom.gba", 0x0E1D2D, 0x000001F + .incbin "baserom.gba", 0x0E1D1C, 0x0000030 gUnk_080E1D4C:: @ 080E1D4C .incbin "baserom.gba", 0x0E1D4C, 0x0000010 @@ -6048,12 +5902,10 @@ gUnk_080E1EDC:: @ 080E1EDC .incbin "baserom.gba", 0x0E1EDC, 0x0000010 gUnk_080E1EEC:: @ 080E1EEC - .incbin "baserom.gba", 0x0E1EEC, 0x000001D - .incbin "baserom.gba", 0x0E1F09, 0x0000001 + .incbin "baserom.gba", 0x0E1EEC, 0x000001E gUnk_080E1F0A:: @ 080E1F0A - .incbin "baserom.gba", 0x0E1F0A, 0x000001C - .incbin "baserom.gba", 0x0E1F26, 0x0000002 + .incbin "baserom.gba", 0x0E1F0A, 0x000001E gUnk_080E1F28:: @ 080E1F28 .incbin "baserom.gba", 0x0E1F28, 0x0000020 @@ -6072,8 +5924,7 @@ Room_FortressOfWinds_PitPlatforms:: @ 080E1F48 .4byte gUnk_080E1F28 gUnk_080E1F74:: @ 080E1F74 - .incbin "baserom.gba", 0x0E1F74, 0x0000093 - .incbin "baserom.gba", 0x0E2007, 0x000008D + .incbin "baserom.gba", 0x0E1F74, 0x0000120 gUnk_080E2094:: @ 080E2094 .incbin "baserom.gba", 0x0E2094, 0x0000040 @@ -6088,10 +5939,7 @@ gUnk_080E2104:: @ 080E2104 .incbin "baserom.gba", 0x0E2104, 0x0000014 gUnk_080E2118:: @ 080E2118 - .incbin "baserom.gba", 0x0E2118, 0x0000004 - .incbin "baserom.gba", 0x0E211C, 0x0000006 - .incbin "baserom.gba", 0x0E2122, 0x0000003 - .incbin "baserom.gba", 0x0E2125, 0x0000007 + .incbin "baserom.gba", 0x0E2118, 0x0000014 Room_FortressOfWinds_WestKeyLever:: @ 080E212C .4byte gUnk_080E1F74 @@ -6133,8 +5981,7 @@ Room_FortressOfWinds_Darknut:: @ 080E2310 .4byte gUnk_080E22D0 gUnk_080E2334:: @ 080E2334 - .incbin "baserom.gba", 0x0E2334, 0x0000001 - .incbin "baserom.gba", 0x0E2335, 0x000009F + .incbin "baserom.gba", 0x0E2334, 0x00000A0 gUnk_080E23D4:: @ 080E23D4 .incbin "baserom.gba", 0x0E23D4, 0x0000020 @@ -6159,9 +6006,7 @@ gUnk_080E2444:: @ 080E2444 .incbin "baserom.gba", 0x0E2444, 0x00000E0 gUnk_080E2524:: @ 080E2524 - .incbin "baserom.gba", 0x0E2524, 0x000000A - .incbin "baserom.gba", 0x0E252E, 0x0000001 - .incbin "baserom.gba", 0x0E252F, 0x0000005 + .incbin "baserom.gba", 0x0E2524, 0x0000010 gUnk_080E2534:: @ 080E2534 .incbin "baserom.gba", 0x0E2534, 0x0000010 @@ -6210,8 +6055,7 @@ gUnk_080E271C:: @ 080E271C .incbin "baserom.gba", 0x0E271C, 0x0000110 gUnk_080E282C:: @ 080E282C - .incbin "baserom.gba", 0x0E282C, 0x0000019 - .incbin "baserom.gba", 0x0E2845, 0x0000027 + .incbin "baserom.gba", 0x0E282C, 0x0000040 gUnk_080E286C:: @ 080E286C .incbin "baserom.gba", 0x0E286C, 0x0000050 @@ -6272,8 +6116,7 @@ Room_FortressOfWinds_SpikeTraps:: @ 080E2AA8 .4byte gUnk_080E2A72 gUnk_080E2AD8:: @ 080E2AD8 - .incbin "baserom.gba", 0x0E2AD8, 0x0000038 - .incbin "baserom.gba", 0x0E2B10, 0x0000098 + .incbin "baserom.gba", 0x0E2AD8, 0x00000D0 gUnk_080E2BA8:: @ 080E2BA8 .incbin "baserom.gba", 0x0E2BA8, 0x0000010 @@ -7317,8 +7160,7 @@ Room_TempleOfDroplets_FireBars:: @ 080E58C0 .4byte nullsub_302 gUnk_080E58E0:: @ 080E58E0 - .incbin "baserom.gba", 0x0E58E0, 0x0000130 - .incbin "baserom.gba", 0x0E5A10, 0x0000010 + .incbin "baserom.gba", 0x0E58E0, 0x0000140 gUnk_080E5A20:: @ 080E5A20 .incbin "baserom.gba", 0x0E5A20, 0x00000E0 @@ -7520,8 +7362,7 @@ Room_TempleOfDroplets_LanternScissors:: @ 080E64A4 .4byte gUnk_080E6454 gUnk_080E64C8:: @ 080E64C8 - .incbin "baserom.gba", 0x0E64C8, 0x0000078 - .incbin "baserom.gba", 0x0E6540, 0x0000038 + .incbin "baserom.gba", 0x0E64C8, 0x00000B0 gUnk_080E6578:: @ 080E6578 .incbin "baserom.gba", 0x0E6578, 0x0000030 @@ -9806,8 +9647,7 @@ gUnk_080ECC44:: @ 080ECC44 .4byte nullsub_343 gUnk_080ECC64:: @ 080ECC64 - .incbin "baserom.gba", 0x0ECC64, 0x000007C - .incbin "baserom.gba", 0x0ECCE0, 0x0000014 + .incbin "baserom.gba", 0x0ECC64, 0x0000090 gUnk_080ECCF4:: @ 080ECCF4 .incbin "baserom.gba", 0x0ECCF4, 0x0000010 @@ -10445,8 +10285,7 @@ gUnk_080EE304:: @ 080EE304 .incbin "baserom.gba", 0x0EE304, 0x0000010 gUnk_080EE314:: @ 080EE314 - .incbin "baserom.gba", 0x0EE314, 0x0000029 - .incbin "baserom.gba", 0x0EE33D, 0x0000017 + .incbin "baserom.gba", 0x0EE314, 0x0000040 gUnk_080EE354:: @ 080EE354 .4byte gUnk_080EE284 @@ -10640,8 +10479,7 @@ gUnk_080EE9BC:: @ 080EE9BC .incbin "baserom.gba", 0x0EE9BC, 0x0000020 gUnk_080EE9DC:: @ 080EE9DC - .incbin "baserom.gba", 0x0EE9DC, 0x0000010 - .incbin "baserom.gba", 0x0EE9EC, 0x0000010 + .incbin "baserom.gba", 0x0EE9DC, 0x0000020 gUnk_080EE9FC:: @ 080EE9FC .incbin "baserom.gba", 0x0EE9FC, 0x0000020 @@ -10748,9 +10586,7 @@ gUnk_080EED8C:: @ 080EED8C .incbin "baserom.gba", 0x0EED8C, 0x000000C gUnk_080EED98:: @ 080EED98 - .incbin "baserom.gba", 0x0EED98, 0x0000053 - .incbin "baserom.gba", 0x0EEDEB, 0x000000B - .incbin "baserom.gba", 0x0EEDF6, 0x0000022 + .incbin "baserom.gba", 0x0EED98, 0x0000080 gUnk_080EEE18:: @ 080EEE18 .incbin "baserom.gba", 0x0EEE18, 0x0000014 @@ -10801,8 +10637,7 @@ gUnk_080EEF44:: @ 080EEF44 .incbin "baserom.gba", 0x0EEF44, 0x0000014 gUnk_080EEF58:: @ 080EEF58 - .incbin "baserom.gba", 0x0EEF58, 0x0000041 - .incbin "baserom.gba", 0x0EEF99, 0x0000013 + .incbin "baserom.gba", 0x0EEF58, 0x0000054 gUnk_080EEFAC:: @ 080EEFAC .incbin "baserom.gba", 0x0EEFAC, 0x0000014 @@ -10850,8 +10685,7 @@ gUnk_080EF0B0:: @ 080EF0B0 .4byte script_080100FC .incbin "baserom.gba", 0x0EF0CC, 0x000000C .4byte script_080100FC - .incbin "baserom.gba", 0x0EF0DC, 0x0000008 - .incbin "baserom.gba", 0x0EF0E4, 0x0000004 + .incbin "baserom.gba", 0x0EF0DC, 0x000000C .4byte script_080100C8 .incbin "baserom.gba", 0x0EF0EC, 0x000000C .4byte script_080100FC @@ -10994,8 +10828,7 @@ gUnk_080EF0B0:: @ 080EF0B0 gUnk_080EF5D0:: @ 080EF5D0 .incbin "baserom.gba", 0x0EF5D0, 0x0000008 .4byte script_08010264 - .incbin "baserom.gba", 0x0EF5DC, 0x000000C - .incbin "baserom.gba", 0x0EF5E8, 0x0000008 + .incbin "baserom.gba", 0x0EF5DC, 0x0000014 gUnk_080EF5F0:: @ 080EF5F0 .incbin "baserom.gba", 0x0EF5F0, 0x0000008 @@ -11031,8 +10864,7 @@ gUnk_080EF6C0:: @ 080EF6C0 .incbin "baserom.gba", 0x0EF6C0, 0x0000020 gUnk_080EF6E0:: @ 080EF6E0 - .incbin "baserom.gba", 0x0EF6E0, 0x000001C - .incbin "baserom.gba", 0x0EF6FC, 0x0000004 + .incbin "baserom.gba", 0x0EF6E0, 0x0000020 gUnk_080EF700:: @ 080EF700 .incbin "baserom.gba", 0x0EF700, 0x0000020 @@ -11094,8 +10926,7 @@ gUnk_080EF7C0:: @ 080EF7C0 .4byte script_0800F554 .incbin "baserom.gba", 0x0EF8DC, 0x000000C .4byte script_0800F5B0 - .incbin "baserom.gba", 0x0EF8EC, 0x0000005 - .incbin "baserom.gba", 0x0EF8F1, 0x0000007 + .incbin "baserom.gba", 0x0EF8EC, 0x000000C .4byte script_0800F584 .incbin "baserom.gba", 0x0EF8FC, 0x000000C .4byte script_0800F554 @@ -11121,8 +10952,7 @@ gUnk_080EF9C0:: @ 080EF9C0 .incbin "baserom.gba", 0x0EF9C0, 0x0000024 gUnk_080EF9E4:: @ 080EF9E4 - .incbin "baserom.gba", 0x0EF9E4, 0x000000B - .incbin "baserom.gba", 0x0EF9EF, 0x0000021 + .incbin "baserom.gba", 0x0EF9E4, 0x000002C .4byte script_0800EF40 .incbin "baserom.gba", 0x0EFA14, 0x0000074 .4byte script_0801090C @@ -11209,8 +11039,7 @@ Room_HyruleTown_2:: @ 080EFC00 .4byte gUnk_080EEADC .incbin "baserom.gba", 0x0EFC08, 0x0000004 .4byte gUnk_080EECDC - .incbin "baserom.gba", 0x0EFC10, 0x0000001 - .incbin "baserom.gba", 0x0EFC11, 0x000000B + .incbin "baserom.gba", 0x0EFC10, 0x000000C .4byte LoadHyruleTown Room_HyruleTown_3:: @ 080EFC20 @@ -11315,8 +11144,7 @@ Room_HyruleTownMinishCaves_NorthRoom:: @ 080EFE78 .4byte nullsub_77 gUnk_080EFE98:: @ 080EFE98 - .incbin "baserom.gba", 0x0EFE98, 0x0000061 - .incbin "baserom.gba", 0x0EFEF9, 0x000000F + .incbin "baserom.gba", 0x0EFE98, 0x0000070 gUnk_080EFF08:: @ 080EFF08 .incbin "baserom.gba", 0x0EFF08, 0x0000020 @@ -11338,33 +11166,19 @@ Room_HyruleTownMinishCaves_PacciJump:: @ 080EFF80 .4byte nullsub_78 gUnk_080EFFA0:: @ 080EFFA0 - .incbin "baserom.gba", 0x0EFFA0, 0x0000050 - .incbin "baserom.gba", 0x0EFFF0, 0x0000010 + .incbin "baserom.gba", 0x0EFFA0, 0x0000060 gUnk_080F0000:: @ 080F0000 - .incbin "baserom.gba", 0x0F0000, 0x0000008 - .incbin "baserom.gba", 0x0F0008, 0x0000006 - .incbin "baserom.gba", 0x0F000E, 0x0000006 - .incbin "baserom.gba", 0x0F0014, 0x0000006 - .incbin "baserom.gba", 0x0F001A, 0x0000008 - .incbin "baserom.gba", 0x0F0022, 0x0000006 - .incbin "baserom.gba", 0x0F0028, 0x0000008 + .incbin "baserom.gba", 0x0F0000, 0x0000030 gUnk_080F0030:: @ 080F0030 - .incbin "baserom.gba", 0x0F0030, 0x0000002 - .incbin "baserom.gba", 0x0F0032, 0x0000001 - .incbin "baserom.gba", 0x0F0033, 0x0000007 - .incbin "baserom.gba", 0x0F003A, 0x0000006 + .incbin "baserom.gba", 0x0F0030, 0x0000010 gUnk_080F0040:: @ 080F0040 .incbin "baserom.gba", 0x0F0040, 0x0000010 gUnk_080F0050:: @ 080F0050 - .incbin "baserom.gba", 0x0F0050, 0x0000038 - .incbin "baserom.gba", 0x0F0088, 0x0000008 - .incbin "baserom.gba", 0x0F0090, 0x0000008 - .incbin "baserom.gba", 0x0F0098, 0x0000006 - .incbin "baserom.gba", 0x0F009E, 0x0000002 + .incbin "baserom.gba", 0x0F0050, 0x0000050 Room_HyruleTownMinishCaves_MulldozerFight:: @ 080F00A0 .4byte gUnk_080EFFA0 @@ -11395,8 +11209,7 @@ Room_HyruleTownMinishCaves_WestChest:: @ 080F00F4 .incbin "baserom.gba", 0x0F00F8, 0x0000004 .4byte gUnk_080F00D4 .4byte gUnk_080F00E4 - .incbin "baserom.gba", 0x0F0104, 0x0000003 - .incbin "baserom.gba", 0x0F0107, 0x0000005 + .incbin "baserom.gba", 0x0F0104, 0x0000008 .4byte sub_0804E214 .4byte nullsub_080 @@ -11468,10 +11281,7 @@ Room_HyruleTownMinishCaves_WestFrozenChest:: @ 080F0290 .4byte nullsub_083 gUnk_080F02B0:: @ 080F02B0 - .incbin "baserom.gba", 0x0F02B0, 0x0000027 - .incbin "baserom.gba", 0x0F02D7, 0x000001B - .incbin "baserom.gba", 0x0F02F2, 0x0000009 - .incbin "baserom.gba", 0x0F02FB, 0x0000025 + .incbin "baserom.gba", 0x0F02B0, 0x0000070 gUnk_080F0320:: @ 080F0320 .incbin "baserom.gba", 0x0F0320, 0x0000040 @@ -11493,11 +11303,7 @@ gUnk_080F0388:: @ 080F0388 .incbin "baserom.gba", 0x0F0388, 0x0000020 gUnk_080F03A8:: @ 080F03A8 - .incbin "baserom.gba", 0x0F03A8, 0x000004C - .incbin "baserom.gba", 0x0F03F4, 0x0000001 - .incbin "baserom.gba", 0x0F03F5, 0x000000C - .incbin "baserom.gba", 0x0F0401, 0x0000001 - .incbin "baserom.gba", 0x0F0402, 0x0000006 + .incbin "baserom.gba", 0x0F03A8, 0x0000060 gUnk_080F0408:: @ 080F0408 .incbin "baserom.gba", 0x0F0408, 0x0000008 @@ -11516,8 +11322,7 @@ gUnk_080F0430:: @ 080F0430 .incbin "baserom.gba", 0x0F0430, 0x0000010 gUnk_080F0440:: @ 080F0440 - .incbin "baserom.gba", 0x0F0440, 0x0000003 - .incbin "baserom.gba", 0x0F0443, 0x000000D + .incbin "baserom.gba", 0x0F0440, 0x0000010 gUnk_080F0450:: @ 080F0450 .incbin "baserom.gba", 0x0F0450, 0x0000008 @@ -11536,9 +11341,7 @@ gUnk_080F0478:: @ 080F0478 .incbin "baserom.gba", 0x0F0478, 0x0000080 gUnk_080F04F8:: @ 080F04F8 - .incbin "baserom.gba", 0x0F04F8, 0x0000004 - .incbin "baserom.gba", 0x0F04FC, 0x0000007 - .incbin "baserom.gba", 0x0F0503, 0x0000085 + .incbin "baserom.gba", 0x0F04F8, 0x0000090 gUnk_080F0588:: @ 080F0588 .incbin "baserom.gba", 0x0F0588, 0x0000030 @@ -11557,12 +11360,10 @@ gUnk_080F05D8:: @ 080F05D8 .incbin "baserom.gba", 0x0F05D8, 0x0000020 gUnk_080F05F8:: @ 080F05F8 - .incbin "baserom.gba", 0x0F05F8, 0x0000008 - .incbin "baserom.gba", 0x0F0600, 0x0000008 + .incbin "baserom.gba", 0x0F05F8, 0x0000010 gUnk_080F0608:: @ 080F0608 - .incbin "baserom.gba", 0x0F0608, 0x0000001 - .incbin "baserom.gba", 0x0F0609, 0x0000007 + .incbin "baserom.gba", 0x0F0608, 0x0000008 Room_HyruleTownUnderground_Well:: @ 080F0610 .4byte gUnk_080F05D8 @@ -11616,8 +11417,7 @@ gUnk_080F06E0:: @ 080F06E0 .4byte script_08011640 .incbin "baserom.gba", 0x0F06F0, 0x000000C .4byte script_080112C4 - .incbin "baserom.gba", 0x0F0700, 0x0000005 - .incbin "baserom.gba", 0x0F0705, 0x0000007 + .incbin "baserom.gba", 0x0F0700, 0x000000C .4byte script_080112C4 .incbin "baserom.gba", 0x0F0710, 0x000000C .4byte script_080112C4 @@ -11651,11 +11451,9 @@ gUnk_080F0770:: @ 080F0770 .incbin "baserom.gba", 0x0F07F0, 0x0000010 gUnk_080F0800:: @ 080F0800 - .incbin "baserom.gba", 0x0F0800, 0x0000006 - .incbin "baserom.gba", 0x0F0806, 0x0000006 + .incbin "baserom.gba", 0x0F0800, 0x000000C .4byte script_0801194C - .incbin "baserom.gba", 0x0F0810, 0x0000006 - .incbin "baserom.gba", 0x0F0816, 0x0000006 + .incbin "baserom.gba", 0x0F0810, 0x000000C .4byte script_08011964 .incbin "baserom.gba", 0x0F0820, 0x000000C .4byte script_08011958 @@ -11726,9 +11524,7 @@ gUnk_080F09A0:: @ 080F09A0 .endif gUnk_080F0A00:: @ 080F0A00 - .incbin "baserom.gba", 0x0F0A00, 0x0000002 - .incbin "baserom.gba", 0x0F0A02, 0x0000007 - .incbin "baserom.gba", 0x0F0A09, 0x0000007 + .incbin "baserom.gba", 0x0F0A00, 0x0000010 gUnk_080F0A10:: @ 080F0A10 .incbin "baserom.gba", 0x0F0A10, 0x0000001 @@ -11752,12 +11548,10 @@ gUnk_080F0A30:: @ 080F0A30 .incbin "baserom.gba", 0x0F0A30, 0x0000020 gUnk_080F0A50:: @ 080F0A50 - .incbin "baserom.gba", 0x0F0A50, 0x0000011 - .incbin "baserom.gba", 0x0F0A61, 0x0000003 + .incbin "baserom.gba", 0x0F0A50, 0x0000014 gUnk_080F0A64:: @ 080F0A64 - .incbin "baserom.gba", 0x0F0A64, 0x000000F - .incbin "baserom.gba", 0x0F0A73, 0x0000005 + .incbin "baserom.gba", 0x0F0A64, 0x0000014 gUnk_080F0A78:: @ 080F0A78 .incbin "baserom.gba", 0x0F0A78, 0x0000014 @@ -11810,13 +11604,7 @@ gUnk_080F0BB8:: @ 080F0BB8 .incbin "baserom.gba", 0x0F0BB8, 0x0000030 gUnk_080F0BE8:: @ 080F0BE8 - .incbin "baserom.gba", 0x0F0BE8, 0x0000019 - .incbin "baserom.gba", 0x0F0C01, 0x0000004 - .incbin "baserom.gba", 0x0F0C05, 0x0000001 - .incbin "baserom.gba", 0x0F0C06, 0x0000005 - .incbin "baserom.gba", 0x0F0C0B, 0x0000001 - .incbin "baserom.gba", 0x0F0C0C, 0x0000009 - .incbin "baserom.gba", 0x0F0C15, 0x0000003 + .incbin "baserom.gba", 0x0F0BE8, 0x0000030 gUnk_080F0C18:: @ 080F0C18 .incbin "baserom.gba", 0x0F0C18, 0x0000030 @@ -11841,13 +11629,7 @@ gUnk_080F0CD8:: @ 080F0CD8 .incbin "baserom.gba", 0x0F0CD8, 0x0000020 gUnk_080F0CF8:: @ 080F0CF8 - .incbin "baserom.gba", 0x0F0CF8, 0x0000002 - .incbin "baserom.gba", 0x0F0CFA, 0x0000004 - .incbin "baserom.gba", 0x0F0CFE, 0x0000004 - .incbin "baserom.gba", 0x0F0D02, 0x0000003 - .incbin "baserom.gba", 0x0F0D05, 0x0000003 - .incbin "baserom.gba", 0x0F0D08, 0x0000007 - .incbin "baserom.gba", 0x0F0D0F, 0x0000009 + .incbin "baserom.gba", 0x0F0CF8, 0x0000020 gUnk_080F0D18:: @ 080F0D18 .incbin "baserom.gba", 0x0F0D18, 0x0000020 @@ -11874,9 +11656,7 @@ gUnk_080F0DC8:: @ 080F0DC8 .incbin "baserom.gba", 0x0F0DC8, 0x0000020 gUnk_080F0DE8:: @ 080F0DE8 - .incbin "baserom.gba", 0x0F0DE8, 0x000001A - .incbin "baserom.gba", 0x0F0E02, 0x0000002 - .incbin "baserom.gba", 0x0F0E04, 0x0000004 + .incbin "baserom.gba", 0x0F0DE8, 0x0000020 gUnk_080F0E08:: @ 080F0E08 .4byte gUnk_080F0D68 @@ -11889,127 +11669,46 @@ gUnk_080F0E1C:: @ 080F0E1C .incbin "baserom.gba", 0x0F0E1C, 0x0000080 gUnk_080F0E9C:: @ 080F0E9C - .incbin "baserom.gba", 0x0F0E9C, 0x0000046 - .incbin "baserom.gba", 0x0F0EE2, 0x0000009 - .incbin "baserom.gba", 0x0F0EEB, 0x0000005 - .incbin "baserom.gba", 0x0F0EF0, 0x0000010 - .incbin "baserom.gba", 0x0F0F00, 0x0000003 - .incbin "baserom.gba", 0x0F0F03, 0x0000004 - .incbin "baserom.gba", 0x0F0F07, 0x0000005 - .incbin "baserom.gba", 0x0F0F0C, 0x0000001 - .incbin "baserom.gba", 0x0F0F0D, 0x0000004 - .incbin "baserom.gba", 0x0F0F11, 0x0000001 - .incbin "baserom.gba", 0x0F0F12, 0x00000AA + .incbin "baserom.gba", 0x0F0E9C, 0x0000120 gUnk_080F0FBC:: @ 080F0FBC - .incbin "baserom.gba", 0x0F0FBC, 0x0000044 - .incbin "baserom.gba", 0x0F1000, 0x000000C - .incbin "baserom.gba", 0x0F100C, 0x0000001 - .incbin "baserom.gba", 0x0F100D, 0x0000009 - .incbin "baserom.gba", 0x0F1016, 0x000004B - .incbin "baserom.gba", 0x0F1061, 0x0000002 - .incbin "baserom.gba", 0x0F1063, 0x0000039 + .incbin "baserom.gba", 0x0F0FBC, 0x00000E0 gUnk_080F109C:: @ 080F109C - .incbin "baserom.gba", 0x0F109C, 0x000006B - .incbin "baserom.gba", 0x0F1107, 0x0000002 - .incbin "baserom.gba", 0x0F1109, 0x0000002 - .incbin "baserom.gba", 0x0F110B, 0x0000003 - .incbin "baserom.gba", 0x0F110E, 0x0000001 - .incbin "baserom.gba", 0x0F110F, 0x0000002 - .incbin "baserom.gba", 0x0F1111, 0x0000002 - .incbin "baserom.gba", 0x0F1113, 0x0000001 - .incbin "baserom.gba", 0x0F1114, 0x0000002 - .incbin "baserom.gba", 0x0F1116, 0x00000D6 + .incbin "baserom.gba", 0x0F109C, 0x0000150 gUnk_080F11EC:: @ 080F11EC - .incbin "baserom.gba", 0x0F11EC, 0x0000019 - .incbin "baserom.gba", 0x0F1205, 0x0000007 - .incbin "baserom.gba", 0x0F120C, 0x0000002 - .incbin "baserom.gba", 0x0F120E, 0x0000001 - .incbin "baserom.gba", 0x0F120F, 0x0000002 - .incbin "baserom.gba", 0x0F1211, 0x0000002 - .incbin "baserom.gba", 0x0F1213, 0x0000003 - .incbin "baserom.gba", 0x0F1216, 0x00000E6 + .incbin "baserom.gba", 0x0F11EC, 0x0000110 gUnk_080F12FC:: @ 080F12FC - .incbin "baserom.gba", 0x0F12FC, 0x0000015 - .incbin "baserom.gba", 0x0F1311, 0x0000002 - .incbin "baserom.gba", 0x0F1313, 0x0000002 - .incbin "baserom.gba", 0x0F1315, 0x0000002 - .incbin "baserom.gba", 0x0F1317, 0x0000003 - .incbin "baserom.gba", 0x0F131A, 0x00000EE - .incbin "baserom.gba", 0x0F1408, 0x0000002 - .incbin "baserom.gba", 0x0F140A, 0x0000002 + .incbin "baserom.gba", 0x0F12FC, 0x0000110 gUnk_080F140C:: @ 080F140C - .incbin "baserom.gba", 0x0F140C, 0x0000008 - .incbin "baserom.gba", 0x0F1414, 0x0000002 - .incbin "baserom.gba", 0x0F1416, 0x0000001 - .incbin "baserom.gba", 0x0F1417, 0x0000002 - .incbin "baserom.gba", 0x0F1419, 0x00000C3 + .incbin "baserom.gba", 0x0F140C, 0x00000D0 gUnk_080F14DC:: @ 080F14DC - .incbin "baserom.gba", 0x0F14DC, 0x0000031 - .incbin "baserom.gba", 0x0F150D, 0x0000001 - .incbin "baserom.gba", 0x0F150E, 0x0000007 - .incbin "baserom.gba", 0x0F1515, 0x0000003 - .incbin "baserom.gba", 0x0F1518, 0x0000002 - .incbin "baserom.gba", 0x0F151A, 0x0000001 - .incbin "baserom.gba", 0x0F151B, 0x00000E1 + .incbin "baserom.gba", 0x0F14DC, 0x0000120 gUnk_080F15FC:: @ 080F15FC - .incbin "baserom.gba", 0x0F15FC, 0x0000019 - .incbin "baserom.gba", 0x0F1615, 0x0000001 - .incbin "baserom.gba", 0x0F1616, 0x0000001 - .incbin "baserom.gba", 0x0F1617, 0x0000002 - .incbin "baserom.gba", 0x0F1619, 0x0000001 - .incbin "baserom.gba", 0x0F161A, 0x0000001 - .incbin "baserom.gba", 0x0F161B, 0x0000001 - .incbin "baserom.gba", 0x0F161C, 0x0000001 - .incbin "baserom.gba", 0x0F161D, 0x0000001 - .incbin "baserom.gba", 0x0F161E, 0x00000EE + .incbin "baserom.gba", 0x0F15FC, 0x0000110 gUnk_080F170C:: @ 080F170C - .incbin "baserom.gba", 0x0F170C, 0x000000A - .incbin "baserom.gba", 0x0F1716, 0x0000004 - .incbin "baserom.gba", 0x0F171A, 0x0000002 - .incbin "baserom.gba", 0x0F171C, 0x0000003 - .incbin "baserom.gba", 0x0F171F, 0x0000001 - .incbin "baserom.gba", 0x0F1720, 0x0000002 - .incbin "baserom.gba", 0x0F1722, 0x00000BA + .incbin "baserom.gba", 0x0F170C, 0x00000D0 gUnk_080F17DC:: @ 080F17DC - .incbin "baserom.gba", 0x0F17DC, 0x000003D - .incbin "baserom.gba", 0x0F1819, 0x0000004 - .incbin "baserom.gba", 0x0F181D, 0x0000001 - .incbin "baserom.gba", 0x0F181E, 0x0000002 - .incbin "baserom.gba", 0x0F1820, 0x0000002 - .incbin "baserom.gba", 0x0F1822, 0x0000002 - .incbin "baserom.gba", 0x0F1824, 0x0000068 + .incbin "baserom.gba", 0x0F17DC, 0x00000B0 gUnk_080F188C:: @ 080F188C - .incbin "baserom.gba", 0x0F188C, 0x0000093 - .incbin "baserom.gba", 0x0F191F, 0x0000002 - .incbin "baserom.gba", 0x0F1921, 0x0000002 - .incbin "baserom.gba", 0x0F1923, 0x0000002 - .incbin "baserom.gba", 0x0F1925, 0x0000001 - .incbin "baserom.gba", 0x0F1926, 0x0000036 + .incbin "baserom.gba", 0x0F188C, 0x00000D0 gUnk_080F195C:: @ 080F195C - .incbin "baserom.gba", 0x0F195C, 0x00000B3 - .incbin "baserom.gba", 0x0F1A0F, 0x0000011 - .incbin "baserom.gba", 0x0F1A20, 0x0000005 - .incbin "baserom.gba", 0x0F1A25, 0x0000001 - .incbin "baserom.gba", 0x0F1A26, 0x0000006 + .incbin "baserom.gba", 0x0F195C, 0x00000D0 gUnk_080F1A2C:: @ 080F1A2C .incbin "baserom.gba", 0x0F1A2C, 0x00000B0 gUnk_080F1ADC:: @ 080F1ADC - .incbin "baserom.gba", 0x0F1ADC, 0x0000044 - .incbin "baserom.gba", 0x0F1B20, 0x000000C - .incbin "baserom.gba", 0x0F1B2C, 0x0000060 + .incbin "baserom.gba", 0x0F1ADC, 0x00000B0 gUnk_080F1B8C:: @ 080F1B8C .incbin "baserom.gba", 0x0F1B8C, 0x0000060 @@ -12064,8 +11763,7 @@ gUnk_080F1D18:: @ 080F1D18 .incbin "baserom.gba", 0x0F1D18, 0x0000008 gUnk_080F1D20:: @ 080F1D20 - .incbin "baserom.gba", 0x0F1D20, 0x0000011 - .incbin "baserom.gba", 0x0F1D31, 0x0000003 + .incbin "baserom.gba", 0x0F1D20, 0x0000014 gUnk_080F1D34:: @ 080F1D34 .incbin "baserom.gba", 0x0F1D34, 0x0000014 @@ -12101,8 +11799,7 @@ gUnk_080F1DD0:: @ 080F1DD0 .incbin "baserom.gba", 0x0F1DE0, 0x0000010 gUnk_080F1DF0:: @ 080F1DF0 - .incbin "baserom.gba", 0x0F1DF0, 0x000002D - .incbin "baserom.gba", 0x0F1E1D, 0x0000043 + .incbin "baserom.gba", 0x0F1DF0, 0x0000070 gUnk_080F1E60:: @ 080F1E60 .incbin "baserom.gba", 0x0F1E60, 0x0000010 @@ -12167,8 +11864,7 @@ Room_HouseInteriors2_2:: @ 080F1FEC .4byte gUnk_080F1FDC gUnk_080F2018:: @ 080F2018 - .incbin "baserom.gba", 0x0F2018, 0x0000018 - .incbin "baserom.gba", 0x0F2030, 0x0000008 + .incbin "baserom.gba", 0x0F2018, 0x0000020 gUnk_080F2038:: @ 080F2038 .incbin "baserom.gba", 0x0F2038, 0x0000080 @@ -12186,8 +11882,7 @@ gUnk_080F20E4:: @ 080F20E4 .incbin "baserom.gba", 0x0F20E4, 0x0000014 gUnk_080F20F8:: @ 080F20F8 - .incbin "baserom.gba", 0x0F20F8, 0x0000007 - .incbin "baserom.gba", 0x0F20FF, 0x0000009 + .incbin "baserom.gba", 0x0F20F8, 0x0000010 Room_HouseInteriors2_3:: @ 080F2108 .4byte gUnk_080F2018 @@ -12214,12 +11909,10 @@ gUnk_080F2194:: @ 080F2194 .incbin "baserom.gba", 0x0F2194, 0x0000020 gUnk_080F21B4:: @ 080F21B4 - .incbin "baserom.gba", 0x0F21B4, 0x000000B - .incbin "baserom.gba", 0x0F21BF, 0x0000015 + .incbin "baserom.gba", 0x0F21B4, 0x0000020 gUnk_080F21D4:: @ 080F21D4 - .incbin "baserom.gba", 0x0F21D4, 0x000005E - .incbin "baserom.gba", 0x0F2232, 0x0000032 + .incbin "baserom.gba", 0x0F21D4, 0x0000090 gUnk_080F2264:: @ 080F2264 .incbin "baserom.gba", 0x0F2264, 0x0000010 @@ -12262,8 +11955,7 @@ Room_HouseInteriors2_DrLeft:: @ 080F22F4 .4byte gUnk_080F22B8 gUnk_080F232C:: @ 080F232C - .incbin "baserom.gba", 0x0F232C, 0x0000010 - .incbin "baserom.gba", 0x0F233C, 0x0000030 + .incbin "baserom.gba", 0x0F232C, 0x0000040 gUnk_080F236C:: @ 080F236C .incbin "baserom.gba", 0x0F236C, 0x000000C @@ -12323,9 +12015,7 @@ Room_HouseInteriors2_Romio:: @ 080F24D8 .4byte gUnk_080F2474 gUnk_080F2510:: @ 080F2510 - .incbin "baserom.gba", 0x0F2510, 0x0000018 - .incbin "baserom.gba", 0x0F2528, 0x0000009 - .incbin "baserom.gba", 0x0F2531, 0x000003F + .incbin "baserom.gba", 0x0F2510, 0x0000060 gUnk_080F2570:: @ 080F2570 .incbin "baserom.gba", 0x0F2570, 0x000000C @@ -12384,8 +12074,7 @@ gUnk_080F26F8:: @ 080F26F8 gUnk_080F2718:: @ 080F2718 .incbin "baserom.gba", 0x0F2718, 0x000000C .4byte script_08012270 - .incbin "baserom.gba", 0x0F2728, 0x0000011 - .incbin "baserom.gba", 0x0F2739, 0x000001F + .incbin "baserom.gba", 0x0F2728, 0x0000030 gUnk_080F2758:: @ 080F2758 .incbin "baserom.gba", 0x0F2758, 0x000000C @@ -12471,8 +12160,7 @@ gUnk_080F29EC:: @ 080F29EC .incbin "baserom.gba", 0x0F29EC, 0x0000030 gUnk_080F2A1C:: @ 080F2A1C - .incbin "baserom.gba", 0x0F2A1C, 0x0000024 - .incbin "baserom.gba", 0x0F2A40, 0x000002C + .incbin "baserom.gba", 0x0F2A1C, 0x0000050 gUnk_080F2A6C:: @ 080F2A6C .incbin "baserom.gba", 0x0F2A6C, 0x0000010 @@ -12667,8 +12355,7 @@ gUnk_080F30CC:: @ 080F30CC .incbin "baserom.gba", 0x0F30CC, 0x0000020 gUnk_080F30EC:: @ 080F30EC - .incbin "baserom.gba", 0x0F30EC, 0x000000E - .incbin "baserom.gba", 0x0F30FA, 0x0000052 + .incbin "baserom.gba", 0x0F30EC, 0x0000060 gUnk_080F314C:: @ 080F314C .incbin "baserom.gba", 0x0F314C, 0x0000010 @@ -12840,8 +12527,7 @@ gUnk_080F37D0:: @ 080F37D0 .incbin "baserom.gba", 0x0F37E0, 0x0000010 gUnk_080F37F0:: @ 080F37F0 - .incbin "baserom.gba", 0x0F37F0, 0x00000B4 - .incbin "baserom.gba", 0x0F38A4, 0x000001C + .incbin "baserom.gba", 0x0F37F0, 0x00000D0 gUnk_080F38C0:: @ 080F38C0 .incbin "baserom.gba", 0x0F38C0, 0x0000010 @@ -16671,8 +16357,7 @@ gUnk_080FAAF8:: @ 080FAAF8 .incbin "baserom.gba", 0x0FAAF8, 0x0000020 gUnk_080FAB18:: @ 080FAB18 - .incbin "baserom.gba", 0x0FAB18, 0x0000067 - .incbin "baserom.gba", 0x0FAB7F, 0x0000009 + .incbin "baserom.gba", 0x0FAB18, 0x0000070 gUnk_080FAB88:: @ 080FAB88 .incbin "baserom.gba", 0x0FAB88, 0x0000010 diff --git a/data/data_080FC8A4.s b/data/data_080FC8A4.s index f3d861e2..586e3c74 100644 --- a/data/data_080FC8A4.s +++ b/data/data_080FC8A4.s @@ -1262,8 +1262,7 @@ gUnk_080FE320:: @ 080FE320 .endif gUnk_080FEAC8:: @ 080FEAC8 - .incbin "baserom.gba", 0x0FEAC8, 0x0000003 - .incbin "baserom.gba", 0x0FEACB, 0x0000023 + .incbin "baserom.gba", 0x0FEAC8, 0x0000026 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0FE79E, 0x000002C @@ -1299,9 +1298,7 @@ gUnk_080FEAC8:: @ 080FEAC8 .incbin "baserom.gba", 0x0FEBDC, 0x000000C gUnk_080FEBE8:: @ 080FEBE8 - .incbin "baserom.gba", 0x0FEBE8, 0x0000006 - .incbin "baserom.gba", 0x0FEBEE, 0x000001B - .incbin "baserom.gba", 0x0FEC09, 0x000001F + .incbin "baserom.gba", 0x0FEBE8, 0x0000040 gUnk_080FEC28:: @ 080FEC28 .incbin "baserom.gba", 0x0FEC28, 0x00000A0 diff --git a/data/data_080FEEB8.s b/data/data_080FEEB8.s index 1a1f40f1..68fcfa02 100644 --- a/data/data_080FEEB8.s +++ b/data/data_080FEEB8.s @@ -146,8 +146,7 @@ gUnk_080FF1CC:: @ 080FF1CC .4byte nullsub_488 gUnk_080FF1D4:: @ 080FF1D4 - .incbin "baserom.gba", 0x0FF1D4, 0x0000018 - .incbin "baserom.gba", 0x0FF1EC, 0x0000008 + .incbin "baserom.gba", 0x0FF1D4, 0x0000020 gUnk_080FF1F4:: @ 080FF1F4 .4byte sub_08055184 @@ -1906,39 +1905,28 @@ gUnk_080FFBA8:: @ 080FFBA8 .ifdef JP .incbin "baserom_jp.gba", 0x0FF858, 0x0000035 .else -.ifdef EU - .incbin "baserom_eu.gba", 0x0FF0DC, 0x0000048 -.else .ifdef DEMO_JP - .incbin "baserom_jp.gba", 0x0FF858, 0x0000035 + .incbin "baserom_jp.gba", 0x0FF858, 0x0000035 .else .incbin "baserom.gba", 0x0FFBA8, 0x0000035 .endif .endif -.endif .ifdef JP - .incbin "baserom_jp.gba", 0x0FF88D, 0x000001f -.else -.ifdef EU - .incbin "baserom_eu.gba", 0x0FF124, 0x0000054 + .incbin "baserom_jp.gba", 0x0FF88D, 0x000001F .else .ifdef DEMO_JP - .incbin "baserom_jp.gba", 0x0FF88D, 0x000001f + .incbin "baserom_jp.gba", 0x0FF88D, 0x000001F .else .incbin "baserom.gba", 0x0FFBDD, 0x0000013 .endif .endif -.endif gUnk_080FFBF0:: @ 080FFBF0 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0FF8AC, 0x0000024 .else -.ifdef EU - .incbin "baserom_eu.gba", 0x0FF178, 0x0000054 -.else .ifdef DEMO_JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0FF8AC, 0x0000024 @@ -1946,7 +1934,6 @@ gUnk_080FFBF0:: @ 080FFBF0 .incbin "baserom.gba", 0x0FFBF0, 0x0000024 .endif .endif -.endif gUnk_080FFC14:: @ 080FFC14 .incbin "baserom.gba", 0x0FFC14, 0x0000024 @@ -2072,9 +2059,7 @@ gUnk_080FFDD0:: @ 080FFDD0 .incbin "baserom.gba", 0x0FFDD0, 0x0000018 gUnk_080FFDE8:: @ 080FFDE8 - .incbin "baserom.gba", 0x0FFDE8, 0x000000C - .incbin "baserom.gba", 0x0FFDF4, 0x0000005 - .incbin "baserom.gba", 0x0FFDF9, 0x0000007 + .incbin "baserom.gba", 0x0FFDE8, 0x0000018 gUnk_080FFE00:: @ 080FFE00 .incbin "baserom.gba", 0x0FFE00, 0x0000018 @@ -2113,32 +2098,25 @@ gUnk_080FFFEC:: @ 080FFFEC .incbin "baserom.gba", 0x0FFFEC, 0x000000C gUnk_080FFFF8:: @ 080FFFF8 - .incbin "baserom.gba", 0x0FFFF8, 0x0000008 - .incbin "baserom.gba", 0x100000, 0x0000001 - .incbin "baserom.gba", 0x100001, 0x0000002 - .incbin "baserom.gba", 0x100003, 0x0000001 + .incbin "baserom.gba", 0x0FFFF8, 0x000000C gUnk_08100004:: @ 08100004 .incbin "baserom.gba", 0x100004, 0x000000C gUnk_08100010:: @ 08100010 - .incbin "baserom.gba", 0x100010, 0x0000005 - .incbin "baserom.gba", 0x100015, 0x0000007 + .incbin "baserom.gba", 0x100010, 0x000000C gUnk_0810001C:: @ 0810001C .incbin "baserom.gba", 0x10001C, 0x000000C gUnk_08100028:: @ 08100028 - .incbin "baserom.gba", 0x100028, 0x0000004 - .incbin "baserom.gba", 0x10002C, 0x0000008 + .incbin "baserom.gba", 0x100028, 0x000000C gUnk_08100034:: @ 08100034 - .incbin "baserom.gba", 0x100034, 0x000000B - .incbin "baserom.gba", 0x10003F, 0x0000001 + .incbin "baserom.gba", 0x100034, 0x000000C gUnk_08100040:: @ 08100040 - .incbin "baserom.gba", 0x100040, 0x0000002 - .incbin "baserom.gba", 0x100042, 0x000000A + .incbin "baserom.gba", 0x100040, 0x000000C gUnk_0810004C:: @ 0810004C .incbin "baserom.gba", 0x10004C, 0x000000C @@ -2177,28 +2155,22 @@ gUnk_081000D0:: @ 081000D0 .incbin "baserom.gba", 0x1000D0, 0x000000C gUnk_081000DC:: @ 081000DC - .incbin "baserom.gba", 0x1000DC, 0x0000008 - .incbin "baserom.gba", 0x1000E4, 0x0000004 + .incbin "baserom.gba", 0x1000DC, 0x000000C gUnk_081000E8:: @ 081000E8 - .incbin "baserom.gba", 0x1000E8, 0x0000008 - .incbin "baserom.gba", 0x1000F0, 0x0000004 + .incbin "baserom.gba", 0x1000E8, 0x000000C gUnk_081000F4:: @ 081000F4 .incbin "baserom.gba", 0x1000F4, 0x000000C gUnk_08100100:: @ 08100100 - .incbin "baserom.gba", 0x100100, 0x0000007 - .incbin "baserom.gba", 0x100107, 0x0000002 - .incbin "baserom.gba", 0x100109, 0x0000003 + .incbin "baserom.gba", 0x100100, 0x000000C gUnk_0810010C:: @ 0810010C .incbin "baserom.gba", 0x10010C, 0x000000C gUnk_08100118:: @ 08100118 - .incbin "baserom.gba", 0x100118, 0x0000008 - .incbin "baserom.gba", 0x100120, 0x0000006 - .incbin "baserom.gba", 0x100126, 0x000000A + .incbin "baserom.gba", 0x100118, 0x0000018 gUnk_08100130:: @ 08100130 .incbin "baserom.gba", 0x100130, 0x0000018 @@ -2225,9 +2197,7 @@ gUnk_081001D8:: @ 081001D8 .incbin "baserom.gba", 0x1001D8, 0x0000018 gUnk_081001F0:: @ 081001F0 - .incbin "baserom.gba", 0x1001F0, 0x0000009 - .incbin "baserom.gba", 0x1001F9, 0x000000D - .incbin "baserom.gba", 0x100206, 0x0000002 + .incbin "baserom.gba", 0x1001F0, 0x0000018 gUnk_08100208:: @ 08100208 .incbin "baserom.gba", 0x100208, 0x0000018 @@ -2263,10 +2233,7 @@ gUnk_081002EC:: @ 081002EC .incbin "baserom.gba", 0x1002EC, 0x000000C gUnk_081002F8:: @ 081002F8 - .incbin "baserom.gba", 0x1002F8, 0x000000C - .incbin "baserom.gba", 0x100304, 0x000000C - .incbin "baserom.gba", 0x100310, 0x0000007 - .incbin "baserom.gba", 0x100317, 0x0000011 + .incbin "baserom.gba", 0x1002F8, 0x0000030 gUnk_08100328:: @ 08100328 .incbin "baserom.gba", 0x100328, 0x0000030 @@ -2288,8 +2255,7 @@ gUnk_08100388:: @ 08100388 .endif gUnk_081003DC:: @ 081003DC - .incbin "baserom.gba", 0x1003DC, 0x0000024 - .incbin "baserom.gba", 0x100400, 0x0000001 + .incbin "baserom.gba", 0x1003DC, 0x0000025 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x1000C9, 0x0000006 @@ -2404,13 +2370,10 @@ gUnk_081004F0:: @ 081004F0 .endif .endif - .incbin "baserom.gba", 0x100510, 0x0000001 - .incbin "baserom.gba", 0x100511, 0x0000003 + .incbin "baserom.gba", 0x100510, 0x0000004 gUnk_08100514:: @ 08100514 - .incbin "baserom.gba", 0x100514, 0x000000C - .incbin "baserom.gba", 0x100520, 0x0000021 - .incbin "baserom.gba", 0x100541, 0x000000F + .incbin "baserom.gba", 0x100514, 0x000003C gUnk_08100550:: @ 08100550 .incbin "baserom.gba", 0x100550, 0x0000030 @@ -2422,23 +2385,16 @@ gUnk_081005B0:: @ 081005B0 .incbin "baserom.gba", 0x1005B0, 0x0000030 gUnk_081005E0:: @ 081005E0 - .incbin "baserom.gba", 0x1005E0, 0x000001B - .incbin "baserom.gba", 0x1005FB, 0x0000004 - .incbin "baserom.gba", 0x1005FF, 0x0000001 - .incbin "baserom.gba", 0x100600, 0x0000005 - .incbin "baserom.gba", 0x100605, 0x0000001 - .incbin "baserom.gba", 0x100606, 0x000000A + .incbin "baserom.gba", 0x1005E0, 0x0000030 gUnk_08100610:: @ 08100610 - .incbin "baserom.gba", 0x100610, 0x0000010 - .incbin "baserom.gba", 0x100620, 0x0000020 + .incbin "baserom.gba", 0x100610, 0x0000030 gUnk_08100640:: @ 08100640 .incbin "baserom.gba", 0x100640, 0x0000030 gUnk_08100670:: @ 08100670 - .incbin "baserom.gba", 0x100670, 0x0000011 - .incbin "baserom.gba", 0x100681, 0x000001F + .incbin "baserom.gba", 0x100670, 0x0000030 gUnk_081006A0:: @ 081006A0 .incbin "baserom.gba", 0x1006A0, 0x0000030 @@ -2447,55 +2403,37 @@ gUnk_081006D0:: @ 081006D0 .incbin "baserom.gba", 0x1006D0, 0x0000030 gUnk_08100700:: @ 08100700 - .incbin "baserom.gba", 0x100700, 0x0000010 - .incbin "baserom.gba", 0x100710, 0x0000010 - .incbin "baserom.gba", 0x100720, 0x0000010 + .incbin "baserom.gba", 0x100700, 0x0000030 gUnk_08100730:: @ 08100730 - .incbin "baserom.gba", 0x100730, 0x0000010 - .incbin "baserom.gba", 0x100740, 0x0000010 - .incbin "baserom.gba", 0x100750, 0x0000010 + .incbin "baserom.gba", 0x100730, 0x0000030 gUnk_08100760:: @ 08100760 - .incbin "baserom.gba", 0x100760, 0x0000020 - .incbin "baserom.gba", 0x100780, 0x0000001 - .incbin "baserom.gba", 0x100781, 0x000000F + .incbin "baserom.gba", 0x100760, 0x0000030 gUnk_08100790:: @ 08100790 .incbin "baserom.gba", 0x100790, 0x0000030 gUnk_081007C0:: @ 081007C0 - .incbin "baserom.gba", 0x1007C0, 0x0000020 - .incbin "baserom.gba", 0x1007E0, 0x0000010 + .incbin "baserom.gba", 0x1007C0, 0x0000030 gUnk_081007F0:: @ 081007F0 - .incbin "baserom.gba", 0x1007F0, 0x000000E - .incbin "baserom.gba", 0x1007FE, 0x0000001 - .incbin "baserom.gba", 0x1007FF, 0x0000001 - .incbin "baserom.gba", 0x100800, 0x0000004 - .incbin "baserom.gba", 0x100804, 0x0000005 - .incbin "baserom.gba", 0x100809, 0x0000007 - .incbin "baserom.gba", 0x100810, 0x0000003 - .incbin "baserom.gba", 0x100813, 0x000000D + .incbin "baserom.gba", 0x1007F0, 0x0000030 gUnk_08100820:: @ 08100820 - .incbin "baserom.gba", 0x100820, 0x0000021 - .incbin "baserom.gba", 0x100841, 0x000000F + .incbin "baserom.gba", 0x100820, 0x0000030 gUnk_08100850:: @ 08100850 .incbin "baserom.gba", 0x100850, 0x0000030 gUnk_08100880:: @ 08100880 - .incbin "baserom.gba", 0x100880, 0x0000001 - .incbin "baserom.gba", 0x100881, 0x000002F + .incbin "baserom.gba", 0x100880, 0x0000030 gUnk_081008B0:: @ 081008B0 .incbin "baserom.gba", 0x1008B0, 0x0000030 gUnk_081008E0:: @ 081008E0 - .incbin "baserom.gba", 0x1008E0, 0x0000023 - .incbin "baserom.gba", 0x100903, 0x0000001 - .incbin "baserom.gba", 0x100904, 0x000000C + .incbin "baserom.gba", 0x1008E0, 0x0000030 gUnk_08100910:: @ 08100910 .incbin "baserom.gba", 0x100910, 0x0000030 @@ -2526,24 +2464,19 @@ gUnk_081009C4:: @ 081009C4 .incbin "baserom.gba", 0x1009C4, 0x000000C gUnk_081009D0:: @ 081009D0 - .incbin "baserom.gba", 0x1009D0, 0x0000009 - .incbin "baserom.gba", 0x1009D9, 0x0000003 + .incbin "baserom.gba", 0x1009D0, 0x000000C gUnk_081009DC:: @ 081009DC .incbin "baserom.gba", 0x1009DC, 0x000000C gUnk_081009E8:: @ 081009E8 - .incbin "baserom.gba", 0x1009E8, 0x0000005 - .incbin "baserom.gba", 0x1009ED, 0x0000007 + .incbin "baserom.gba", 0x1009E8, 0x000000C gUnk_081009F4:: @ 081009F4 .incbin "baserom.gba", 0x1009F4, 0x000000C gUnk_08100A00:: @ 08100A00 - .incbin "baserom.gba", 0x100A00, 0x0000006 - .incbin "baserom.gba", 0x100A06, 0x0000004 - .incbin "baserom.gba", 0x100A0A, 0x0000002 - .incbin "baserom.gba", 0x100A0C, 0x0000005 + .incbin "baserom.gba", 0x100A00, 0x0000011 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x1006D9, 0x000001F diff --git a/data/data_08107BC8.s b/data/data_08107BC8.s index 71720b8c..9166f4a4 100755 --- a/data/data_08107BC8.s +++ b/data/data_08107BC8.s @@ -11,5 +11,4 @@ gUnk_08107C0F:: @ 08107C0F .incbin "baserom.gba", 0x107C0F, 0x0000005 gUnk_08107C14:: @ 08107C14 - .incbin "baserom.gba", 0x107C14, 0x0000004 - .incbin "baserom.gba", 0x107C18, 0x0000004 + .incbin "baserom.gba", 0x107C14, 0x0000008 diff --git a/data/data_08108E6C.s b/data/data_08108E6C.s index 9a97e2f4..c13f4541 100644 --- a/data/data_08108E6C.s +++ b/data/data_08108E6C.s @@ -439,24 +439,13 @@ gUnk_081092AC:: @ 081092AC .4byte gUnk_08692E80 gUnk_081092D4:: @ 081092D4 - .incbin "baserom.gba", 0x1092D4, 0x000002F - .incbin "baserom.gba", 0x109303, 0x000005E - .incbin "baserom.gba", 0x109361, 0x00000A5 - .incbin "baserom.gba", 0x109406, 0x0000028 + .incbin "baserom.gba", 0x1092D4, 0x000015A gUnk_0810942E:: @ 0810942E .incbin "baserom.gba", 0x10942E, 0x00000A0 gUnk_081094CE:: @ 081094CE - .incbin "baserom.gba", 0x1094CE, 0x00000FB - .incbin "baserom.gba", 0x1095C9, 0x000014C - .incbin "baserom.gba", 0x109715, 0x0000063 - .incbin "baserom.gba", 0x109778, 0x0000005 - .incbin "baserom.gba", 0x10977D, 0x0000017 - .incbin "baserom.gba", 0x109794, 0x0000104 - .incbin "baserom.gba", 0x109898, 0x000000F - .incbin "baserom.gba", 0x1098A7, 0x000005F - .incbin "baserom.gba", 0x109906, 0x000012A + .incbin "baserom.gba", 0x1094CE, 0x0000562 gUnk_08109A30:: @ 08109A30 .4byte sub_0805FA04 @@ -483,8 +472,7 @@ gUnk_08109A88:: @ 08109A88 .incbin "baserom.gba", 0x109A88, 0x0000010 gUnk_08109A98:: @ 08109A98 - .incbin "baserom.gba", 0x109A98, 0x0000006 - .incbin "baserom.gba", 0x109A9E, 0x000000A + .incbin "baserom.gba", 0x109A98, 0x0000010 gUnk_08109AA8:: @ 08109AA8 .incbin "baserom.gba", 0x109AA8, 0x0000010 diff --git a/data/data_081146D0.s b/data/data_081146D0.s index ba63230b..6a2d4962 100644 --- a/data/data_081146D0.s +++ b/data/data_081146D0.s @@ -210,11 +210,7 @@ gUnk_08114F98:: @ 08114F98 .incbin "baserom.gba", 0x114F98, 0x00003F4 gUnk_0811538C:: @ 0811538C - .incbin "baserom.gba", 0x11538C, 0x0000153 - .incbin "baserom.gba", 0x1154DF, 0x0000042 - .incbin "baserom.gba", 0x115521, 0x0000002 - .incbin "baserom.gba", 0x115523, 0x0000003 - .incbin "baserom.gba", 0x115526, 0x00001FE + .incbin "baserom.gba", 0x11538C, 0x0000398 gUnk_08115724:: @ 08115724 .incbin "baserom.gba", 0x115724, 0x00003D4 @@ -223,20 +219,16 @@ gUnk_08115AF8:: @ 08115AF8 .incbin "baserom.gba", 0x115AF8, 0x00003A4 gUnk_08115E9C:: @ 08115E9C - .incbin "baserom.gba", 0x115E9C, 0x0000176 - .incbin "baserom.gba", 0x116012, 0x000026E + .incbin "baserom.gba", 0x115E9C, 0x00003E4 gUnk_08116280:: @ 08116280 .incbin "baserom.gba", 0x116280, 0x00002B0 gUnk_08116530:: @ 08116530 - .incbin "baserom.gba", 0x116530, 0x00001D3 - .incbin "baserom.gba", 0x116703, 0x0000085 - .incbin "baserom.gba", 0x116788, 0x0000100 + .incbin "baserom.gba", 0x116530, 0x0000358 gUnk_08116888:: @ 08116888 - .incbin "baserom.gba", 0x116888, 0x0000017 - .incbin "baserom.gba", 0x11689F, 0x00001FD + .incbin "baserom.gba", 0x116888, 0x0000214 gUnk_08116A9C:: @ 08116A9C .incbin "baserom.gba", 0x116A9C, 0x0000270 @@ -245,8 +237,7 @@ gUnk_08116D0C:: @ 08116D0C .incbin "baserom.gba", 0x116D0C, 0x00000C8 gUnk_08116DD4:: @ 08116DD4 - .incbin "baserom.gba", 0x116DD4, 0x0000071 - .incbin "baserom.gba", 0x116E45, 0x000011F + .incbin "baserom.gba", 0x116DD4, 0x0000190 gUnk_08116F64:: @ 08116F64 .incbin "baserom.gba", 0x116F64, 0x00002A4 @@ -276,8 +267,7 @@ gUnk_08117F68:: @ 08117F68 .incbin "baserom.gba", 0x117F68, 0x000006C gUnk_08117FD4:: @ 08117FD4 - .incbin "baserom.gba", 0x117FD4, 0x00001AD - .incbin "baserom.gba", 0x118181, 0x0000033 + .incbin "baserom.gba", 0x117FD4, 0x00001E0 gUnk_081181B4:: @ 081181B4 .incbin "baserom.gba", 0x1181B4, 0x0000030 @@ -451,8 +441,7 @@ gUnk_08119F80:: @ 08119F80 .incbin "baserom.gba", 0x119F80, 0x0000024 gUnk_08119FA4:: @ 08119FA4 - .incbin "baserom.gba", 0x119FA4, 0x0000024 - .incbin "baserom.gba", 0x119FC8, 0x000000C + .incbin "baserom.gba", 0x119FA4, 0x0000030 gUnk_08119FD4:: @ 08119FD4 .incbin "baserom.gba", 0x119FD4, 0x0000048 @@ -536,8 +525,7 @@ gUnk_0811AB18:: @ 0811AB18 .incbin "baserom.gba", 0x11AB18, 0x00000E0 gUnk_0811ABF8:: @ 0811ABF8 - .incbin "baserom.gba", 0x11ABF8, 0x0000019 - .incbin "baserom.gba", 0x11AC11, 0x0000113 + .incbin "baserom.gba", 0x11ABF8, 0x000012C gUnk_0811AD24:: @ 0811AD24 .incbin "baserom.gba", 0x11AD24, 0x00000A8 diff --git a/data/data_08125104.s b/data/data_08125104.s index eef32ed6..4917bf0e 100644 --- a/data/data_08125104.s +++ b/data/data_08125104.s @@ -722,8 +722,7 @@ gUnk_08126798:: @ 08126798 .incbin "baserom.gba", 0x126D38, 0x0000004 .4byte gUnk_08126360 .ifdef EU - .incbin "baserom_eu.gba", 0x126478, 0x0000010 - .incbin "baserom_eu.gba", 0x126488, 0x0000034 + .incbin "baserom_eu.gba", 0x126478, 0x0000044 .else .incbin "baserom.gba", 0x126D40, 0x000000C .4byte gUnk_081263D8 diff --git a/data/data_0812AA88.s b/data/data_0812AA88.s index e067da38..12b59696 100644 --- a/data/data_0812AA88.s +++ b/data/data_0812AA88.s @@ -250,8 +250,7 @@ gUnk_0812AE48:: @ 0812AE48 .incbin "baserom.gba", 0x12AE48, 0x0000014 gUnk_0812AE5C:: @ 0812AE5C - .incbin "baserom.gba", 0x12AE5C, 0x0000002 - .incbin "baserom.gba", 0x12AE5E, 0x000000E + .incbin "baserom.gba", 0x12AE5C, 0x0000010 gUnk_0812AE6C:: @ 0812AE6C .incbin "baserom.gba", 0x12AE6C, 0x0000010 @@ -3221,8 +3220,7 @@ gUnk_0812BA78:: @ 0812BA78 .incbin "baserom.gba", 0x12BA78, 0x0000010 gUnk_0812BA88:: @ 0812BA88 - .incbin "baserom.gba", 0x12BA88, 0x0000003 - .incbin "baserom.gba", 0x12BA8B, 0x0000009 + .incbin "baserom.gba", 0x12BA88, 0x000000C gUnk_0812BA94:: @ 0812BA94 .incbin "baserom.gba", 0x12BA94, 0x000000C @@ -3300,8 +3298,7 @@ gUnk_0812BC18:: @ 0812BC18 .incbin "baserom.gba", 0x12BC18, 0x0000010 gUnk_0812BC28:: @ 0812BC28 - .incbin "baserom.gba", 0x12BC28, 0x000000A - .incbin "baserom.gba", 0x12BC32, 0x0000006 + .incbin "baserom.gba", 0x12BC28, 0x0000010 gUnk_0812BC38:: @ 0812BC38 .incbin "baserom.gba", 0x12BC38, 0x0000010 @@ -3589,8 +3586,7 @@ gUnk_0812C27C:: @ 0812C27C .incbin "baserom.gba", 0x12C27C, 0x0000010 gUnk_0812C28C:: @ 0812C28C - .incbin "baserom.gba", 0x12C28C, 0x000000C - .incbin "baserom.gba", 0x12C298, 0x0000004 + .incbin "baserom.gba", 0x12C28C, 0x0000010 gUnk_0812C29C:: @ 0812C29C .incbin "baserom.gba", 0x12C29C, 0x0000010 @@ -5629,8 +5625,7 @@ gUnk_0812DCEC:: @ 0812DCEC .incbin "baserom.gba", 0x12DCEC, 0x0000014 gUnk_0812DD00:: @ 0812DD00 - .incbin "baserom.gba", 0x12DD00, 0x0000004 - .incbin "baserom.gba", 0x12DD04, 0x0000008 + .incbin "baserom.gba", 0x12DD00, 0x000000C gUnk_0812DD0C:: @ 0812DD0C .incbin "baserom.gba", 0x12DD0C, 0x000000C @@ -6262,8 +6257,7 @@ gUnk_0812E8DC:: @ 0812E8DC .incbin "baserom.gba", 0x12E8DC, 0x0000018 gUnk_0812E8F4:: @ 0812E8F4 - .incbin "baserom.gba", 0x12E8F4, 0x0000009 - .incbin "baserom.gba", 0x12E8FD, 0x0000007 + .incbin "baserom.gba", 0x12E8F4, 0x0000010 gUnk_0812E904:: @ 0812E904 .incbin "baserom.gba", 0x12E904, 0x0000010 @@ -6326,8 +6320,7 @@ gUnk_0812EAB0:: @ 0812EAB0 .incbin "baserom.gba", 0x12EAB0, 0x000001C gUnk_0812EACC:: @ 0812EACC - .incbin "baserom.gba", 0x12EACC, 0x000000C - .incbin "baserom.gba", 0x12EAD8, 0x0000010 + .incbin "baserom.gba", 0x12EACC, 0x000001C gUnk_0812EAE8:: @ 0812EAE8 .incbin "baserom.gba", 0x12EAE8, 0x000001C @@ -6468,8 +6461,7 @@ gUnk_0812EF08:: @ 0812EF08 .incbin "baserom.gba", 0x12EF08, 0x0000014 gUnk_0812EF1C:: @ 0812EF1C - .incbin "baserom.gba", 0x12EF1C, 0x0000003 - .incbin "baserom.gba", 0x12EF1F, 0x0000011 + .incbin "baserom.gba", 0x12EF1C, 0x0000014 gUnk_0812EF30:: @ 0812EF30 .incbin "baserom.gba", 0x12EF30, 0x0000014 @@ -6920,9 +6912,7 @@ gUnk_0812F8E0:: @ 0812F8E0 .incbin "baserom.gba", 0x12F8E0, 0x000000C gUnk_0812F8EC:: @ 0812F8EC - .incbin "baserom.gba", 0x12F8EC, 0x0000008 - .incbin "baserom.gba", 0x12F8F4, 0x0000001 - .incbin "baserom.gba", 0x12F8F5, 0x0000003 + .incbin "baserom.gba", 0x12F8EC, 0x000000C gUnk_0812F8F8:: @ 0812F8F8 .incbin "baserom.gba", 0x12F8F8, 0x000000C @@ -6994,8 +6984,7 @@ gUnk_0812FA00:: @ 0812FA00 .incbin "baserom.gba", 0x12FA00, 0x000000C gUnk_0812FA0C:: @ 0812FA0C - .incbin "baserom.gba", 0x12FA0C, 0x0000001 - .incbin "baserom.gba", 0x12FA0D, 0x000000B + .incbin "baserom.gba", 0x12FA0C, 0x000000C gUnk_0812FA18:: @ 0812FA18 .incbin "baserom.gba", 0x12FA18, 0x000000C @@ -7364,14 +7353,10 @@ gUnk_0812FFE4:: @ 0812FFE4 .incbin "baserom.gba", 0x12FFE4, 0x000000C gUnk_0812FFF0:: @ 0812FFF0 - .incbin "baserom.gba", 0x12FFF0, 0x0000006 - .incbin "baserom.gba", 0x12FFF6, 0x0000006 + .incbin "baserom.gba", 0x12FFF0, 0x000000C gUnk_0812FFFC:: @ 0812FFFC - .incbin "baserom.gba", 0x12FFFC, 0x0000003 - .incbin "baserom.gba", 0x12FFFF, 0x0000001 - .incbin "baserom.gba", 0x130000, 0x0000002 - .incbin "baserom.gba", 0x130002, 0x000000A + .incbin "baserom.gba", 0x12FFFC, 0x0000010 gUnk_0813000C:: @ 0813000C .incbin "baserom.gba", 0x13000C, 0x0000014 @@ -7386,8 +7371,7 @@ gUnk_08130038:: @ 08130038 .incbin "baserom.gba", 0x130038, 0x000000C gUnk_08130044:: @ 08130044 - .incbin "baserom.gba", 0x130044, 0x0000009 - .incbin "baserom.gba", 0x13004D, 0x0000003 + .incbin "baserom.gba", 0x130044, 0x000000C gUnk_08130050:: @ 08130050 .incbin "baserom.gba", 0x130050, 0x0000010 @@ -7402,8 +7386,7 @@ gUnk_08130078:: @ 08130078 .incbin "baserom.gba", 0x130078, 0x000000C gUnk_08130084:: @ 08130084 - .incbin "baserom.gba", 0x130084, 0x0000005 - .incbin "baserom.gba", 0x130089, 0x0000007 + .incbin "baserom.gba", 0x130084, 0x000000C gUnk_08130090:: @ 08130090 .incbin "baserom.gba", 0x130090, 0x000000C @@ -7484,15 +7467,13 @@ gUnk_081301DC:: @ 081301DC .incbin "baserom.gba", 0x1301DC, 0x000000C gUnk_081301E8:: @ 081301E8 - .incbin "baserom.gba", 0x1301E8, 0x0000006 - .incbin "baserom.gba", 0x1301EE, 0x0000006 + .incbin "baserom.gba", 0x1301E8, 0x000000C gUnk_081301F4:: @ 081301F4 .incbin "baserom.gba", 0x1301F4, 0x0000010 gUnk_08130204:: @ 08130204 - .incbin "baserom.gba", 0x130204, 0x0000002 - .incbin "baserom.gba", 0x130206, 0x000000A + .incbin "baserom.gba", 0x130204, 0x000000C gUnk_08130210:: @ 08130210 .incbin "baserom.gba", 0x130210, 0x000000C @@ -7802,8 +7783,7 @@ gUnk_081306D4:: @ 081306D4 .incbin "baserom.gba", 0x1306D4, 0x000000C gUnk_081306E0:: @ 081306E0 - .incbin "baserom.gba", 0x1306E0, 0x0000004 - .incbin "baserom.gba", 0x1306E4, 0x0000008 + .incbin "baserom.gba", 0x1306E0, 0x000000C gUnk_081306EC:: @ 081306EC .incbin "baserom.gba", 0x1306EC, 0x000000C @@ -7869,12 +7849,10 @@ gUnk_081307EC:: @ 081307EC .incbin "baserom.gba", 0x1307EC, 0x000000C gUnk_081307F8:: @ 081307F8 - .incbin "baserom.gba", 0x1307F8, 0x000000A - .incbin "baserom.gba", 0x130802, 0x0000002 + .incbin "baserom.gba", 0x1307F8, 0x000000C gUnk_08130804:: @ 08130804 - .incbin "baserom.gba", 0x130804, 0x0000009 - .incbin "baserom.gba", 0x13080D, 0x0000003 + .incbin "baserom.gba", 0x130804, 0x000000C gUnk_08130810:: @ 08130810 .incbin "baserom.gba", 0x130810, 0x000000C @@ -7934,15 +7912,13 @@ gUnk_081308EC:: @ 081308EC .incbin "baserom.gba", 0x1308EC, 0x000000C gUnk_081308F8:: @ 081308F8 - .incbin "baserom.gba", 0x1308F8, 0x0000007 - .incbin "baserom.gba", 0x1308FF, 0x0000005 + .incbin "baserom.gba", 0x1308F8, 0x000000C gUnk_08130904:: @ 08130904 .incbin "baserom.gba", 0x130904, 0x000000C gUnk_08130910:: @ 08130910 - .incbin "baserom.gba", 0x130910, 0x000000A - .incbin "baserom.gba", 0x13091A, 0x0000002 + .incbin "baserom.gba", 0x130910, 0x000000C gUnk_0813091C:: @ 0813091C .incbin "baserom.gba", 0x13091C, 0x000000C @@ -7993,15 +7969,13 @@ gUnk_081309D8:: @ 081309D8 .incbin "baserom.gba", 0x1309D8, 0x000000C gUnk_081309E4:: @ 081309E4 - .incbin "baserom.gba", 0x1309E4, 0x000000B - .incbin "baserom.gba", 0x1309EF, 0x0000001 + .incbin "baserom.gba", 0x1309E4, 0x000000C gUnk_081309F0:: @ 081309F0 .incbin "baserom.gba", 0x1309F0, 0x0000010 gUnk_08130A00:: @ 08130A00 - .incbin "baserom.gba", 0x130A00, 0x0000001 - .incbin "baserom.gba", 0x130A01, 0x000000B + .incbin "baserom.gba", 0x130A00, 0x000000C gUnk_08130A0C:: @ 08130A0C .incbin "baserom.gba", 0x130A0C, 0x000000C @@ -8115,8 +8089,7 @@ gUnk_08130BE8:: @ 08130BE8 .incbin "baserom.gba", 0x130BE8, 0x000000C gUnk_08130BF4:: @ 08130BF4 - .incbin "baserom.gba", 0x130BF4, 0x000000F - .incbin "baserom.gba", 0x130C03, 0x0000001 + .incbin "baserom.gba", 0x130BF4, 0x0000010 gUnk_08130C04:: @ 08130C04 .incbin "baserom.gba", 0x130C04, 0x0000010 @@ -8182,9 +8155,7 @@ gUnk_08130CF8:: @ 08130CF8 .incbin "baserom.gba", 0x130CF8, 0x000000C gUnk_08130D04:: @ 08130D04 - .incbin "baserom.gba", 0x130D04, 0x0000007 - .incbin "baserom.gba", 0x130D0B, 0x0000004 - .incbin "baserom.gba", 0x130D0F, 0x0000001 + .incbin "baserom.gba", 0x130D04, 0x000000C gUnk_08130D10:: @ 08130D10 .incbin "baserom.gba", 0x130D10, 0x000000C @@ -8421,8 +8392,7 @@ gUnk_081310AC:: @ 081310AC .incbin "baserom.gba", 0x1310AC, 0x0000010 gUnk_081310BC:: @ 081310BC - .incbin "baserom.gba", 0x1310BC, 0x0000007 - .incbin "baserom.gba", 0x1310C3, 0x0000009 + .incbin "baserom.gba", 0x1310BC, 0x0000010 gUnk_081310CC:: @ 081310CC .incbin "baserom.gba", 0x1310CC, 0x000000C @@ -8434,12 +8404,10 @@ gUnk_081310E4:: @ 081310E4 .incbin "baserom.gba", 0x1310E4, 0x000000C gUnk_081310F0:: @ 081310F0 - .incbin "baserom.gba", 0x1310F0, 0x0000005 - .incbin "baserom.gba", 0x1310F5, 0x000000B + .incbin "baserom.gba", 0x1310F0, 0x0000010 gUnk_08131100:: @ 08131100 - .incbin "baserom.gba", 0x131100, 0x000000C - .incbin "baserom.gba", 0x13110C, 0x0000004 + .incbin "baserom.gba", 0x131100, 0x0000010 gUnk_08131110:: @ 08131110 .incbin "baserom.gba", 0x131110, 0x000000C @@ -8502,10 +8470,7 @@ gUnk_08131200:: @ 08131200 .incbin "baserom.gba", 0x131200, 0x000000C gUnk_0813120C:: @ 0813120C - .incbin "baserom.gba", 0x13120C, 0x0000006 - .incbin "baserom.gba", 0x131212, 0x0000002 - .incbin "baserom.gba", 0x131214, 0x0000001 - .incbin "baserom.gba", 0x131215, 0x0000003 + .incbin "baserom.gba", 0x13120C, 0x000000C gUnk_08131218:: @ 08131218 .incbin "baserom.gba", 0x131218, 0x000000C @@ -8571,9 +8536,7 @@ gUnk_08131308:: @ 08131308 .incbin "baserom.gba", 0x131308, 0x000000C gUnk_08131314:: @ 08131314 - .incbin "baserom.gba", 0x131314, 0x0000003 - .incbin "baserom.gba", 0x131317, 0x0000001 - .incbin "baserom.gba", 0x131318, 0x0000008 + .incbin "baserom.gba", 0x131314, 0x000000C gUnk_08131320:: @ 08131320 .incbin "baserom.gba", 0x131320, 0x000000C @@ -8630,20 +8593,16 @@ gUnk_081313F0:: @ 081313F0 .incbin "baserom.gba", 0x1313F0, 0x000000C gUnk_081313FC:: @ 081313FC - .incbin "baserom.gba", 0x1313FC, 0x0000001 - .incbin "baserom.gba", 0x1313FD, 0x000000B + .incbin "baserom.gba", 0x1313FC, 0x000000C gUnk_08131408:: @ 08131408 - .incbin "baserom.gba", 0x131408, 0x0000004 - .incbin "baserom.gba", 0x13140C, 0x0000004 - .incbin "baserom.gba", 0x131410, 0x0000004 + .incbin "baserom.gba", 0x131408, 0x000000C gUnk_08131414:: @ 08131414 .incbin "baserom.gba", 0x131414, 0x000000C gUnk_08131420:: @ 08131420 - .incbin "baserom.gba", 0x131420, 0x000000C - .incbin "baserom.gba", 0x13142C, 0x0000004 + .incbin "baserom.gba", 0x131420, 0x0000010 gUnk_08131430:: @ 08131430 .incbin "baserom.gba", 0x131430, 0x000000C @@ -8751,8 +8710,7 @@ gUnk_081315C8:: @ 081315C8 .incbin "baserom.gba", 0x1315C8, 0x000000C gUnk_081315D4:: @ 081315D4 - .incbin "baserom.gba", 0x1315D4, 0x0000009 - .incbin "baserom.gba", 0x1315DD, 0x0000003 + .incbin "baserom.gba", 0x1315D4, 0x000000C gUnk_081315E0:: @ 081315E0 .incbin "baserom.gba", 0x1315E0, 0x000000C @@ -8767,8 +8725,7 @@ gUnk_08131604:: @ 08131604 .incbin "baserom.gba", 0x131604, 0x000000C gUnk_08131610:: @ 08131610 - .incbin "baserom.gba", 0x131610, 0x000000B - .incbin "baserom.gba", 0x13161B, 0x0000001 + .incbin "baserom.gba", 0x131610, 0x000000C gUnk_0813161C:: @ 0813161C .incbin "baserom.gba", 0x13161C, 0x000000C @@ -8960,16 +8917,10 @@ gUnk_081316A0:: @ 081316A0 .4byte gUnk_0812AC84 gUnk_0813190C:: @ 0813190C - .incbin "baserom.gba", 0x13190C, 0x0000001 - .incbin "baserom.gba", 0x13190D, 0x0000008 - .incbin "baserom.gba", 0x131915, 0x0000002 - .incbin "baserom.gba", 0x131917, 0x0000001 + .incbin "baserom.gba", 0x13190C, 0x000000C gUnk_08131918:: @ 08131918 - .incbin "baserom.gba", 0x131918, 0x0000001 - .incbin "baserom.gba", 0x131919, 0x0000004 - .incbin "baserom.gba", 0x13191D, 0x0000003 - .incbin "baserom.gba", 0x131920, 0x0000008 + .incbin "baserom.gba", 0x131918, 0x0000010 gUnk_08131928:: @ 08131928 .incbin "baserom.gba", 0x131928, 0x0000010 @@ -9026,10 +8977,7 @@ gUnk_08131A08:: @ 08131A08 .incbin "baserom.gba", 0x131A08, 0x0000010 gUnk_08131A18:: @ 08131A18 - .incbin "baserom.gba", 0x131A18, 0x0000005 - .incbin "baserom.gba", 0x131A1D, 0x0000001 - .incbin "baserom.gba", 0x131A1E, 0x0000001 - .incbin "baserom.gba", 0x131A1F, 0x0000009 + .incbin "baserom.gba", 0x131A18, 0x0000010 gUnk_08131A28:: @ 08131A28 .incbin "baserom.gba", 0x131A28, 0x000000C @@ -9071,16 +9019,10 @@ gUnk_08131AEC:: @ 08131AEC .incbin "baserom.gba", 0x131AEC, 0x0000014 gUnk_08131B00:: @ 08131B00 - .incbin "baserom.gba", 0x131B00, 0x000000F - .incbin "baserom.gba", 0x131B0F, 0x0000001 + .incbin "baserom.gba", 0x131B00, 0x0000010 gUnk_08131B10:: @ 08131B10 - .incbin "baserom.gba", 0x131B10, 0x0000008 - .incbin "baserom.gba", 0x131B18, 0x0000001 - .incbin "baserom.gba", 0x131B19, 0x0000003 - .incbin "baserom.gba", 0x131B1C, 0x0000004 - .incbin "baserom.gba", 0x131B20, 0x0000002 - .incbin "baserom.gba", 0x131B22, 0x0000002 + .incbin "baserom.gba", 0x131B10, 0x0000014 gUnk_08131B24:: @ 08131B24 .incbin "baserom.gba", 0x131B24, 0x0000010 @@ -9140,10 +9082,7 @@ gUnk_08131C10:: @ 08131C10 .incbin "baserom.gba", 0x131C10, 0x000000C gUnk_08131C1C:: @ 08131C1C - .incbin "baserom.gba", 0x131C1C, 0x0000002 - .incbin "baserom.gba", 0x131C1E, 0x0000005 - .incbin "baserom.gba", 0x131C23, 0x0000002 - .incbin "baserom.gba", 0x131C25, 0x0000003 + .incbin "baserom.gba", 0x131C1C, 0x000000C gUnk_08131C28:: @ 08131C28 .incbin "baserom.gba", 0x131C28, 0x000000C @@ -9203,17 +9142,10 @@ gUnk_08131D08:: @ 08131D08 .incbin "baserom.gba", 0x131D08, 0x000000C gUnk_08131D14:: @ 08131D14 - .incbin "baserom.gba", 0x131D14, 0x0000005 - .incbin "baserom.gba", 0x131D19, 0x0000006 - .incbin "baserom.gba", 0x131D1F, 0x0000001 + .incbin "baserom.gba", 0x131D14, 0x000000C gUnk_08131D20:: @ 08131D20 - .incbin "baserom.gba", 0x131D20, 0x0000002 - .incbin "baserom.gba", 0x131D22, 0x0000002 - .incbin "baserom.gba", 0x131D24, 0x0000001 - .incbin "baserom.gba", 0x131D25, 0x0000001 - .incbin "baserom.gba", 0x131D26, 0x0000004 - .incbin "baserom.gba", 0x131D2A, 0x0000002 + .incbin "baserom.gba", 0x131D20, 0x000000C gUnk_08131D2C:: @ 08131D2C .incbin "baserom.gba", 0x131D2C, 0x000000C @@ -9264,8 +9196,7 @@ gUnk_08131DE0:: @ 08131DE0 .incbin "baserom.gba", 0x131DE0, 0x000000C gUnk_08131DEC:: @ 08131DEC - .incbin "baserom.gba", 0x131DEC, 0x0000003 - .incbin "baserom.gba", 0x131DEF, 0x0000009 + .incbin "baserom.gba", 0x131DEC, 0x000000C gUnk_08131DF8:: @ 08131DF8 .incbin "baserom.gba", 0x131DF8, 0x000000C @@ -9277,13 +9208,10 @@ gUnk_08131E10:: @ 08131E10 .incbin "baserom.gba", 0x131E10, 0x000000C gUnk_08131E1C:: @ 08131E1C - .incbin "baserom.gba", 0x131E1C, 0x000000B - .incbin "baserom.gba", 0x131E27, 0x0000001 + .incbin "baserom.gba", 0x131E1C, 0x000000C gUnk_08131E28:: @ 08131E28 - .incbin "baserom.gba", 0x131E28, 0x0000001 - .incbin "baserom.gba", 0x131E29, 0x000000A - .incbin "baserom.gba", 0x131E33, 0x0000001 + .incbin "baserom.gba", 0x131E28, 0x000000C gUnk_08131E34:: @ 08131E34 .incbin "baserom.gba", 0x131E34, 0x000000C @@ -9343,17 +9271,13 @@ gUnk_08131F0C:: @ 08131F0C .incbin "baserom.gba", 0x131F0C, 0x000000C gUnk_08131F18:: @ 08131F18 - .incbin "baserom.gba", 0x131F18, 0x000000A - .incbin "baserom.gba", 0x131F22, 0x0000002 + .incbin "baserom.gba", 0x131F18, 0x000000C gUnk_08131F24:: @ 08131F24 - .incbin "baserom.gba", 0x131F24, 0x0000007 - .incbin "baserom.gba", 0x131F2B, 0x0000004 - .incbin "baserom.gba", 0x131F2F, 0x0000001 + .incbin "baserom.gba", 0x131F24, 0x000000C gUnk_08131F30:: @ 08131F30 - .incbin "baserom.gba", 0x131F30, 0x0000002 - .incbin "baserom.gba", 0x131F32, 0x000000A + .incbin "baserom.gba", 0x131F30, 0x000000C gUnk_08131F3C:: @ 08131F3C .incbin "baserom.gba", 0x131F3C, 0x000000C @@ -9404,9 +9328,7 @@ gUnk_08131FF0:: @ 08131FF0 .incbin "baserom.gba", 0x131FF0, 0x000000C gUnk_08131FFC:: @ 08131FFC - .incbin "baserom.gba", 0x131FFC, 0x0000003 - .incbin "baserom.gba", 0x131FFF, 0x0000007 - .incbin "baserom.gba", 0x132006, 0x0000002 + .incbin "baserom.gba", 0x131FFC, 0x000000C gUnk_08132008:: @ 08132008 .incbin "baserom.gba", 0x132008, 0x000000C @@ -9415,14 +9337,10 @@ gUnk_08132014:: @ 08132014 .incbin "baserom.gba", 0x132014, 0x000000C gUnk_08132020:: @ 08132020 - .incbin "baserom.gba", 0x132020, 0x0000009 - .incbin "baserom.gba", 0x132029, 0x0000001 - .incbin "baserom.gba", 0x13202A, 0x0000002 + .incbin "baserom.gba", 0x132020, 0x000000C gUnk_0813202C:: @ 0813202C - .incbin "baserom.gba", 0x13202C, 0x0000001 - .incbin "baserom.gba", 0x13202D, 0x0000002 - .incbin "baserom.gba", 0x13202F, 0x0000009 + .incbin "baserom.gba", 0x13202C, 0x000000C gUnk_08132038:: @ 08132038 .incbin "baserom.gba", 0x132038, 0x000000C diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 7ed85e10..90068626 100755 --- a/data/data_081320FC.s +++ b/data/data_081320FC.s @@ -6,7 +6,7 @@ .ifdef DEMO_JP @ TODO check whether this is the same save as one of the DEMO_USA ones - .incbin "baserom_demo_jp.gba", 0x131830, 0x500 + .incbin "baserom_demo_jp.gba", 0x131830, 0x0000500 .endif @@ -58,8 +58,7 @@ gUnk_0813210C:: @ 0813210C .4byte gUnk_081324AC .incbin "baserom.gba", 0x132204, 0x000000C .4byte gUnk_081324EC - .incbin "baserom.gba", 0x132214, 0x000000B - .incbin "baserom.gba", 0x13221F, 0x0000001 + .incbin "baserom.gba", 0x132214, 0x000000C .4byte gUnk_080FD150 .incbin "baserom.gba", 0x132224, 0x000000C .4byte gUnk_080FD168 @@ -155,8 +154,7 @@ gUnk_081323DC:: @ 081323DC gUnk_0813240C:: @ 0813240C .incbin "baserom.gba", 0x13240C, 0x0000004 .4byte gUnk_080FD150 - .incbin "baserom.gba", 0x132414, 0x0000008 - .incbin "baserom.gba", 0x13241C, 0x0000004 + .incbin "baserom.gba", 0x132414, 0x000000C .4byte gUnk_080FD150 .incbin "baserom.gba", 0x132424, 0x0000008 @@ -201,8 +199,7 @@ gUnk_081324EC:: @ 081324EC .4byte gUnk_080FD3FC .incbin "baserom.gba", 0x1324F4, 0x000000C .4byte gUnk_080FD3FC - .incbin "baserom.gba", 0x132504, 0x0000002 - .incbin "baserom.gba", 0x132506, 0x0000006 + .incbin "baserom.gba", 0x132504, 0x0000008 gUnk_0813250C:: @ 0813250C .incbin "baserom.gba", 0x13250C, 0x0000004 diff --git a/data/data_08132B30.s b/data/data_08132B30.s index 9ac96b8f..eaefea16 100644 --- a/data/data_08132B30.s +++ b/data/data_08132B30.s @@ -207,8 +207,7 @@ gUnk_0813420C:: @ 0813420C .incbin "baserom.gba", 0x13420C, 0x00000DC gUnk_081342E8:: @ 081342E8 - .incbin "baserom.gba", 0x1342E8, 0x000004B - .incbin "baserom.gba", 0x134333, 0x0000005 + .incbin "baserom.gba", 0x1342E8, 0x0000050 gUnk_08134338:: @ 08134338 .4byte gUnk_0813420C @@ -221,8 +220,7 @@ gUnk_08134408:: @ 08134408 .4byte gUnk_08134340 gUnk_0813440C:: @ 0813440C - .incbin "baserom.gba", 0x13440C, 0x0000032 - .incbin "baserom.gba", 0x13443E, 0x000000A + .incbin "baserom.gba", 0x13440C, 0x000003C gUnk_08134448:: @ 08134448 .incbin "baserom.gba", 0x134448, 0x0000014 @@ -291,8 +289,7 @@ gUnk_08134B70:: @ 08134B70 .incbin "baserom.gba", 0x134B70, 0x000003C gUnk_08134BAC:: @ 08134BAC - .incbin "baserom.gba", 0x134BAC, 0x0000038 - .incbin "baserom.gba", 0x134BE4, 0x00000A4 + .incbin "baserom.gba", 0x134BAC, 0x00000DC gUnk_08134C88:: @ 08134C88 .incbin "baserom.gba", 0x134C88, 0x0000140 @@ -444,8 +441,7 @@ gUnk_08135744:: @ 08135744 .4byte gUnk_081356CC gUnk_08135748:: @ 08135748 - .incbin "baserom.gba", 0x135748, 0x000002F - .incbin "baserom.gba", 0x135777, 0x000000D + .incbin "baserom.gba", 0x135748, 0x000003C gUnk_08135784:: @ 08135784 .incbin "baserom.gba", 0x135784, 0x000003C @@ -2247,8 +2243,7 @@ gUnk_0813A180:: @ 0813A180 .incbin "baserom.gba", 0x13A180, 0x0000028 gUnk_0813A1A8:: @ 0813A1A8 - .incbin "baserom.gba", 0x13A1A8, 0x000001F - .incbin "baserom.gba", 0x13A1C7, 0x0000009 + .incbin "baserom.gba", 0x13A1A8, 0x0000028 gUnk_0813A1D0:: @ 0813A1D0 .incbin "baserom.gba", 0x13A1D0, 0x0000028 @@ -2257,8 +2252,7 @@ gUnk_0813A1F8:: @ 0813A1F8 .incbin "baserom.gba", 0x13A1F8, 0x0000028 gUnk_0813A220:: @ 0813A220 - .incbin "baserom.gba", 0x13A220, 0x000001F - .incbin "baserom.gba", 0x13A23F, 0x0000009 + .incbin "baserom.gba", 0x13A220, 0x0000028 gUnk_0813A248:: @ 0813A248 .incbin "baserom.gba", 0x13A248, 0x000003C @@ -2738,1709 +2732,46 @@ gUnk_0813ADEC:: @ 0813ADEC .incbin "baserom.gba", 0x13ADEC, 0x0000028 gUnk_0813AE14:: @ 0813AE14 - .incbin "baserom.gba", 0x13AE14, 0x00005F9 - .incbin "baserom.gba", 0x13B40D, 0x0002406 - .incbin "baserom.gba", 0x13D813, 0x0000643 - .incbin "baserom.gba", 0x13DE56, 0x0000168 - .incbin "baserom.gba", 0x13DFBE, 0x0000025 - .incbin "baserom.gba", 0x13DFE3, 0x000021D - .incbin "baserom.gba", 0x13E200, 0x0000608 - .incbin "baserom.gba", 0x13E808, 0x00000F9 - .incbin "baserom.gba", 0x13E901, 0x0000205 - .incbin "baserom.gba", 0x13EB06, 0x00002E4 - .incbin "baserom.gba", 0x13EDEA, 0x0000208 - .incbin "baserom.gba", 0x13EFF2, 0x000070F - .incbin "baserom.gba", 0x13F701, 0x0000114 - .incbin "baserom.gba", 0x13F815, 0x00006C3 - .incbin "baserom.gba", 0x13FED8, 0x0000128 - .incbin "baserom.gba", 0x140000, 0x0000001 - .incbin "baserom.gba", 0x140001, 0x0000006 - .incbin "baserom.gba", 0x140007, 0x0000001 - .incbin "baserom.gba", 0x140008, 0x000000A - .incbin "baserom.gba", 0x140012, 0x0000007 - .incbin "baserom.gba", 0x140019, 0x0000001 - .incbin "baserom.gba", 0x14001A, 0x0000030 - .incbin "baserom.gba", 0x14004A, 0x0000010 - .incbin "baserom.gba", 0x14005A, 0x0000002 - .incbin "baserom.gba", 0x14005C, 0x0000002 - .incbin "baserom.gba", 0x14005E, 0x000000D - .incbin "baserom.gba", 0x14006B, 0x0000025 - .incbin "baserom.gba", 0x140090, 0x000002E - .incbin "baserom.gba", 0x1400BE, 0x0000024 - .incbin "baserom.gba", 0x1400E2, 0x000005E - .incbin "baserom.gba", 0x140140, 0x0000083 - .incbin "baserom.gba", 0x1401C3, 0x000003D - .incbin "baserom.gba", 0x140200, 0x0000025 - .incbin "baserom.gba", 0x140225, 0x00000AE - .incbin "baserom.gba", 0x1402D3, 0x0000026 - .incbin "baserom.gba", 0x1402F9, 0x0000007 - .incbin "baserom.gba", 0x140300, 0x00000F4 - .incbin "baserom.gba", 0x1403F4, 0x000000D - .incbin "baserom.gba", 0x140401, 0x0000001 - .incbin "baserom.gba", 0x140402, 0x0000062 - .incbin "baserom.gba", 0x140464, 0x00000A1 - .incbin "baserom.gba", 0x140505, 0x000017C - .incbin "baserom.gba", 0x140681, 0x0000170 - .incbin "baserom.gba", 0x1407F1, 0x0000016 - .incbin "baserom.gba", 0x140807, 0x000000C - .incbin "baserom.gba", 0x140813, 0x0000075 - .incbin "baserom.gba", 0x140888, 0x0000075 - .incbin "baserom.gba", 0x1408FD, 0x0000106 - .incbin "baserom.gba", 0x140A03, 0x00000E9 - .incbin "baserom.gba", 0x140AEC, 0x0000010 - .incbin "baserom.gba", 0x140AFC, 0x0000004 - .incbin "baserom.gba", 0x140B00, 0x0000006 - .incbin "baserom.gba", 0x140B06, 0x00000F1 - .incbin "baserom.gba", 0x140BF7, 0x0000011 - .incbin "baserom.gba", 0x140C08, 0x00000F0 - .incbin "baserom.gba", 0x140CF8, 0x0000015 - .incbin "baserom.gba", 0x140D0D, 0x00000E9 - .incbin "baserom.gba", 0x140DF6, 0x000010D - .incbin "baserom.gba", 0x140F03, 0x0000004 - .incbin "baserom.gba", 0x140F07, 0x0000002 - .incbin "baserom.gba", 0x140F09, 0x0000007 - .incbin "baserom.gba", 0x140F10, 0x00000F6 - .incbin "baserom.gba", 0x141006, 0x0000110 - .incbin "baserom.gba", 0x141116, 0x00000E6 - .incbin "baserom.gba", 0x1411FC, 0x0000005 - .incbin "baserom.gba", 0x141201, 0x0000003 - .incbin "baserom.gba", 0x141204, 0x0000101 - .incbin "baserom.gba", 0x141305, 0x0000009 - .incbin "baserom.gba", 0x14130E, 0x000000B - .incbin "baserom.gba", 0x141319, 0x00000E6 - .incbin "baserom.gba", 0x1413FF, 0x0000013 - .incbin "baserom.gba", 0x141412, 0x00000F7 - .incbin "baserom.gba", 0x141509, 0x0000001 - .incbin "baserom.gba", 0x14150A, 0x0000002 - .incbin "baserom.gba", 0x14150C, 0x0000004 - .incbin "baserom.gba", 0x141510, 0x0000002 - .incbin "baserom.gba", 0x141512, 0x0000002 - .incbin "baserom.gba", 0x141514, 0x00000DD - .incbin "baserom.gba", 0x1415F1, 0x000001A - .incbin "baserom.gba", 0x14160B, 0x0000002 - .incbin "baserom.gba", 0x14160D, 0x0000103 - .incbin "baserom.gba", 0x141710, 0x0000005 - .incbin "baserom.gba", 0x141715, 0x0000005 - .incbin "baserom.gba", 0x14171A, 0x0000001 - .incbin "baserom.gba", 0x14171B, 0x000000A - .incbin "baserom.gba", 0x141725, 0x00000E2 - .incbin "baserom.gba", 0x141807, 0x0000017 - .incbin "baserom.gba", 0x14181E, 0x00001F8 - .incbin "baserom.gba", 0x141A16, 0x0000007 - .incbin "baserom.gba", 0x141A1D, 0x00000FB - .incbin "baserom.gba", 0x141B18, 0x0000001 - .incbin "baserom.gba", 0x141B19, 0x0000001 - .incbin "baserom.gba", 0x141B1A, 0x00000FA - .incbin "baserom.gba", 0x141C14, 0x0000004 - .incbin "baserom.gba", 0x141C18, 0x0000007 - .incbin "baserom.gba", 0x141C1F, 0x0000001 - .incbin "baserom.gba", 0x141C20, 0x0000003 - .incbin "baserom.gba", 0x141C23, 0x00000F2 - .incbin "baserom.gba", 0x141D15, 0x0000004 - .incbin "baserom.gba", 0x141D19, 0x0000007 - .incbin "baserom.gba", 0x141D20, 0x0000002 - .incbin "baserom.gba", 0x141D22, 0x0000001 - .incbin "baserom.gba", 0x141D23, 0x0000001 - .incbin "baserom.gba", 0x141D24, 0x00000FC - .incbin "baserom.gba", 0x141E20, 0x0000001 - .incbin "baserom.gba", 0x141E21, 0x0000005 - .incbin "baserom.gba", 0x141E26, 0x00000FB - .incbin "baserom.gba", 0x141F21, 0x0000003 - .incbin "baserom.gba", 0x141F24, 0x0000005 - .incbin "baserom.gba", 0x141F29, 0x00000F4 - .incbin "baserom.gba", 0x14201D, 0x0000007 - .incbin "baserom.gba", 0x142024, 0x0000002 - .incbin "baserom.gba", 0x142026, 0x0000001 - .incbin "baserom.gba", 0x142027, 0x0000106 - .incbin "baserom.gba", 0x14212D, 0x00000C1 - .incbin "baserom.gba", 0x1421EE, 0x000003D - .incbin "baserom.gba", 0x14222B, 0x0000104 - .incbin "baserom.gba", 0x14232F, 0x0000002 - .incbin "baserom.gba", 0x142331, 0x0000001 - .incbin "baserom.gba", 0x142332, 0x00000F9 - .incbin "baserom.gba", 0x14242B, 0x0000005 - .incbin "baserom.gba", 0x142430, 0x00000F2 - .incbin "baserom.gba", 0x142522, 0x000000F - .incbin "baserom.gba", 0x142531, 0x0000102 - .incbin "baserom.gba", 0x142633, 0x00000F3 - .incbin "baserom.gba", 0x142726, 0x000010F - .incbin "baserom.gba", 0x142835, 0x0000208 - .incbin "baserom.gba", 0x142A3D, 0x00000E1 - .incbin "baserom.gba", 0x142B1E, 0x0000015 - .incbin "baserom.gba", 0x142B33, 0x000030C - .incbin "baserom.gba", 0x142E3F, 0x00001D9 - .incbin "baserom.gba", 0x143018, 0x0000030 - .incbin "baserom.gba", 0x143048, 0x00001F3 - .incbin "baserom.gba", 0x14323B, 0x00000F8 - .incbin "baserom.gba", 0x143333, 0x0000006 - .incbin "baserom.gba", 0x143339, 0x00000D7 - .incbin "baserom.gba", 0x143410, 0x000000D - .incbin "baserom.gba", 0x14341D, 0x0000433 - .incbin "baserom.gba", 0x143850, 0x0000514 - .incbin "baserom.gba", 0x143D64, 0x00003D1 - .incbin "baserom.gba", 0x144135, 0x000360C - .incbin "baserom.gba", 0x147741, 0x00064AC - .incbin "baserom.gba", 0x14DBED, 0x000012A - .incbin "baserom.gba", 0x14DD17, 0x00004C0 - .incbin "baserom.gba", 0x14E1D7, 0x0000031 - .incbin "baserom.gba", 0x14E208, 0x0000300 - .incbin "baserom.gba", 0x14E508, 0x00003EF - .incbin "baserom.gba", 0x14E8F7, 0x0000309 - .incbin "baserom.gba", 0x14EC00, 0x00001D7 - .incbin "baserom.gba", 0x14EDD7, 0x000012A - .incbin "baserom.gba", 0x14EF01, 0x0000002 - .incbin "baserom.gba", 0x14EF03, 0x0000018 - .incbin "baserom.gba", 0x14EF1B, 0x00000E6 - .incbin "baserom.gba", 0x14F001, 0x00000DA - .incbin "baserom.gba", 0x14F0DB, 0x0000148 - .incbin "baserom.gba", 0x14F223, 0x00003CC - .incbin "baserom.gba", 0x14F5EF, 0x0000009 - .incbin "baserom.gba", 0x14F5F8, 0x0000208 - .incbin "baserom.gba", 0x14F800, 0x0000018 - .incbin "baserom.gba", 0x14F818, 0x00000C9 - .incbin "baserom.gba", 0x14F8E1, 0x0000010 - .incbin "baserom.gba", 0x14F8F1, 0x0000007 - .incbin "baserom.gba", 0x14F8F8, 0x00001F0 - .incbin "baserom.gba", 0x14FAE8, 0x00000F2 - .incbin "baserom.gba", 0x14FBDA, 0x0000104 - .incbin "baserom.gba", 0x14FCDE, 0x000001A - .incbin "baserom.gba", 0x14FCF8, 0x00000F6 - .incbin "baserom.gba", 0x14FDEE, 0x000000C - .incbin "baserom.gba", 0x14FDFA, 0x0000020 - .incbin "baserom.gba", 0x14FE1A, 0x0000020 - .incbin "baserom.gba", 0x14FE3A, 0x00000B2 - .incbin "baserom.gba", 0x14FEEC, 0x00000E2 - .incbin "baserom.gba", 0x14FFCE, 0x0000032 - .incbin "baserom.gba", 0x150000, 0x0000003 - .incbin "baserom.gba", 0x150003, 0x0000007 - .incbin "baserom.gba", 0x15000A, 0x0000009 - .incbin "baserom.gba", 0x150013, 0x0000007 - .incbin "baserom.gba", 0x15001A, 0x0000010 - .incbin "baserom.gba", 0x15002A, 0x000000A - .incbin "baserom.gba", 0x150034, 0x0000008 - .incbin "baserom.gba", 0x15003C, 0x0000004 - .incbin "baserom.gba", 0x150040, 0x0000016 - .incbin "baserom.gba", 0x150056, 0x000008F - .incbin "baserom.gba", 0x1500E5, 0x0000006 - .incbin "baserom.gba", 0x1500EB, 0x000001F - .incbin "baserom.gba", 0x15010A, 0x0000028 - .incbin "baserom.gba", 0x150132, 0x000000E - .incbin "baserom.gba", 0x150140, 0x00001C0 - .incbin "baserom.gba", 0x150300, 0x000001D - .incbin "baserom.gba", 0x15031D, 0x00000E4 - .incbin "baserom.gba", 0x150401, 0x0000001 - .incbin "baserom.gba", 0x150402, 0x000001B - .incbin "baserom.gba", 0x15041D, 0x0000027 - .incbin "baserom.gba", 0x150444, 0x00001A6 - .incbin "baserom.gba", 0x1505EA, 0x0000017 - .incbin "baserom.gba", 0x150601, 0x00000AD - .incbin "baserom.gba", 0x1506AE, 0x0000125 - .incbin "baserom.gba", 0x1507D3, 0x0000028 - .incbin "baserom.gba", 0x1507FB, 0x0000009 - .incbin "baserom.gba", 0x150804, 0x0000002 - .incbin "baserom.gba", 0x150806, 0x000000E - .incbin "baserom.gba", 0x150814, 0x00000DE - .incbin "baserom.gba", 0x1508F2, 0x000000B - .incbin "baserom.gba", 0x1508FD, 0x000010F - .incbin "baserom.gba", 0x150A0C, 0x00000E6 - .incbin "baserom.gba", 0x150AF2, 0x0000018 - .incbin "baserom.gba", 0x150B0A, 0x0000005 - .incbin "baserom.gba", 0x150B0F, 0x000000C - .incbin "baserom.gba", 0x150B1B, 0x00002E6 - .incbin "baserom.gba", 0x150E01, 0x00000EE - .incbin "baserom.gba", 0x150EEF, 0x000001D - .incbin "baserom.gba", 0x150F0C, 0x00000EB - .incbin "baserom.gba", 0x150FF7, 0x000000D - .incbin "baserom.gba", 0x151004, 0x00000FC - .incbin "baserom.gba", 0x151100, 0x0000007 - .incbin "baserom.gba", 0x151107, 0x00000F2 - .incbin "baserom.gba", 0x1511F9, 0x000000F - .incbin "baserom.gba", 0x151208, 0x0000004 - .incbin "baserom.gba", 0x15120C, 0x00000FB - .incbin "baserom.gba", 0x151307, 0x0000007 - .incbin "baserom.gba", 0x15130E, 0x00000ED - .incbin "baserom.gba", 0x1513FB, 0x000011D - .incbin "baserom.gba", 0x151518, 0x0000054 - .incbin "baserom.gba", 0x15156C, 0x00000A0 - .incbin "baserom.gba", 0x15160C, 0x0000004 - .incbin "baserom.gba", 0x151610, 0x0000007 - .incbin "baserom.gba", 0x151617, 0x00000EC - .incbin "baserom.gba", 0x151703, 0x0000010 - .incbin "baserom.gba", 0x151713, 0x0000003 - .incbin "baserom.gba", 0x151716, 0x000000F - .incbin "baserom.gba", 0x151725, 0x00000ED - .incbin "baserom.gba", 0x151812, 0x0000001 - .incbin "baserom.gba", 0x151813, 0x0000002 - .incbin "baserom.gba", 0x151815, 0x0000010 - .incbin "baserom.gba", 0x151825, 0x00000EA - .incbin "baserom.gba", 0x15190F, 0x0000006 - .incbin "baserom.gba", 0x151915, 0x00000FA - .incbin "baserom.gba", 0x151A0F, 0x000000B - .incbin "baserom.gba", 0x151A1A, 0x00000FB - .incbin "baserom.gba", 0x151B15, 0x0000004 - .incbin "baserom.gba", 0x151B19, 0x0000004 - .incbin "baserom.gba", 0x151B1D, 0x0000002 - .incbin "baserom.gba", 0x151B1F, 0x00000E9 - .incbin "baserom.gba", 0x151C08, 0x0000015 - .incbin "baserom.gba", 0x151C1D, 0x0000004 - .incbin "baserom.gba", 0x151C21, 0x0000004 - .incbin "baserom.gba", 0x151C25, 0x00000F3 - .incbin "baserom.gba", 0x151D18, 0x000000D - .incbin "baserom.gba", 0x151D25, 0x00000FC - .incbin "baserom.gba", 0x151E21, 0x0000005 - .incbin "baserom.gba", 0x151E26, 0x00000FA - .incbin "baserom.gba", 0x151F20, 0x0000003 - .incbin "baserom.gba", 0x151F23, 0x0000002 - .incbin "baserom.gba", 0x151F25, 0x00000FF - .incbin "baserom.gba", 0x152024, 0x0000003 - .incbin "baserom.gba", 0x152027, 0x0000001 - .incbin "baserom.gba", 0x152028, 0x0000007 - .incbin "baserom.gba", 0x15202F, 0x0000027 - .incbin "baserom.gba", 0x152056, 0x00000C3 - .incbin "baserom.gba", 0x152119, 0x0000001 - .incbin "baserom.gba", 0x15211A, 0x0000009 - .incbin "baserom.gba", 0x152123, 0x0000003 - .incbin "baserom.gba", 0x152126, 0x0000009 - .incbin "baserom.gba", 0x15212F, 0x0000001 - .incbin "baserom.gba", 0x152130, 0x00000E1 - .incbin "baserom.gba", 0x152211, 0x0000007 - .incbin "baserom.gba", 0x152218, 0x0000011 - .incbin "baserom.gba", 0x152229, 0x0000008 - .incbin "baserom.gba", 0x152231, 0x00000EF - .incbin "baserom.gba", 0x152320, 0x000000C - .incbin "baserom.gba", 0x15232C, 0x0000005 - .incbin "baserom.gba", 0x152331, 0x00000CD - .incbin "baserom.gba", 0x1523FE, 0x000002B - .incbin "baserom.gba", 0x152429, 0x00000EE - .incbin "baserom.gba", 0x152517, 0x0000126 - .incbin "baserom.gba", 0x15263D, 0x00000F8 - .incbin "baserom.gba", 0x152735, 0x000030B - .incbin "baserom.gba", 0x152A40, 0x00000CC - .incbin "baserom.gba", 0x152B0C, 0x0000027 - .incbin "baserom.gba", 0x152B33, 0x00002E3 - .incbin "baserom.gba", 0x152E16, 0x000012F - .incbin "baserom.gba", 0x152F45, 0x0000A22 - .incbin "baserom.gba", 0x153967, 0x00001EC - .incbin "baserom.gba", 0x153B53, 0x0000BD3 - .incbin "baserom.gba", 0x154726, 0x0001E50 - .incbin "baserom.gba", 0x156576, 0x0000333 - .incbin "baserom.gba", 0x1568A9, 0x00000FE - .incbin "baserom.gba", 0x1569A7, 0x0001BDE - .incbin "baserom.gba", 0x158585, 0x0002B24 - .incbin "baserom.gba", 0x15B0A9, 0x0001251 - .incbin "baserom.gba", 0x15C2FA, 0x0002101 - .incbin "baserom.gba", 0x15E3FB, 0x0000CFD - .incbin "baserom.gba", 0x15F0F8, 0x0000AF5 - .incbin "baserom.gba", 0x15FBED, 0x0000222 - .incbin "baserom.gba", 0x15FE0F, 0x00001F1 - .incbin "baserom.gba", 0x160000, 0x0000009 - .incbin "baserom.gba", 0x160009, 0x00000B8 - .incbin "baserom.gba", 0x1600C1, 0x0000012 - .incbin "baserom.gba", 0x1600D3, 0x000000C - .incbin "baserom.gba", 0x1600DF, 0x0000005 - .incbin "baserom.gba", 0x1600E4, 0x0000224 - .incbin "baserom.gba", 0x160308, 0x000009D - .incbin "baserom.gba", 0x1603A5, 0x000006A - .incbin "baserom.gba", 0x16040F, 0x00004DD - .incbin "baserom.gba", 0x1608EC, 0x0000118 - .incbin "baserom.gba", 0x160A04, 0x0000104 - .incbin "baserom.gba", 0x160B08, 0x00001EB - .incbin "baserom.gba", 0x160CF3, 0x000020E - .incbin "baserom.gba", 0x160F01, 0x0000002 - .incbin "baserom.gba", 0x160F03, 0x0000006 - .incbin "baserom.gba", 0x160F09, 0x0000105 - .incbin "baserom.gba", 0x16100E, 0x00000EF - .incbin "baserom.gba", 0x1610FD, 0x0000007 - .incbin "baserom.gba", 0x161104, 0x00000F8 - .incbin "baserom.gba", 0x1611FC, 0x000002D - .incbin "baserom.gba", 0x161229, 0x000002B - .incbin "baserom.gba", 0x161254, 0x0000097 - .incbin "baserom.gba", 0x1612EB, 0x000000F - .incbin "baserom.gba", 0x1612FA, 0x0000006 - .incbin "baserom.gba", 0x161300, 0x00000E2 - .incbin "baserom.gba", 0x1613E2, 0x0000041 - .incbin "baserom.gba", 0x161423, 0x00002E8 - .incbin "baserom.gba", 0x16170B, 0x00000FD - .incbin "baserom.gba", 0x161808, 0x0000006 - .incbin "baserom.gba", 0x16180E, 0x000000B - .incbin "baserom.gba", 0x161819, 0x00000F2 - .incbin "baserom.gba", 0x16190B, 0x0000007 - .incbin "baserom.gba", 0x161912, 0x0000102 - .incbin "baserom.gba", 0x161A14, 0x0000002 - .incbin "baserom.gba", 0x161A16, 0x000000A - .incbin "baserom.gba", 0x161A20, 0x00000EC - .incbin "baserom.gba", 0x161B0C, 0x0000003 - .incbin "baserom.gba", 0x161B0F, 0x0000009 - .incbin "baserom.gba", 0x161B18, 0x0000005 - .incbin "baserom.gba", 0x161B1D, 0x0000007 - .incbin "baserom.gba", 0x161B24, 0x00000AC - .incbin "baserom.gba", 0x161BD0, 0x000004F - .incbin "baserom.gba", 0x161C1F, 0x00000FB - .incbin "baserom.gba", 0x161D1A, 0x000001B - .incbin "baserom.gba", 0x161D35, 0x00000CB - .incbin "baserom.gba", 0x161E00, 0x0000017 - .incbin "baserom.gba", 0x161E17, 0x00000D9 - .incbin "baserom.gba", 0x161EF0, 0x000001D - .incbin "baserom.gba", 0x161F0D, 0x0000011 - .incbin "baserom.gba", 0x161F1E, 0x0000004 - .incbin "baserom.gba", 0x161F22, 0x0000006 - .incbin "baserom.gba", 0x161F28, 0x00000F5 - .incbin "baserom.gba", 0x16201D, 0x0000008 - .incbin "baserom.gba", 0x162025, 0x0000005 - .incbin "baserom.gba", 0x16202A, 0x0000100 - .incbin "baserom.gba", 0x16212A, 0x00000ED - .incbin "baserom.gba", 0x162217, 0x0000017 - .incbin "baserom.gba", 0x16222E, 0x00000F5 - .incbin "baserom.gba", 0x162323, 0x0000001 - .incbin "baserom.gba", 0x162324, 0x0000005 - .incbin "baserom.gba", 0x162329, 0x0000004 - .incbin "baserom.gba", 0x16232D, 0x0000002 - .incbin "baserom.gba", 0x16232F, 0x0000002 - .incbin "baserom.gba", 0x162331, 0x00001E9 - .incbin "baserom.gba", 0x16251A, 0x0000014 - .incbin "baserom.gba", 0x16252E, 0x0000106 - .incbin "baserom.gba", 0x162634, 0x0000408 - .incbin "baserom.gba", 0x162A3C, 0x00000FD - .incbin "baserom.gba", 0x162B39, 0x0000309 - .incbin "baserom.gba", 0x162E42, 0x0000200 - .incbin "baserom.gba", 0x163042, 0x00000EF - .incbin "baserom.gba", 0x163131, 0x0000013 - .incbin "baserom.gba", 0x163144, 0x00010BD - .incbin "baserom.gba", 0x164201, 0x0001315 - .incbin "baserom.gba", 0x165516, 0x000015F - .incbin "baserom.gba", 0x165675, 0x0000BA8 - .incbin "baserom.gba", 0x16621D, 0x0001014 - .incbin "baserom.gba", 0x167231, 0x0003DFE - .incbin "baserom.gba", 0x16B02F, 0x00037D2 - .incbin "baserom.gba", 0x16E801, 0x0000523 - .incbin "baserom.gba", 0x16ED24, 0x00002A1 - .incbin "baserom.gba", 0x16EFC5, 0x0000232 - .incbin "baserom.gba", 0x16F1F7, 0x00005DD - .incbin "baserom.gba", 0x16F7D4, 0x000001C - .incbin "baserom.gba", 0x16F7F0, 0x0000603 - .incbin "baserom.gba", 0x16FDF3, 0x0000105 - .incbin "baserom.gba", 0x16FEF8, 0x0000108 - .incbin "baserom.gba", 0x170000, 0x000000D - .incbin "baserom.gba", 0x17000D, 0x0000005 - .incbin "baserom.gba", 0x170012, 0x0000087 - .incbin "baserom.gba", 0x170099, 0x0000051 - .incbin "baserom.gba", 0x1700EA, 0x000001D - .incbin "baserom.gba", 0x170107, 0x0000039 - .incbin "baserom.gba", 0x170140, 0x00001BA - .incbin "baserom.gba", 0x1702FA, 0x00000F7 - .incbin "baserom.gba", 0x1703F1, 0x0000010 - .incbin "baserom.gba", 0x170401, 0x000000F - .incbin "baserom.gba", 0x170410, 0x000000D - .incbin "baserom.gba", 0x17041D, 0x0000303 - .incbin "baserom.gba", 0x170720, 0x0000040 - .incbin "baserom.gba", 0x170760, 0x0000045 - .incbin "baserom.gba", 0x1707A5, 0x0000061 - .incbin "baserom.gba", 0x170806, 0x0000108 - .incbin "baserom.gba", 0x17090E, 0x00001F1 - .incbin "baserom.gba", 0x170AFF, 0x0000106 - .incbin "baserom.gba", 0x170C05, 0x00003F0 - .incbin "baserom.gba", 0x170FF5, 0x0000012 - .incbin "baserom.gba", 0x171007, 0x0000045 - .incbin "baserom.gba", 0x17104C, 0x000004E - .incbin "baserom.gba", 0x17109A, 0x0000068 - .incbin "baserom.gba", 0x171102, 0x00000E9 - .incbin "baserom.gba", 0x1711EB, 0x000001B - .incbin "baserom.gba", 0x171206, 0x000001B - .incbin "baserom.gba", 0x171221, 0x00000E4 - .incbin "baserom.gba", 0x171305, 0x0000149 - .incbin "baserom.gba", 0x17144E, 0x00000B3 - .incbin "baserom.gba", 0x171501, 0x000000E - .incbin "baserom.gba", 0x17150F, 0x00000FE - .incbin "baserom.gba", 0x17160D, 0x0000014 - .incbin "baserom.gba", 0x171621, 0x00003F5 - .incbin "baserom.gba", 0x171A16, 0x00000FB - .incbin "baserom.gba", 0x171B11, 0x000010A - .incbin "baserom.gba", 0x171C1B, 0x000015B - .incbin "baserom.gba", 0x171D76, 0x00000AF - .incbin "baserom.gba", 0x171E25, 0x00000DF - .incbin "baserom.gba", 0x171F04, 0x000001A - .incbin "baserom.gba", 0x171F1E, 0x0000014 - .incbin "baserom.gba", 0x171F32, 0x00000E5 - .incbin "baserom.gba", 0x172017, 0x0000009 - .incbin "baserom.gba", 0x172020, 0x0000001 - .incbin "baserom.gba", 0x172021, 0x0000001 - .incbin "baserom.gba", 0x172022, 0x000000B - .incbin "baserom.gba", 0x17202D, 0x0000032 - .incbin "baserom.gba", 0x17205F, 0x00000BB - .incbin "baserom.gba", 0x17211A, 0x000000A - .incbin "baserom.gba", 0x172124, 0x0000001 - .incbin "baserom.gba", 0x172125, 0x0000004 - .incbin "baserom.gba", 0x172129, 0x000000A - .incbin "baserom.gba", 0x172133, 0x00000F2 - .incbin "baserom.gba", 0x172225, 0x0000001 - .incbin "baserom.gba", 0x172226, 0x0000003 - .incbin "baserom.gba", 0x172229, 0x0000001 - .incbin "baserom.gba", 0x17222A, 0x0000017 - .incbin "baserom.gba", 0x172241, 0x00000DF - .incbin "baserom.gba", 0x172320, 0x0000008 - .incbin "baserom.gba", 0x172328, 0x0000206 - .incbin "baserom.gba", 0x17252E, 0x00000FE - .incbin "baserom.gba", 0x17262C, 0x0000009 - .incbin "baserom.gba", 0x172635, 0x00000F1 - .incbin "baserom.gba", 0x172726, 0x0000012 - .incbin "baserom.gba", 0x172738, 0x00000E7 - .incbin "baserom.gba", 0x17281F, 0x0000016 - .incbin "baserom.gba", 0x172835, 0x0000006 - .incbin "baserom.gba", 0x17283B, 0x00000E2 - .incbin "baserom.gba", 0x17291D, 0x000001C - .incbin "baserom.gba", 0x172939, 0x00000EF - .incbin "baserom.gba", 0x172A28, 0x000010F - .incbin "baserom.gba", 0x172B37, 0x0000003 - .incbin "baserom.gba", 0x172B3A, 0x000051B - .incbin "baserom.gba", 0x173055, 0x00003E9 - .incbin "baserom.gba", 0x17343E, 0x0000327 - .incbin "baserom.gba", 0x173765, 0x00002C3 - .incbin "baserom.gba", 0x173A28, 0x0000521 - .incbin "baserom.gba", 0x173F49, 0x0000500 - .incbin "baserom.gba", 0x174449, 0x0000203 - .incbin "baserom.gba", 0x17464C, 0x000071E - .incbin "baserom.gba", 0x174D6A, 0x00005AF - .incbin "baserom.gba", 0x175319, 0x0002DF4 - .incbin "baserom.gba", 0x17810D, 0x000077B - .incbin "baserom.gba", 0x178888, 0x000262F - .incbin "baserom.gba", 0x17AEB7, 0x0003060 - .incbin "baserom.gba", 0x17DF17, 0x0000028 - .incbin "baserom.gba", 0x17DF3F, 0x00007AE - .incbin "baserom.gba", 0x17E6ED, 0x00001C0 - .incbin "baserom.gba", 0x17E8AD, 0x0000B4D - .incbin "baserom.gba", 0x17F3FA, 0x0000804 - .incbin "baserom.gba", 0x17FBFE, 0x00000CA - .incbin "baserom.gba", 0x17FCC8, 0x000024B - .incbin "baserom.gba", 0x17FF13, 0x0000002 - .incbin "baserom.gba", 0x17FF15, 0x00000EB - .incbin "baserom.gba", 0x180000, 0x0000013 - .incbin "baserom.gba", 0x180013, 0x000009D - .incbin "baserom.gba", 0x1800B0, 0x0000040 - .incbin "baserom.gba", 0x1800F0, 0x0000009 - .incbin "baserom.gba", 0x1800F9, 0x0000007 - .incbin "baserom.gba", 0x180100, 0x0000040 - .incbin "baserom.gba", 0x180140, 0x00000C0 - .incbin "baserom.gba", 0x180200, 0x000000F - .incbin "baserom.gba", 0x18020F, 0x0000097 - .incbin "baserom.gba", 0x1802A6, 0x000009A - .incbin "baserom.gba", 0x180340, 0x00002A1 - .incbin "baserom.gba", 0x1805E1, 0x000010F - .incbin "baserom.gba", 0x1806F0, 0x00000E0 - .incbin "baserom.gba", 0x1807D0, 0x0000030 - .incbin "baserom.gba", 0x180800, 0x0000003 - .incbin "baserom.gba", 0x180803, 0x0000005 - .incbin "baserom.gba", 0x180808, 0x00002F8 - .incbin "baserom.gba", 0x180B00, 0x0000010 - .incbin "baserom.gba", 0x180B10, 0x00000DF - .incbin "baserom.gba", 0x180BEF, 0x0000227 - .incbin "baserom.gba", 0x180E16, 0x00001C4 - .incbin "baserom.gba", 0x180FDA, 0x0000017 - .incbin "baserom.gba", 0x180FF1, 0x0000118 - .incbin "baserom.gba", 0x181109, 0x00000FB - .incbin "baserom.gba", 0x181204, 0x0000118 - .incbin "baserom.gba", 0x18131C, 0x00000FE - .incbin "baserom.gba", 0x18141A, 0x00000E1 - .incbin "baserom.gba", 0x1814FB, 0x000010A - .incbin "baserom.gba", 0x181605, 0x0000008 - .incbin "baserom.gba", 0x18160D, 0x00000F7 - .incbin "baserom.gba", 0x181704, 0x0000106 - .incbin "baserom.gba", 0x18180A, 0x0000107 - .incbin "baserom.gba", 0x181911, 0x0000006 - .incbin "baserom.gba", 0x181917, 0x0000001 - .incbin "baserom.gba", 0x181918, 0x0000004 - .incbin "baserom.gba", 0x18191C, 0x00000B1 - .incbin "baserom.gba", 0x1819CD, 0x0000044 - .incbin "baserom.gba", 0x181A11, 0x0000002 - .incbin "baserom.gba", 0x181A13, 0x000000B - .incbin "baserom.gba", 0x181A1E, 0x00001E2 - .incbin "baserom.gba", 0x181C00, 0x0000014 - .incbin "baserom.gba", 0x181C14, 0x0000111 - .incbin "baserom.gba", 0x181D25, 0x00000F7 - .incbin "baserom.gba", 0x181E1C, 0x00000FF - .incbin "baserom.gba", 0x181F1B, 0x00000E5 - .incbin "baserom.gba", 0x182000, 0x0000019 - .incbin "baserom.gba", 0x182019, 0x0000003 - .incbin "baserom.gba", 0x18201C, 0x0000003 - .incbin "baserom.gba", 0x18201F, 0x0000006 - .incbin "baserom.gba", 0x182025, 0x0000001 - .incbin "baserom.gba", 0x182026, 0x00000FE - .incbin "baserom.gba", 0x182124, 0x0000001 - .incbin "baserom.gba", 0x182125, 0x0000008 - .incbin "baserom.gba", 0x18212D, 0x00000F7 - .incbin "baserom.gba", 0x182224, 0x0000001 - .incbin "baserom.gba", 0x182225, 0x0000109 - .incbin "baserom.gba", 0x18232E, 0x00000DF - .incbin "baserom.gba", 0x18240D, 0x000001B - .incbin "baserom.gba", 0x182428, 0x0000002 - .incbin "baserom.gba", 0x18242A, 0x0000104 - .incbin "baserom.gba", 0x18252E, 0x0000001 - .incbin "baserom.gba", 0x18252F, 0x0000004 - .incbin "baserom.gba", 0x182533, 0x0000002 - .incbin "baserom.gba", 0x182535, 0x00000E5 - .incbin "baserom.gba", 0x18261A, 0x0000014 - .incbin "baserom.gba", 0x18262E, 0x000000E - .incbin "baserom.gba", 0x18263C, 0x00000ED - .incbin "baserom.gba", 0x182729, 0x00000D7 - .incbin "baserom.gba", 0x182800, 0x0000230 - .incbin "baserom.gba", 0x182A30, 0x000000B - .incbin "baserom.gba", 0x182A3B, 0x00002F5 - .incbin "baserom.gba", 0x182D30, 0x000000F - .incbin "baserom.gba", 0x182D3F, 0x00000D7 - .incbin "baserom.gba", 0x182E16, 0x000001E - .incbin "baserom.gba", 0x182E34, 0x0000008 - .incbin "baserom.gba", 0x182E3C, 0x0000244 - .incbin "baserom.gba", 0x183080, 0x00000CB - .incbin "baserom.gba", 0x18314B, 0x0000AB5 - .incbin "baserom.gba", 0x183C00, 0x0000060 - .incbin "baserom.gba", 0x183C60, 0x0001AA1 - .incbin "baserom.gba", 0x185701, 0x0002900 - .incbin "baserom.gba", 0x188001, 0x00049FD - .incbin "baserom.gba", 0x18C9FE, 0x0001221 - .incbin "baserom.gba", 0x18DC1F, 0x00001E2 - .incbin "baserom.gba", 0x18DE01, 0x000019B - .incbin "baserom.gba", 0x18DF9C, 0x000115D - .incbin "baserom.gba", 0x18F0F9, 0x0000140 - .incbin "baserom.gba", 0x18F239, 0x00004DA - .incbin "baserom.gba", 0x18F713, 0x00000EB - .incbin "baserom.gba", 0x18F7FE, 0x0000002 - .incbin "baserom.gba", 0x18F800, 0x00000B8 - .incbin "baserom.gba", 0x18F8B8, 0x0000424 - .incbin "baserom.gba", 0x18FCDC, 0x0000324 - .incbin "baserom.gba", 0x190000, 0x0000001 - .incbin "baserom.gba", 0x190001, 0x000000B - .incbin "baserom.gba", 0x19000C, 0x0000109 - .incbin "baserom.gba", 0x190115, 0x00000D7 - .incbin "baserom.gba", 0x1901EC, 0x0000016 - .incbin "baserom.gba", 0x190202, 0x000012D - .incbin "baserom.gba", 0x19032F, 0x00000D1 - .incbin "baserom.gba", 0x190400, 0x0000080 - .incbin "baserom.gba", 0x190480, 0x0000080 - .incbin "baserom.gba", 0x190500, 0x000010D - .incbin "baserom.gba", 0x19060D, 0x0000200 - .incbin "baserom.gba", 0x19080D, 0x0000104 - .incbin "baserom.gba", 0x190911, 0x00000DE - .incbin "baserom.gba", 0x1909EF, 0x00003F7 - .incbin "baserom.gba", 0x190DE6, 0x0000021 - .incbin "baserom.gba", 0x190E07, 0x000000C - .incbin "baserom.gba", 0x190E13, 0x00000CF - .incbin "baserom.gba", 0x190EE2, 0x0000034 - .incbin "baserom.gba", 0x190F16, 0x00000E0 - .incbin "baserom.gba", 0x190FF6, 0x0000062 - .incbin "baserom.gba", 0x191058, 0x00000B6 - .incbin "baserom.gba", 0x19110E, 0x00000F3 - .incbin "baserom.gba", 0x191201, 0x0000105 - .incbin "baserom.gba", 0x191306, 0x000010C - .incbin "baserom.gba", 0x191412, 0x0000006 - .incbin "baserom.gba", 0x191418, 0x00000FE - .incbin "baserom.gba", 0x191516, 0x00001D5 - .incbin "baserom.gba", 0x1916EB, 0x0000030 - .incbin "baserom.gba", 0x19171B, 0x0000001 - .incbin "baserom.gba", 0x19171C, 0x00001F3 - .incbin "baserom.gba", 0x19190F, 0x0000306 - .incbin "baserom.gba", 0x191C15, 0x00000FA - .incbin "baserom.gba", 0x191D0F, 0x000000D - .incbin "baserom.gba", 0x191D1C, 0x0000001 - .incbin "baserom.gba", 0x191D1D, 0x00000FA - .incbin "baserom.gba", 0x191E17, 0x00000F9 - .incbin "baserom.gba", 0x191F10, 0x0000103 - .incbin "baserom.gba", 0x192013, 0x000010D - .incbin "baserom.gba", 0x192120, 0x0000009 - .incbin "baserom.gba", 0x192129, 0x00000F8 - .incbin "baserom.gba", 0x192221, 0x0000008 - .incbin "baserom.gba", 0x192229, 0x000010B - .incbin "baserom.gba", 0x192334, 0x00000AF - .incbin "baserom.gba", 0x1923E3, 0x000003D - .incbin "baserom.gba", 0x192420, 0x0000009 - .incbin "baserom.gba", 0x192429, 0x0000001 - .incbin "baserom.gba", 0x19242A, 0x0000001 - .incbin "baserom.gba", 0x19242B, 0x00000E0 - .incbin "baserom.gba", 0x19250B, 0x0000005 - .incbin "baserom.gba", 0x192510, 0x0000018 - .incbin "baserom.gba", 0x192528, 0x0000012 - .incbin "baserom.gba", 0x19253A, 0x00000E9 - .incbin "baserom.gba", 0x192623, 0x000000B - .incbin "baserom.gba", 0x19262E, 0x0000001 - .incbin "baserom.gba", 0x19262F, 0x0000204 - .incbin "baserom.gba", 0x192833, 0x00000F8 - .incbin "baserom.gba", 0x19292B, 0x000000D - .incbin "baserom.gba", 0x192938, 0x0000106 - .incbin "baserom.gba", 0x192A3E, 0x00000E1 - .incbin "baserom.gba", 0x192B1F, 0x000021C - .incbin "baserom.gba", 0x192D3B, 0x0000008 - .incbin "baserom.gba", 0x192D43, 0x00000FC - .incbin "baserom.gba", 0x192E3F, 0x00000DB - .incbin "baserom.gba", 0x192F1A, 0x0000031 - .incbin "baserom.gba", 0x192F4B, 0x00000E3 - .incbin "baserom.gba", 0x19302E, 0x000000D - .incbin "baserom.gba", 0x19303B, 0x0000114 - .incbin "baserom.gba", 0x19314F, 0x00000F3 - .incbin "baserom.gba", 0x193242, 0x00005E0 - .incbin "baserom.gba", 0x193822, 0x0000125 - .incbin "baserom.gba", 0x193947, 0x0000598 - .incbin "baserom.gba", 0x193EDF, 0x0000153 - .incbin "baserom.gba", 0x194032, 0x0000D0F - .incbin "baserom.gba", 0x194D41, 0x0003720 - .incbin "baserom.gba", 0x198461, 0x00031B2 - .incbin "baserom.gba", 0x19B613, 0x00004ED - .incbin "baserom.gba", 0x19BB00, 0x0001C11 - .incbin "baserom.gba", 0x19D711, 0x00011DA - .incbin "baserom.gba", 0x19E8EB, 0x0000CE4 - .incbin "baserom.gba", 0x19F5CF, 0x0000035 - .incbin "baserom.gba", 0x19F604, 0x00000ED - .incbin "baserom.gba", 0x19F6F1, 0x0000610 - .incbin "baserom.gba", 0x19FD01, 0x0000116 - .incbin "baserom.gba", 0x19FE17, 0x00001E9 - .incbin "baserom.gba", 0x1A0000, 0x0000040 - .incbin "baserom.gba", 0x1A0040, 0x0000061 - .incbin "baserom.gba", 0x1A00A1, 0x000003E - .incbin "baserom.gba", 0x1A00DF, 0x0000021 - .incbin "baserom.gba", 0x1A0100, 0x00001ED - .incbin "baserom.gba", 0x1A02ED, 0x000008B - .incbin "baserom.gba", 0x1A0378, 0x00000A1 - .incbin "baserom.gba", 0x1A0419, 0x0000040 - .incbin "baserom.gba", 0x1A0459, 0x0000096 - .incbin "baserom.gba", 0x1A04EF, 0x000031A - .incbin "baserom.gba", 0x1A0809, 0x0000010 - .incbin "baserom.gba", 0x1A0819, 0x00003EF - .incbin "baserom.gba", 0x1A0C08, 0x000010B - .incbin "baserom.gba", 0x1A0D13, 0x00003D2 - .incbin "baserom.gba", 0x1A10E5, 0x000011D - .incbin "baserom.gba", 0x1A1202, 0x0000002 - .incbin "baserom.gba", 0x1A1204, 0x000000A - .incbin "baserom.gba", 0x1A120E, 0x000020D - .incbin "baserom.gba", 0x1A141B, 0x000003B - .incbin "baserom.gba", 0x1A1456, 0x00001B8 - .incbin "baserom.gba", 0x1A160E, 0x0000208 - .incbin "baserom.gba", 0x1A1816, 0x00000EE - .incbin "baserom.gba", 0x1A1904, 0x00001D4 - .incbin "baserom.gba", 0x1A1AD8, 0x0000041 - .incbin "baserom.gba", 0x1A1B19, 0x00001F5 - .incbin "baserom.gba", 0x1A1D0E, 0x00000F8 - .incbin "baserom.gba", 0x1A1E06, 0x000000F - .incbin "baserom.gba", 0x1A1E15, 0x00000FE - .incbin "baserom.gba", 0x1A1F13, 0x00002F4 - .incbin "baserom.gba", 0x1A2207, 0x000001E - .incbin "baserom.gba", 0x1A2225, 0x00000E8 - .incbin "baserom.gba", 0x1A230D, 0x0000001 - .incbin "baserom.gba", 0x1A230E, 0x0000011 - .incbin "baserom.gba", 0x1A231F, 0x00001FB - .incbin "baserom.gba", 0x1A251A, 0x000000B - .incbin "baserom.gba", 0x1A2525, 0x0000003 - .incbin "baserom.gba", 0x1A2528, 0x000010D - .incbin "baserom.gba", 0x1A2635, 0x00000F7 - .incbin "baserom.gba", 0x1A272C, 0x00000DE - .incbin "baserom.gba", 0x1A280A, 0x000001B - .incbin "baserom.gba", 0x1A2825, 0x00000F8 - .incbin "baserom.gba", 0x1A291D, 0x0000010 - .incbin "baserom.gba", 0x1A292D, 0x0000002 - .incbin "baserom.gba", 0x1A292F, 0x0000002 - .incbin "baserom.gba", 0x1A2931, 0x00000FA - .incbin "baserom.gba", 0x1A2A2B, 0x0000007 - .incbin "baserom.gba", 0x1A2A32, 0x000000A - .incbin "baserom.gba", 0x1A2A3C, 0x00001D8 - .incbin "baserom.gba", 0x1A2C14, 0x000052D - .incbin "baserom.gba", 0x1A3141, 0x0000007 - .incbin "baserom.gba", 0x1A3148, 0x0000002 - .incbin "baserom.gba", 0x1A314A, 0x00005FF - .incbin "baserom.gba", 0x1A3749, 0x00000BA - .incbin "baserom.gba", 0x1A3803, 0x000012A - .incbin "baserom.gba", 0x1A392D, 0x00007D7 - .incbin "baserom.gba", 0x1A4104, 0x0000D46 - .incbin "baserom.gba", 0x1A4E4A, 0x0009FA9 - .incbin "baserom.gba", 0x1AEDF3, 0x00000F5 - .incbin "baserom.gba", 0x1AEEE8, 0x000022B - .incbin "baserom.gba", 0x1AF113, 0x00001F4 - .incbin "baserom.gba", 0x1AF307, 0x00008DE - .incbin "baserom.gba", 0x1AFBE5, 0x0000319 - .incbin "baserom.gba", 0x1AFEFE, 0x00000DF - .incbin "baserom.gba", 0x1AFFDD, 0x000002B - .incbin "baserom.gba", 0x1B0008, 0x00000E2 - .incbin "baserom.gba", 0x1B00EA, 0x0000004 - .incbin "baserom.gba", 0x1B00EE, 0x00000FB - .incbin "baserom.gba", 0x1B01E9, 0x0000270 - .incbin "baserom.gba", 0x1B0459, 0x00000A7 - .incbin "baserom.gba", 0x1B0500, 0x0000103 - .incbin "baserom.gba", 0x1B0603, 0x0000207 - .incbin "baserom.gba", 0x1B080A, 0x00002DE - .incbin "baserom.gba", 0x1B0AE8, 0x0000133 - .incbin "baserom.gba", 0x1B0C1B, 0x00003D3 - .incbin "baserom.gba", 0x1B0FEE, 0x000032A - .incbin "baserom.gba", 0x1B1318, 0x00000B4 - .incbin "baserom.gba", 0x1B13CC, 0x0000022 - .incbin "baserom.gba", 0x1B13EE, 0x000002E - .incbin "baserom.gba", 0x1B141C, 0x00000EC - .incbin "baserom.gba", 0x1B1508, 0x000030D - .incbin "baserom.gba", 0x1B1815, 0x00001F2 - .incbin "baserom.gba", 0x1B1A07, 0x00001F9 - .incbin "baserom.gba", 0x1B1C00, 0x0000005 - .incbin "baserom.gba", 0x1B1C05, 0x000040C - .incbin "baserom.gba", 0x1B2011, 0x0000012 - .incbin "baserom.gba", 0x1B2023, 0x0000112 - .incbin "baserom.gba", 0x1B2135, 0x00000FA - .incbin "baserom.gba", 0x1B222F, 0x00000ED - .incbin "baserom.gba", 0x1B231C, 0x0000103 - .incbin "baserom.gba", 0x1B241F, 0x0000116 - .incbin "baserom.gba", 0x1B2535, 0x00000EC - .incbin "baserom.gba", 0x1B2621, 0x000000E - .incbin "baserom.gba", 0x1B262F, 0x00000F6 - .incbin "baserom.gba", 0x1B2725, 0x0000005 - .incbin "baserom.gba", 0x1B272A, 0x00000F8 - .incbin "baserom.gba", 0x1B2822, 0x0000007 - .incbin "baserom.gba", 0x1B2829, 0x0000108 - .incbin "baserom.gba", 0x1B2931, 0x000000A - .incbin "baserom.gba", 0x1B293B, 0x00000E9 - .incbin "baserom.gba", 0x1B2A24, 0x0000016 - .incbin "baserom.gba", 0x1B2A3A, 0x0000010 - .incbin "baserom.gba", 0x1B2A4A, 0x00006EB - .incbin "baserom.gba", 0x1B3135, 0x0000010 - .incbin "baserom.gba", 0x1B3145, 0x0000207 - .incbin "baserom.gba", 0x1B334C, 0x00004FC - .incbin "baserom.gba", 0x1B3848, 0x0001DC7 - .incbin "baserom.gba", 0x1B560F, 0x0000D6D - .incbin "baserom.gba", 0x1B637C, 0x00048CF - .incbin "baserom.gba", 0x1BAC4B, 0x000078F - .incbin "baserom.gba", 0x1BB3DA, 0x000371E - .incbin "baserom.gba", 0x1BEAF8, 0x0000316 - .incbin "baserom.gba", 0x1BEE0E, 0x0000DB6 - .incbin "baserom.gba", 0x1BFBC4, 0x0000457 - .incbin "baserom.gba", 0x1C001B, 0x0000100 - .incbin "baserom.gba", 0x1C011B, 0x00000E5 - .incbin "baserom.gba", 0x1C0200, 0x000061B - .incbin "baserom.gba", 0x1C081B, 0x00002E5 - .incbin "baserom.gba", 0x1C0B00, 0x00002FA - .incbin "baserom.gba", 0x1C0DFA, 0x0000339 - .incbin "baserom.gba", 0x1C1133, 0x00000CD - .incbin "baserom.gba", 0x1C1200, 0x0000301 - .incbin "baserom.gba", 0x1C1501, 0x000000A - .incbin "baserom.gba", 0x1C150B, 0x00000D3 - .incbin "baserom.gba", 0x1C15DE, 0x000002E - .incbin "baserom.gba", 0x1C160C, 0x0000006 - .incbin "baserom.gba", 0x1C1612, 0x0000026 - .incbin "baserom.gba", 0x1C1638, 0x00000E5 - .incbin "baserom.gba", 0x1C171D, 0x00000E5 - .incbin "baserom.gba", 0x1C1802, 0x00001DB - .incbin "baserom.gba", 0x1C19DD, 0x0000123 - .incbin "baserom.gba", 0x1C1B00, 0x0000221 - .incbin "baserom.gba", 0x1C1D21, 0x0000006 - .incbin "baserom.gba", 0x1C1D27, 0x00000DD - .incbin "baserom.gba", 0x1C1E04, 0x0000001 - .incbin "baserom.gba", 0x1C1E05, 0x0000112 - .incbin "baserom.gba", 0x1C1F17, 0x0000001 - .incbin "baserom.gba", 0x1C1F18, 0x000010B - .incbin "baserom.gba", 0x1C2023, 0x000001B - .incbin "baserom.gba", 0x1C203E, 0x00000E4 - .incbin "baserom.gba", 0x1C2122, 0x0000005 - .incbin "baserom.gba", 0x1C2127, 0x00000E4 - .incbin "baserom.gba", 0x1C220B, 0x0000220 - .incbin "baserom.gba", 0x1C242B, 0x00000EE - .incbin "baserom.gba", 0x1C2519, 0x000000F - .incbin "baserom.gba", 0x1C2528, 0x00001FC - .incbin "baserom.gba", 0x1C2724, 0x000000A - .incbin "baserom.gba", 0x1C272E, 0x00003FE - .incbin "baserom.gba", 0x1C2B2C, 0x0000006 - .incbin "baserom.gba", 0x1C2B32, 0x00000F9 - .incbin "baserom.gba", 0x1C2C2B, 0x0000004 - .incbin "baserom.gba", 0x1C2C2F, 0x0000207 - .incbin "baserom.gba", 0x1C2E36, 0x0000108 - .incbin "baserom.gba", 0x1C2F3E, 0x0000001 - .incbin "baserom.gba", 0x1C2F3F, 0x00000E4 - .incbin "baserom.gba", 0x1C3023, 0x0000122 - .incbin "baserom.gba", 0x1C3145, 0x0000102 - .incbin "baserom.gba", 0x1C3247, 0x00000E5 - .incbin "baserom.gba", 0x1C332C, 0x000010E - .incbin "baserom.gba", 0x1C343A, 0x000010C - .incbin "baserom.gba", 0x1C3546, 0x00004EF - .incbin "baserom.gba", 0x1C3A35, 0x00005BF - .incbin "baserom.gba", 0x1C3FF4, 0x0000162 - .incbin "baserom.gba", 0x1C4156, 0x00002FE - .incbin "baserom.gba", 0x1C4454, 0x0000BB3 - .incbin "baserom.gba", 0x1C5007, 0x0000477 - .incbin "baserom.gba", 0x1C547E, 0x00020ED - .incbin "baserom.gba", 0x1C756B, 0x000149D - .incbin "baserom.gba", 0x1C8A08, 0x000026C + .incbin "baserom.gba", 0x13AE14, 0x008DE60 gUnk_081C8C74:: @ 081C8C74 - .incbin "baserom.gba", 0x1C8C74, 0x000573D - .incbin "baserom.gba", 0x1CE3B1, 0x000003D - .incbin "baserom.gba", 0x1CE3EE, 0x0000DFE - .incbin "baserom.gba", 0x1CF1EC, 0x00002F9 - .incbin "baserom.gba", 0x1CF4E5, 0x0000333 - .incbin "baserom.gba", 0x1CF818, 0x0000008 - .incbin "baserom.gba", 0x1CF820, 0x00007B1 - .incbin "baserom.gba", 0x1CFFD1, 0x000002F - .incbin "baserom.gba", 0x1D0000, 0x0000001 - .incbin "baserom.gba", 0x1D0001, 0x0000006 - .incbin "baserom.gba", 0x1D0007, 0x0000009 - .incbin "baserom.gba", 0x1D0010, 0x000000A - .incbin "baserom.gba", 0x1D001A, 0x000001A - .incbin "baserom.gba", 0x1D0034, 0x00000E0 - .incbin "baserom.gba", 0x1D0114, 0x0000174 - .incbin "baserom.gba", 0x1D0288, 0x0000179 - .incbin "baserom.gba", 0x1D0401, 0x0000042 - .incbin "baserom.gba", 0x1D0443, 0x00001BE - .incbin "baserom.gba", 0x1D0601, 0x0000205 - .incbin "baserom.gba", 0x1D0806, 0x0000303 - .incbin "baserom.gba", 0x1D0B09, 0x00003FF - .incbin "baserom.gba", 0x1D0F08, 0x000001E - .incbin "baserom.gba", 0x1D0F26, 0x00000DE - .incbin "baserom.gba", 0x1D1004, 0x0000003 - .incbin "baserom.gba", 0x1D1007, 0x0000511 - .incbin "baserom.gba", 0x1D1518, 0x00000E2 - .incbin "baserom.gba", 0x1D15FA, 0x0000018 - .incbin "baserom.gba", 0x1D1612, 0x000011F - .incbin "baserom.gba", 0x1D1731, 0x00000CC - .incbin "baserom.gba", 0x1D17FD, 0x0000013 - .incbin "baserom.gba", 0x1D1810, 0x00003F3 - .incbin "baserom.gba", 0x1D1C03, 0x0000001 - .incbin "baserom.gba", 0x1D1C04, 0x0000019 - .incbin "baserom.gba", 0x1D1C1D, 0x00000F7 - .incbin "baserom.gba", 0x1D1D14, 0x000010E - .incbin "baserom.gba", 0x1D1E22, 0x00001DE - .incbin "baserom.gba", 0x1D2000, 0x000000C - .incbin "baserom.gba", 0x1D200C, 0x0000026 - .incbin "baserom.gba", 0x1D2032, 0x00001F1 - .incbin "baserom.gba", 0x1D2223, 0x00000F5 - .incbin "baserom.gba", 0x1D2318, 0x0000113 - .incbin "baserom.gba", 0x1D242B, 0x000000A - .incbin "baserom.gba", 0x1D2435, 0x00001D6 - .incbin "baserom.gba", 0x1D260B, 0x00001E1 - .incbin "baserom.gba", 0x1D27EC, 0x0000043 - .incbin "baserom.gba", 0x1D282F, 0x00000E1 - .incbin "baserom.gba", 0x1D2910, 0x0000315 - .incbin "baserom.gba", 0x1D2C25, 0x0000119 - .incbin "baserom.gba", 0x1D2D3E, 0x0000235 - .incbin "baserom.gba", 0x1D2F73, 0x00000C8 - .incbin "baserom.gba", 0x1D303B, 0x0000009 - .incbin "baserom.gba", 0x1D3044, 0x00000E1 - .incbin "baserom.gba", 0x1D3125, 0x00000F6 - .incbin "baserom.gba", 0x1D321B, 0x000021C - .incbin "baserom.gba", 0x1D3437, 0x00004FC - .incbin "baserom.gba", 0x1D3933, 0x0000331 - .incbin "baserom.gba", 0x1D3C64, 0x00000C8 - .incbin "baserom.gba", 0x1D3D2C, 0x000103D - .incbin "baserom.gba", 0x1D4D69, 0x00012FE - .incbin "baserom.gba", 0x1D6067, 0x000160D + .incbin "baserom.gba", 0x1C8C74, 0x000EA00 gUnk_081D7674:: @ 081D7674 - .incbin "baserom.gba", 0x1D7674, 0x00029C0 - .incbin "baserom.gba", 0x1DA034, 0x0003FBD - .incbin "baserom.gba", 0x1DDFF1, 0x0000FFE - .incbin "baserom.gba", 0x1DEFEF, 0x0000845 + .incbin "baserom.gba", 0x1D7674, 0x00081C0 gUnk_081DF834:: @ 081DF834 - .incbin "baserom.gba", 0x1DF834, 0x00004C6 - .incbin "baserom.gba", 0x1DFCFA, 0x00002CE - .incbin "baserom.gba", 0x1DFFC8, 0x0000008 - .incbin "baserom.gba", 0x1DFFD0, 0x0000030 - .incbin "baserom.gba", 0x1E0000, 0x0000012 - .incbin "baserom.gba", 0x1E0012, 0x0000008 - .incbin "baserom.gba", 0x1E001A, 0x00000D8 - .incbin "baserom.gba", 0x1E00F2, 0x0000015 - .incbin "baserom.gba", 0x1E0107, 0x0000016 - .incbin "baserom.gba", 0x1E011D, 0x00001B9 - .incbin "baserom.gba", 0x1E02D6, 0x000002A - .incbin "baserom.gba", 0x1E0300, 0x0000004 - .incbin "baserom.gba", 0x1E0304, 0x0000109 - .incbin "baserom.gba", 0x1E040D, 0x00000DF - .incbin "baserom.gba", 0x1E04EC, 0x000027A - .incbin "baserom.gba", 0x1E0766, 0x00001A9 - .incbin "baserom.gba", 0x1E090F, 0x00000D3 - .incbin "baserom.gba", 0x1E09E2, 0x000001F - .incbin "baserom.gba", 0x1E0A01, 0x0000120 - .incbin "baserom.gba", 0x1E0B21, 0x00002CA - .incbin "baserom.gba", 0x1E0DEB, 0x00000FA - .incbin "baserom.gba", 0x1E0EE5, 0x0000110 - .incbin "baserom.gba", 0x1E0FF5, 0x0000040 - .incbin "baserom.gba", 0x1E1035, 0x00002CA - .incbin "baserom.gba", 0x1E12FF, 0x0000001 - .incbin "baserom.gba", 0x1E1300, 0x0000601 - .incbin "baserom.gba", 0x1E1901, 0x000000E - .incbin "baserom.gba", 0x1E190F, 0x00000EA - .incbin "baserom.gba", 0x1E19F9, 0x0000415 - .incbin "baserom.gba", 0x1E1E0E, 0x000020B - .incbin "baserom.gba", 0x1E2019, 0x000010D - .incbin "baserom.gba", 0x1E2126, 0x0000203 - .incbin "baserom.gba", 0x1E2329, 0x000011C - .incbin "baserom.gba", 0x1E2445, 0x00000D1 - .incbin "baserom.gba", 0x1E2516, 0x00000E7 - .incbin "baserom.gba", 0x1E25FD, 0x0000120 - .incbin "baserom.gba", 0x1E271D, 0x00001E4 - .incbin "baserom.gba", 0x1E2901, 0x0000024 - .incbin "baserom.gba", 0x1E2925, 0x0000201 - .incbin "baserom.gba", 0x1E2B26, 0x0000222 - .incbin "baserom.gba", 0x1E2D48, 0x00000EB - .incbin "baserom.gba", 0x1E2E33, 0x0000102 - .incbin "baserom.gba", 0x1E2F35, 0x0000404 - .incbin "baserom.gba", 0x1E3339, 0x00000FA - .incbin "baserom.gba", 0x1E3433, 0x000010E - .incbin "baserom.gba", 0x1E3541, 0x000010A - .incbin "baserom.gba", 0x1E364B, 0x00003F1 - .incbin "baserom.gba", 0x1E3A3C, 0x0000B11 - .incbin "baserom.gba", 0x1E454D, 0x00065B3 - .incbin "baserom.gba", 0x1EAB00, 0x0001882 - .incbin "baserom.gba", 0x1EC382, 0x0002445 - .incbin "baserom.gba", 0x1EE7C7, 0x0001335 - .incbin "baserom.gba", 0x1EFAFC, 0x00003CC - .incbin "baserom.gba", 0x1EFEC8, 0x0000138 - .incbin "baserom.gba", 0x1F0000, 0x0000008 - .incbin "baserom.gba", 0x1F0008, 0x0000001 - .incbin "baserom.gba", 0x1F0009, 0x0000021 - .incbin "baserom.gba", 0x1F002A, 0x0000004 - .incbin "baserom.gba", 0x1F002E, 0x0000002 - .incbin "baserom.gba", 0x1F0030, 0x000000F - .incbin "baserom.gba", 0x1F003F, 0x0000003 - .incbin "baserom.gba", 0x1F0042, 0x000004A - .incbin "baserom.gba", 0x1F008C, 0x0000251 - .incbin "baserom.gba", 0x1F02DD, 0x000017C - .incbin "baserom.gba", 0x1F0459, 0x00003A1 - .incbin "baserom.gba", 0x1F07FA, 0x0000824 - .incbin "baserom.gba", 0x1F101E, 0x0000015 - .incbin "baserom.gba", 0x1F1033, 0x0000033 - .incbin "baserom.gba", 0x1F1066, 0x0000102 - .incbin "baserom.gba", 0x1F1168, 0x000017F - .incbin "baserom.gba", 0x1F12E7, 0x00002F9 - .incbin "baserom.gba", 0x1F15E0, 0x000025D - .incbin "baserom.gba", 0x1F183D, 0x00001E0 - .incbin "baserom.gba", 0x1F1A1D, 0x00000EE - .incbin "baserom.gba", 0x1F1B0B, 0x00002F5 - .incbin "baserom.gba", 0x1F1E00, 0x000011D - .incbin "baserom.gba", 0x1F1F1D, 0x0000005 - .incbin "baserom.gba", 0x1F1F22, 0x00000E1 - .incbin "baserom.gba", 0x1F2003, 0x000001F - .incbin "baserom.gba", 0x1F2022, 0x00000A4 - .incbin "baserom.gba", 0x1F20C6, 0x0000062 - .incbin "baserom.gba", 0x1F2128, 0x00000F1 - .incbin "baserom.gba", 0x1F2219, 0x0000103 - .incbin "baserom.gba", 0x1F231C, 0x00001DB - .incbin "baserom.gba", 0x1F24F7, 0x0000116 - .incbin "baserom.gba", 0x1F260D, 0x000021D - .incbin "baserom.gba", 0x1F282A, 0x00000F8 - .incbin "baserom.gba", 0x1F2922, 0x0000127 - .incbin "baserom.gba", 0x1F2A49, 0x00000F1 - .incbin "baserom.gba", 0x1F2B3A, 0x00001F5 - .incbin "baserom.gba", 0x1F2D2F, 0x0000200 - .incbin "baserom.gba", 0x1F2F2F, 0x000050E - .incbin "baserom.gba", 0x1F343D, 0x00000F1 - .incbin "baserom.gba", 0x1F352E, 0x0000204 - .incbin "baserom.gba", 0x1F3732, 0x0000106 - .incbin "baserom.gba", 0x1F3838, 0x0000009 - .incbin "baserom.gba", 0x1F3841, 0x0000BF6 - .incbin "baserom.gba", 0x1F4437, 0x0000023 - .incbin "baserom.gba", 0x1F445A, 0x0000CD8 - .incbin "baserom.gba", 0x1F5132, 0x000049D - .incbin "baserom.gba", 0x1F55CF, 0x0004A36 - .incbin "baserom.gba", 0x1FA005, 0x000107B - .incbin "baserom.gba", 0x1FB080, 0x00028A2 - .incbin "baserom.gba", 0x1FD922, 0x00014F3 - .incbin "baserom.gba", 0x1FEE15, 0x000022A - .incbin "baserom.gba", 0x1FF03F, 0x0000175 + .incbin "baserom.gba", 0x1DF834, 0x001F980 gUnk_081FF1B4:: @ 081FF1B4 - .incbin "baserom.gba", 0x1FF1B4, 0x0000D2D - .incbin "baserom.gba", 0x1FFEE1, 0x000011F - .incbin "baserom.gba", 0x200000, 0x0000001 - .incbin "baserom.gba", 0x200001, 0x0000010 - .incbin "baserom.gba", 0x200011, 0x000000F - .incbin "baserom.gba", 0x200020, 0x000001F - .incbin "baserom.gba", 0x20003F, 0x0000003 - .incbin "baserom.gba", 0x200042, 0x0000072 - .incbin "baserom.gba", 0x2000B4, 0x0000008 - .incbin "baserom.gba", 0x2000BC, 0x000005A - .incbin "baserom.gba", 0x200116, 0x0000009 - .incbin "baserom.gba", 0x20011F, 0x0000012 - .incbin "baserom.gba", 0x200131, 0x0000079 - .incbin "baserom.gba", 0x2001AA, 0x0000130 - .incbin "baserom.gba", 0x2002DA, 0x000015A - .incbin "baserom.gba", 0x200434, 0x00000CC - .incbin "baserom.gba", 0x200500, 0x0000020 - .incbin "baserom.gba", 0x200520, 0x0000033 - .incbin "baserom.gba", 0x200553, 0x00000AD - .incbin "baserom.gba", 0x200600, 0x0000009 - .incbin "baserom.gba", 0x200609, 0x0000027 - .incbin "baserom.gba", 0x200630, 0x00000D0 - .incbin "baserom.gba", 0x200700, 0x0000006 - .incbin "baserom.gba", 0x200706, 0x000001A - .incbin "baserom.gba", 0x200720, 0x0000030 - .incbin "baserom.gba", 0x200750, 0x0000010 - .incbin "baserom.gba", 0x200760, 0x0000020 - .incbin "baserom.gba", 0x200780, 0x0000060 - .incbin "baserom.gba", 0x2007E0, 0x0000020 - .incbin "baserom.gba", 0x200800, 0x0000020 - .incbin "baserom.gba", 0x200820, 0x0000110 - .incbin "baserom.gba", 0x200930, 0x00001D0 - .incbin "baserom.gba", 0x200B00, 0x0000100 - .incbin "baserom.gba", 0x200C00, 0x00002E0 - .incbin "baserom.gba", 0x200EE0, 0x0000020 - .incbin "baserom.gba", 0x200F00, 0x0000040 - .incbin "baserom.gba", 0x200F40, 0x00000E0 - .incbin "baserom.gba", 0x201020, 0x00001EE - .incbin "baserom.gba", 0x20120E, 0x00000ED - .incbin "baserom.gba", 0x2012FB, 0x000000A - .incbin "baserom.gba", 0x201305, 0x00003FB - .incbin "baserom.gba", 0x201700, 0x0000010 - .incbin "baserom.gba", 0x201710, 0x0000309 - .incbin "baserom.gba", 0x201A19, 0x00000E2 - .incbin "baserom.gba", 0x201AFB, 0x00000DD - .incbin "baserom.gba", 0x201BD8, 0x0000338 - .incbin "baserom.gba", 0x201F10, 0x0000026 - .incbin "baserom.gba", 0x201F36, 0x0000110 - .incbin "baserom.gba", 0x202046, 0x000009A - .incbin "baserom.gba", 0x2020E0, 0x0000120 - .incbin "baserom.gba", 0x202200, 0x0000010 - .incbin "baserom.gba", 0x202210, 0x0000001 - .incbin "baserom.gba", 0x202211, 0x000000C - .incbin "baserom.gba", 0x20221D, 0x00000FD - .incbin "baserom.gba", 0x20231A, 0x00000F3 - .incbin "baserom.gba", 0x20240D, 0x00003B3 - .incbin "baserom.gba", 0x2027C0, 0x0000070 - .incbin "baserom.gba", 0x202830, 0x00000E7 - .incbin "baserom.gba", 0x202917, 0x00000FF - .incbin "baserom.gba", 0x202A16, 0x0000009 - .incbin "baserom.gba", 0x202A1F, 0x00001E4 - .incbin "baserom.gba", 0x202C03, 0x0000144 - .incbin "baserom.gba", 0x202D47, 0x00000EE - .incbin "baserom.gba", 0x202E35, 0x00001FF - .incbin "baserom.gba", 0x203034, 0x0000002 - .incbin "baserom.gba", 0x203036, 0x00000FC - .incbin "baserom.gba", 0x203132, 0x000010B - .incbin "baserom.gba", 0x20323D, 0x0000103 - .incbin "baserom.gba", 0x203340, 0x00000C0 - .incbin "baserom.gba", 0x203400, 0x000002E - .incbin "baserom.gba", 0x20342E, 0x0000003 - .incbin "baserom.gba", 0x203431, 0x00000CF - .incbin "baserom.gba", 0x203500, 0x0000044 - .incbin "baserom.gba", 0x203544, 0x00001EB - .incbin "baserom.gba", 0x20372F, 0x000001B - .incbin "baserom.gba", 0x20374A, 0x00000B6 - .incbin "baserom.gba", 0x203800, 0x0000001 - .incbin "baserom.gba", 0x203801, 0x00002FF - .incbin "baserom.gba", 0x203B00, 0x000021D - .incbin "baserom.gba", 0x203D1D, 0x0000036 - .incbin "baserom.gba", 0x203D53, 0x00003AD - .incbin "baserom.gba", 0x204100, 0x0000100 - .incbin "baserom.gba", 0x204200, 0x0000087 - .incbin "baserom.gba", 0x204287, 0x0000079 - .incbin "baserom.gba", 0x204300, 0x0000306 - .incbin "baserom.gba", 0x204606, 0x0000004 - .incbin "baserom.gba", 0x20460A, 0x0000026 - .incbin "baserom.gba", 0x204630, 0x0000020 - .incbin "baserom.gba", 0x204650, 0x00002B0 - .incbin "baserom.gba", 0x204900, 0x0000100 - .incbin "baserom.gba", 0x204A00, 0x0000200 - .incbin "baserom.gba", 0x204C00, 0x0000300 - .incbin "baserom.gba", 0x204F00, 0x0000010 - .incbin "baserom.gba", 0x204F10, 0x00001F0 - .incbin "baserom.gba", 0x205100, 0x0000100 - .incbin "baserom.gba", 0x205200, 0x000006D - .incbin "baserom.gba", 0x20526D, 0x0000393 - .incbin "baserom.gba", 0x205600, 0x0000020 - .incbin "baserom.gba", 0x205620, 0x00003E0 - .incbin "baserom.gba", 0x205A00, 0x00006E9 - .incbin "baserom.gba", 0x2060E9, 0x000071E - .incbin "baserom.gba", 0x206807, 0x00003F9 - .incbin "baserom.gba", 0x206C00, 0x000007F - .incbin "baserom.gba", 0x206C7F, 0x0000282 - .incbin "baserom.gba", 0x206F01, 0x000001F - .incbin "baserom.gba", 0x206F20, 0x0000064 - .incbin "baserom.gba", 0x206F84, 0x0000106 - .incbin "baserom.gba", 0x20708A, 0x000007D - .incbin "baserom.gba", 0x207107, 0x000020D - .incbin "baserom.gba", 0x207314, 0x0000025 - .incbin "baserom.gba", 0x207339, 0x00004BC - .incbin "baserom.gba", 0x2077F5, 0x000020C - .incbin "baserom.gba", 0x207A01, 0x0000169 - .incbin "baserom.gba", 0x207B6A, 0x00003E2 - .incbin "baserom.gba", 0x207F4C, 0x000011E - .incbin "baserom.gba", 0x20806A, 0x0000596 - .incbin "baserom.gba", 0x208600, 0x000010E - .incbin "baserom.gba", 0x20870E, 0x0000019 - .incbin "baserom.gba", 0x208727, 0x000041C - .incbin "baserom.gba", 0x208B43, 0x0000072 - .incbin "baserom.gba", 0x208BB5, 0x0000052 - .incbin "baserom.gba", 0x208C07, 0x000027A - .incbin "baserom.gba", 0x208E81, 0x0000089 - .incbin "baserom.gba", 0x208F0A, 0x000007A - .incbin "baserom.gba", 0x208F84, 0x0000170 - .incbin "baserom.gba", 0x2090F4, 0x000020C - .incbin "baserom.gba", 0x209300, 0x00000AE - .incbin "baserom.gba", 0x2093AE, 0x00001E7 - .incbin "baserom.gba", 0x209595, 0x00000AD - .incbin "baserom.gba", 0x209642, 0x0000247 - .incbin "baserom.gba", 0x209889, 0x000002A - .incbin "baserom.gba", 0x2098B3, 0x00000D5 - .incbin "baserom.gba", 0x209988, 0x0000280 - .incbin "baserom.gba", 0x209C08, 0x0000300 - .incbin "baserom.gba", 0x209F08, 0x00006E1 - .incbin "baserom.gba", 0x20A5E9, 0x000016E - .incbin "baserom.gba", 0x20A757, 0x0000050 - .incbin "baserom.gba", 0x20A7A7, 0x0000025 - .incbin "baserom.gba", 0x20A7CC, 0x0000009 - .incbin "baserom.gba", 0x20A7D5, 0x0000033 - .incbin "baserom.gba", 0x20A808, 0x0000148 - .incbin "baserom.gba", 0x20A950, 0x0000238 - .incbin "baserom.gba", 0x20AB88, 0x0000581 - .incbin "baserom.gba", 0x20B109, 0x0000081 - .incbin "baserom.gba", 0x20B18A, 0x0000226 - .incbin "baserom.gba", 0x20B3B0, 0x0000079 - .incbin "baserom.gba", 0x20B429, 0x000012B - .incbin "baserom.gba", 0x20B554, 0x00000C3 - .incbin "baserom.gba", 0x20B617, 0x00000DE - .incbin "baserom.gba", 0x20B6F5, 0x000020D - .incbin "baserom.gba", 0x20B902, 0x0000005 - .incbin "baserom.gba", 0x20B907, 0x0000103 - .incbin "baserom.gba", 0x20BA0A, 0x00001DC - .incbin "baserom.gba", 0x20BBE6, 0x00002C9 - .incbin "baserom.gba", 0x20BEAF, 0x000007D - .incbin "baserom.gba", 0x20BF2C, 0x000008D - .incbin "baserom.gba", 0x20BFB9, 0x0000039 - .incbin "baserom.gba", 0x20BFF2, 0x0000069 - .incbin "baserom.gba", 0x20C05B, 0x00000C5 - .incbin "baserom.gba", 0x20C120, 0x000029C - .incbin "baserom.gba", 0x20C3BC, 0x0000358 - .incbin "baserom.gba", 0x20C714, 0x0000030 - .incbin "baserom.gba", 0x20C744, 0x0000081 - .incbin "baserom.gba", 0x20C7C5, 0x000008B - .incbin "baserom.gba", 0x20C850, 0x00000B0 - .incbin "baserom.gba", 0x20C900, 0x000053E - .incbin "baserom.gba", 0x20CE3E, 0x00000D9 - .incbin "baserom.gba", 0x20CF17, 0x00002ED - .incbin "baserom.gba", 0x20D204, 0x00002D6 - .incbin "baserom.gba", 0x20D4DA, 0x000012A - .incbin "baserom.gba", 0x20D604, 0x00003D9 - .incbin "baserom.gba", 0x20D9DD, 0x00000EA - .incbin "baserom.gba", 0x20DAC7, 0x0000123 - .incbin "baserom.gba", 0x20DBEA, 0x00000EA - .incbin "baserom.gba", 0x20DCD4, 0x00000CD - .incbin "baserom.gba", 0x20DDA1, 0x0000067 - .incbin "baserom.gba", 0x20DE08, 0x0000193 - .incbin "baserom.gba", 0x20DF9B, 0x000016C - .incbin "baserom.gba", 0x20E107, 0x000001C - .incbin "baserom.gba", 0x20E123, 0x0000080 - .incbin "baserom.gba", 0x20E1A3, 0x0000341 - .incbin "baserom.gba", 0x20E4E4, 0x0000004 - .incbin "baserom.gba", 0x20E4E8, 0x0000015 - .incbin "baserom.gba", 0x20E4FD, 0x000000E - .incbin "baserom.gba", 0x20E50B, 0x0000002 - .incbin "baserom.gba", 0x20E50D, 0x000008A - .incbin "baserom.gba", 0x20E597, 0x0000250 - .incbin "baserom.gba", 0x20E7E7, 0x0000102 - .incbin "baserom.gba", 0x20E8E9, 0x000021A - .incbin "baserom.gba", 0x20EB03, 0x000000C - .incbin "baserom.gba", 0x20EB0F, 0x0000075 - .incbin "baserom.gba", 0x20EB84, 0x000009F - .incbin "baserom.gba", 0x20EC23, 0x0000120 - .incbin "baserom.gba", 0x20ED43, 0x0000021 - .incbin "baserom.gba", 0x20ED64, 0x0000127 - .incbin "baserom.gba", 0x20EE8B, 0x0000175 - .incbin "baserom.gba", 0x20F000, 0x00000E0 - .incbin "baserom.gba", 0x20F0E0, 0x0000A4F - .incbin "baserom.gba", 0x20FB2F, 0x0000045 - .incbin "baserom.gba", 0x20FB74, 0x0000388 - .incbin "baserom.gba", 0x20FEFC, 0x0000056 - .incbin "baserom.gba", 0x20FF52, 0x000003B - .incbin "baserom.gba", 0x20FF8D, 0x0000019 - .incbin "baserom.gba", 0x20FFA6, 0x000005A - .incbin "baserom.gba", 0x210000, 0x0000024 - .incbin "baserom.gba", 0x210024, 0x0000063 - .incbin "baserom.gba", 0x210087, 0x0000052 - .incbin "baserom.gba", 0x2100D9, 0x0000127 - .incbin "baserom.gba", 0x210200, 0x0000120 - .incbin "baserom.gba", 0x210320, 0x00001BC - .incbin "baserom.gba", 0x2104DC, 0x0000325 - .incbin "baserom.gba", 0x210801, 0x00001E0 - .incbin "baserom.gba", 0x2109E1, 0x000030A - .incbin "baserom.gba", 0x210CEB, 0x0000222 - .incbin "baserom.gba", 0x210F0D, 0x00000D3 - .incbin "baserom.gba", 0x210FE0, 0x0000142 - .incbin "baserom.gba", 0x211122, 0x0000133 - .incbin "baserom.gba", 0x211255, 0x000000D - .incbin "baserom.gba", 0x211262, 0x0000093 - .incbin "baserom.gba", 0x2112F5, 0x0000838 - .incbin "baserom.gba", 0x211B2D, 0x00001CD - .incbin "baserom.gba", 0x211CFA, 0x000010C - .incbin "baserom.gba", 0x211E06, 0x000029B - .incbin "baserom.gba", 0x2120A1, 0x0000259 - .incbin "baserom.gba", 0x2122FA, 0x0000010 - .incbin "baserom.gba", 0x21230A, 0x0000723 - .incbin "baserom.gba", 0x212A2D, 0x00003F9 - .incbin "baserom.gba", 0x212E26, 0x00000F2 - .incbin "baserom.gba", 0x212F18, 0x0000116 - .incbin "baserom.gba", 0x21302E, 0x000000B - .incbin "baserom.gba", 0x213039, 0x00000F3 - .incbin "baserom.gba", 0x21312C, 0x00001F6 - .incbin "baserom.gba", 0x213322, 0x000001A - .incbin "baserom.gba", 0x21333C, 0x0000407 - .incbin "baserom.gba", 0x213743, 0x0000312 - .incbin "baserom.gba", 0x213A55, 0x00001EF - .incbin "baserom.gba", 0x213C44, 0x0000010 - .incbin "baserom.gba", 0x213C54, 0x00003AB - .incbin "baserom.gba", 0x213FFF, 0x0000108 - .incbin "baserom.gba", 0x214107, 0x0000150 - .incbin "baserom.gba", 0x214257, 0x0000001 - .incbin "baserom.gba", 0x214258, 0x000035F - .incbin "baserom.gba", 0x2145B7, 0x00005C7 - .incbin "baserom.gba", 0x214B7E, 0x0000C81 - .incbin "baserom.gba", 0x2157FF, 0x0002CB5 + .incbin "baserom.gba", 0x1FF1B4, 0x0019300 @ 0x2184B4 - 0x21DCB3 .incbin "graphics/npc/postman.4bpp" @ 0x21DCB4 - 0x21E913 .incbin "graphics/npc/malon.4bpp" - .incbin "baserom.gba", 0x21E8F4, 0x000070B - .incbin "baserom.gba", 0x21EFFF, 0x00000F1 - .incbin "baserom.gba", 0x21F0F0, 0x0000F11 - .incbin "baserom.gba", 0x220001, 0x0000100 - .incbin "baserom.gba", 0x220101, 0x0000002 - .incbin "baserom.gba", 0x220103, 0x00001D2 - .incbin "baserom.gba", 0x2202D5, 0x000002B - .incbin "baserom.gba", 0x220300, 0x00002F7 - .incbin "baserom.gba", 0x2205F7, 0x000073D - .incbin "baserom.gba", 0x220D34, 0x00001BE - .incbin "baserom.gba", 0x220EF2, 0x0000227 - .incbin "baserom.gba", 0x221119, 0x00004E2 + .incbin "baserom.gba", 0x21E8F4, 0x0002D07 .ifdef EU @ TODO only small differences .incbin "baserom_eu.gba", 0x220CE7, 0x00003F6 .else .incbin "baserom.gba", 0x2215FB, 0x00003F6 .endif - .incbin "baserom.gba", 0x2219F1, 0x0000027 - .incbin "baserom.gba", 0x221A18, 0x00001D6 - .incbin "baserom.gba", 0x221BEE, 0x0000212 - .incbin "baserom.gba", 0x221E00, 0x00004EE - .incbin "baserom.gba", 0x2222EE, 0x0000056 - .incbin "baserom.gba", 0x222344, 0x00000EF - .incbin "baserom.gba", 0x222433, 0x0000055 - .incbin "baserom.gba", 0x222488, 0x00001A5 - .incbin "baserom.gba", 0x22262D, 0x00004DA - .incbin "baserom.gba", 0x222B07, 0x0000428 - .incbin "baserom.gba", 0x222F2F, 0x00000D8 - .incbin "baserom.gba", 0x223007, 0x000022B - .incbin "baserom.gba", 0x223232, 0x0000001 - .incbin "baserom.gba", 0x223233, 0x0000210 - .incbin "baserom.gba", 0x223443, 0x0000002 - .incbin "baserom.gba", 0x223445, 0x000000E - .incbin "baserom.gba", 0x223453, 0x00000D6 - .incbin "baserom.gba", 0x223529, 0x0000014 - .incbin "baserom.gba", 0x22353D, 0x0000207 - .incbin "baserom.gba", 0x223744, 0x0000E13 - .incbin "baserom.gba", 0x224557, 0x00006F4 - .incbin "baserom.gba", 0x224C4B, 0x00002EA - .incbin "baserom.gba", 0x224F35, 0x0000ED5 - .incbin "baserom.gba", 0x225E0A, 0x00021ED - .incbin "baserom.gba", 0x227FF7, 0x0001014 - .incbin "baserom.gba", 0x22900B, 0x000019F - .incbin "baserom.gba", 0x2291AA, 0x0000B79 - .incbin "baserom.gba", 0x229D23, 0x00007CB - .incbin "baserom.gba", 0x22A4EE, 0x0000F19 - .incbin "baserom.gba", 0x22B407, 0x0002414 - .incbin "baserom.gba", 0x22D81B, 0x00013D5 - .incbin "baserom.gba", 0x22EBF0, 0x0000413 - .incbin "baserom.gba", 0x22F003, 0x0000401 - .incbin "baserom.gba", 0x22F404, 0x00004CE - .incbin "baserom.gba", 0x22F8D2, 0x0000010 - .incbin "baserom.gba", 0x22F8E2, 0x00001D8 - .incbin "baserom.gba", 0x22FABA, 0x0000846 - .incbin "baserom.gba", 0x230300, 0x00005A6 - .incbin "baserom.gba", 0x2308A6, 0x0000038 - .incbin "baserom.gba", 0x2308DE, 0x0000347 - .incbin "baserom.gba", 0x230C25, 0x00000B9 - .incbin "baserom.gba", 0x230CDE, 0x000060C - .incbin "baserom.gba", 0x2312EA, 0x0000424 - .incbin "baserom.gba", 0x23170E, 0x000052F - .incbin "baserom.gba", 0x231C3D, 0x00000D5 - .incbin "baserom.gba", 0x231D12, 0x000000C - .incbin "baserom.gba", 0x231D1E, 0x00000F5 - .incbin "baserom.gba", 0x231E13, 0x0000104 - .incbin "baserom.gba", 0x231F17, 0x00001C1 - .incbin "baserom.gba", 0x2320D8, 0x000015D - .incbin "baserom.gba", 0x232235, 0x0000075 - .incbin "baserom.gba", 0x2322AA, 0x000015C - .incbin "baserom.gba", 0x232406, 0x000003F - .incbin "baserom.gba", 0x232445, 0x00001CB - .incbin "baserom.gba", 0x232610, 0x000020C - .incbin "baserom.gba", 0x23281C, 0x00000F5 - .incbin "baserom.gba", 0x232911, 0x000011C - .incbin "baserom.gba", 0x232A2D, 0x00000E1 - .incbin "baserom.gba", 0x232B0E, 0x000000F - .incbin "baserom.gba", 0x232B1D, 0x0000006 - .incbin "baserom.gba", 0x232B23, 0x00001C8 - .incbin "baserom.gba", 0x232CEB, 0x000002D - .incbin "baserom.gba", 0x232D18, 0x0000015 - .incbin "baserom.gba", 0x232D2D, 0x0000007 - .incbin "baserom.gba", 0x232D34, 0x000015D - .incbin "baserom.gba", 0x232E91, 0x000007C - .incbin "baserom.gba", 0x232F0D, 0x000000A - .incbin "baserom.gba", 0x232F17, 0x000001F - .incbin "baserom.gba", 0x232F36, 0x00000F3 - .incbin "baserom.gba", 0x233029, 0x0000006 - .incbin "baserom.gba", 0x23302F, 0x0000008 - .incbin "baserom.gba", 0x233037, 0x00001F4 - .incbin "baserom.gba", 0x23322B, 0x00000EB - .incbin "baserom.gba", 0x233316, 0x000001D - .incbin "baserom.gba", 0x233333, 0x0000002 - .incbin "baserom.gba", 0x233335, 0x0000064 - .incbin "baserom.gba", 0x233399, 0x000008A - .incbin "baserom.gba", 0x233423, 0x000000E - .incbin "baserom.gba", 0x233431, 0x0000003 - .incbin "baserom.gba", 0x233434, 0x000020D - .incbin "baserom.gba", 0x233641, 0x0000021 - .incbin "baserom.gba", 0x233662, 0x00000D6 - .incbin "baserom.gba", 0x233738, 0x0000103 - .incbin "baserom.gba", 0x23383B, 0x0000217 - .incbin "baserom.gba", 0x233A52, 0x0000009 - .incbin "baserom.gba", 0x233A5B, 0x000012E - .incbin "baserom.gba", 0x233B89, 0x00000BD - .incbin "baserom.gba", 0x233C46, 0x000030F - .incbin "baserom.gba", 0x233F55, 0x00002CC - .incbin "baserom.gba", 0x234221, 0x000021A - .incbin "baserom.gba", 0x23443B, 0x0000207 - .incbin "baserom.gba", 0x234642, 0x0000BA7 - .incbin "baserom.gba", 0x2351E9, 0x0000265 - .incbin "baserom.gba", 0x23544E, 0x00005FF - .incbin "baserom.gba", 0x235A4D, 0x00009EE - .incbin "baserom.gba", 0x23643B, 0x0002AC8 - .incbin "baserom.gba", 0x238F03, 0x0001BA6 - .incbin "baserom.gba", 0x23AAA9, 0x0001C6C - .incbin "baserom.gba", 0x23C715, 0x00013EF - .incbin "baserom.gba", 0x23DB04, 0x0000FFC - .incbin "baserom.gba", 0x23EB00, 0x0001109 - .incbin "baserom.gba", 0x23FC09, 0x00003F7 - .incbin "baserom.gba", 0x240000, 0x000000F - .incbin "baserom.gba", 0x24000F, 0x00000FA - .incbin "baserom.gba", 0x240109, 0x000001A - .incbin "baserom.gba", 0x240123, 0x00001DD - .incbin "baserom.gba", 0x240300, 0x0000CE5 - .incbin "baserom.gba", 0x240FE5, 0x000041A - .incbin "baserom.gba", 0x2413FF, 0x0000915 - .incbin "baserom.gba", 0x241D14, 0x00002FF - .incbin "baserom.gba", 0x242013, 0x00000E5 - .incbin "baserom.gba", 0x2420F8, 0x000000C - .incbin "baserom.gba", 0x242104, 0x000012E - .incbin "baserom.gba", 0x242232, 0x00000A5 - .incbin "baserom.gba", 0x2422D7, 0x000063F - .incbin "baserom.gba", 0x242916, 0x0000122 - .incbin "baserom.gba", 0x242A38, 0x00003E8 - .incbin "baserom.gba", 0x242E20, 0x0000106 - .incbin "baserom.gba", 0x242F26, 0x00001EB - .incbin "baserom.gba", 0x243111, 0x0000121 - .incbin "baserom.gba", 0x243232, 0x00006FB - .incbin "baserom.gba", 0x24392D, 0x0000016 - .incbin "baserom.gba", 0x243943, 0x0000002 - .incbin "baserom.gba", 0x243945, 0x0000202 - .incbin "baserom.gba", 0x243B47, 0x0000002 - .incbin "baserom.gba", 0x243B49, 0x000008D - .incbin "baserom.gba", 0x243BD6, 0x0000267 - .incbin "baserom.gba", 0x243E3D, 0x000000F - .incbin "baserom.gba", 0x243E4C, 0x00000FC - .incbin "baserom.gba", 0x243F48, 0x000032C - .incbin "baserom.gba", 0x244274, 0x00000E1 - .incbin "baserom.gba", 0x244355, 0x0000608 - .incbin "baserom.gba", 0x24495D, 0x0000BD8 - .incbin "baserom.gba", 0x245535, 0x00005CB - .incbin "baserom.gba", 0x245B00, 0x00019D4 + .incbin "baserom.gba", 0x2219F1, 0x0025AE3 gUnk_082474D4:: @ 082474D4 - .incbin "baserom.gba", 0x2474D4, 0x0004C0C - .incbin "baserom.gba", 0x24C0E0, 0x00007C0 - .incbin "baserom.gba", 0x24C8A0, 0x0001973 - .incbin "baserom.gba", 0x24E213, 0x0000111 - .incbin "baserom.gba", 0x24E324, 0x00001BF - .incbin "baserom.gba", 0x24E4E3, 0x000031D - .incbin "baserom.gba", 0x24E800, 0x00001B7 - .incbin "baserom.gba", 0x24E9B7, 0x0001659 - .incbin "baserom.gba", 0x250010, 0x0000030 - .incbin "baserom.gba", 0x250040, 0x00000C7 - .incbin "baserom.gba", 0x250107, 0x00002EF - .incbin "baserom.gba", 0x2503F6, 0x000002E - .incbin "baserom.gba", 0x250424, 0x0000C74 - .incbin "baserom.gba", 0x251098, 0x0000071 - .incbin "baserom.gba", 0x251109, 0x00002B3 - .incbin "baserom.gba", 0x2513BC, 0x0000B50 - .incbin "baserom.gba", 0x251F0C, 0x00001F9 - .incbin "baserom.gba", 0x252105, 0x0000039 - .incbin "baserom.gba", 0x25213E, 0x00006DA - .incbin "baserom.gba", 0x252818, 0x00008C2 - .incbin "baserom.gba", 0x2530DA, 0x0000259 - .incbin "baserom.gba", 0x253333, 0x0000610 - .incbin "baserom.gba", 0x253943, 0x00001FE - .incbin "baserom.gba", 0x253B41, 0x0000109 - .incbin "baserom.gba", 0x253C4A, 0x0000309 - .incbin "baserom.gba", 0x253F53, 0x0000503 - .incbin "baserom.gba", 0x254456, 0x00010E5 - .incbin "baserom.gba", 0x25553B, 0x0000018 - .incbin "baserom.gba", 0x255553, 0x0000068 - .incbin "baserom.gba", 0x2555BB, 0x0000FC3 - .incbin "baserom.gba", 0x25657E, 0x0007F37 - .incbin "baserom.gba", 0x25E4B5, 0x0000344 - .incbin "baserom.gba", 0x25E7F9, 0x0001808 - .incbin "baserom.gba", 0x260001, 0x0000007 - .incbin "baserom.gba", 0x260008, 0x0000038 - .incbin "baserom.gba", 0x260040, 0x0000094 - .incbin "baserom.gba", 0x2600D4, 0x0000300 - .incbin "baserom.gba", 0x2603D4, 0x0000051 - .incbin "baserom.gba", 0x260425, 0x0000034 - .incbin "baserom.gba", 0x260459, 0x00002A9 - .incbin "baserom.gba", 0x260702, 0x00004AE - .incbin "baserom.gba", 0x260BB0, 0x0000348 - .incbin "baserom.gba", 0x260EF8, 0x0000011 - .incbin "baserom.gba", 0x260F09, 0x0000D6C - .incbin "baserom.gba", 0x261C75, 0x000009E - .incbin "baserom.gba", 0x261D13, 0x0000401 - .incbin "baserom.gba", 0x262114, 0x00004F1 - .incbin "baserom.gba", 0x262605, 0x0000316 - .incbin "baserom.gba", 0x26291B, 0x0000307 - .incbin "baserom.gba", 0x262C22, 0x0000407 - .incbin "baserom.gba", 0x263029, 0x00002FA - .incbin "baserom.gba", 0x263323, 0x000051D - .incbin "baserom.gba", 0x263840, 0x0000206 - .incbin "baserom.gba", 0x263A46, 0x0000508 - .incbin "baserom.gba", 0x263F4E, 0x0000005 - .incbin "baserom.gba", 0x263F53, 0x00001FD - .incbin "baserom.gba", 0x264150, 0x00003E0 - .incbin "baserom.gba", 0x264530, 0x0000335 - .incbin "baserom.gba", 0x264865, 0x00002D8 - .incbin "baserom.gba", 0x264B3D, 0x000031C - .incbin "baserom.gba", 0x264E59, 0x0000113 - .incbin "baserom.gba", 0x264F6C, 0x000835A - .incbin "baserom.gba", 0x26D2C6, 0x0000530 - .incbin "baserom.gba", 0x26D7F6, 0x0000990 - .incbin "baserom.gba", 0x26E186, 0x0000C68 - .incbin "baserom.gba", 0x26EDEE, 0x00011FE - .incbin "baserom.gba", 0x26FFEC, 0x0000014 - .incbin "baserom.gba", 0x270000, 0x0000001 - .incbin "baserom.gba", 0x270001, 0x000000F - .incbin "baserom.gba", 0x270010, 0x0000001 - .incbin "baserom.gba", 0x270011, 0x00000E0 - .incbin "baserom.gba", 0x2700F1, 0x00000E7 - .incbin "baserom.gba", 0x2701D8, 0x000042E - .incbin "baserom.gba", 0x270606, 0x000011A - .incbin "baserom.gba", 0x270720, 0x00002CD - .incbin "baserom.gba", 0x2709ED, 0x000051C - .incbin "baserom.gba", 0x270F09, 0x00000F8 - .incbin "baserom.gba", 0x271001, 0x0000065 - .incbin "baserom.gba", 0x271066, 0x000025C - .incbin "baserom.gba", 0x2712C2, 0x0000033 - .incbin "baserom.gba", 0x2712F5, 0x00001E8 - .incbin "baserom.gba", 0x2714DD, 0x0000A1E - .incbin "baserom.gba", 0x271EFB, 0x0000718 - .incbin "baserom.gba", 0x272613, 0x0000204 - .incbin "baserom.gba", 0x272817, 0x00000E1 - .incbin "baserom.gba", 0x2728F8, 0x0000023 - .incbin "baserom.gba", 0x27291B, 0x00001F8 - .incbin "baserom.gba", 0x272B13, 0x000024D - .incbin "baserom.gba", 0x272D60, 0x00001CD - .incbin "baserom.gba", 0x272F2D, 0x00006F5 - .incbin "baserom.gba", 0x273622, 0x000031C - .incbin "baserom.gba", 0x27393E, 0x000040F - .incbin "baserom.gba", 0x273D4D, 0x0000101 - .incbin "baserom.gba", 0x273E4E, 0x00003DC - .incbin "baserom.gba", 0x27422A, 0x0000422 - .incbin "baserom.gba", 0x27464C, 0x0000011 - .incbin "baserom.gba", 0x27465D, 0x0002CAE - .incbin "baserom.gba", 0x27730B, 0x0001D03 - .incbin "baserom.gba", 0x27900E, 0x0004412 - .incbin "baserom.gba", 0x27D420, 0x0000FEC - .incbin "baserom.gba", 0x27E40C, 0x000120A - .incbin "baserom.gba", 0x27F616, 0x00009F3 - .incbin "baserom.gba", 0x280009, 0x000001E - .incbin "baserom.gba", 0x280027, 0x0000F01 - .incbin "baserom.gba", 0x280F28, 0x00003CB - .incbin "baserom.gba", 0x2812F3, 0x0000F8E - .incbin "baserom.gba", 0x282281, 0x0000679 - .incbin "baserom.gba", 0x2828FA, 0x000042E - .incbin "baserom.gba", 0x282D28, 0x0000013 - .incbin "baserom.gba", 0x282D3B, 0x0000202 - .incbin "baserom.gba", 0x282F3D, 0x00002E1 - .incbin "baserom.gba", 0x28321E, 0x00003FB - .incbin "baserom.gba", 0x283619, 0x0000A3A - .incbin "baserom.gba", 0x284053, 0x0000301 - .incbin "baserom.gba", 0x284354, 0x00000D9 - .incbin "baserom.gba", 0x28442D, 0x0000332 - .incbin "baserom.gba", 0x28475F, 0x00002F0 - .incbin "baserom.gba", 0x284A4F, 0x00015B1 - .incbin "baserom.gba", 0x286000, 0x000016C - .incbin "baserom.gba", 0x28616C, 0x0008C48 - .incbin "baserom.gba", 0x28EDB4, 0x0000826 - .incbin "baserom.gba", 0x28F5DA, 0x0001009 - .incbin "baserom.gba", 0x2905E3, 0x000011D - .incbin "baserom.gba", 0x290700, 0x00001EE - .incbin "baserom.gba", 0x2908EE, 0x0000017 - .incbin "baserom.gba", 0x290905, 0x0000601 - .incbin "baserom.gba", 0x290F06, 0x00006E5 - .incbin "baserom.gba", 0x2915EB, 0x0000303 - .incbin "baserom.gba", 0x2918EE, 0x000078F - .incbin "baserom.gba", 0x29207D, 0x0000192 - .incbin "baserom.gba", 0x29220F, 0x00005CF - .incbin "baserom.gba", 0x2927DE, 0x000003A - .incbin "baserom.gba", 0x292818, 0x00001F4 - .incbin "baserom.gba", 0x292A0C, 0x000048D - .incbin "baserom.gba", 0x292E99, 0x0000298 - .incbin "baserom.gba", 0x293131, 0x0000C27 - .incbin "baserom.gba", 0x293D58, 0x00002FC - .incbin "baserom.gba", 0x294054, 0x00001FB - .incbin "baserom.gba", 0x29424F, 0x0000001 - .incbin "baserom.gba", 0x294250, 0x000030E - .incbin "baserom.gba", 0x29455E, 0x00002F1 - .incbin "baserom.gba", 0x29484F, 0x0000205 - .incbin "baserom.gba", 0x294A54, 0x0000106 - .incbin "baserom.gba", 0x294B5A, 0x00008CB - .incbin "baserom.gba", 0x295425, 0x0000223 - .incbin "baserom.gba", 0x295648, 0x0005ABB - .incbin "baserom.gba", 0x29B103, 0x0002DE9 - .incbin "baserom.gba", 0x29DEEC, 0x0002114 - .incbin "baserom.gba", 0x2A0000, 0x0000004 - .incbin "baserom.gba", 0x2A0004, 0x0000005 - .incbin "baserom.gba", 0x2A0009, 0x0000001 - .incbin "baserom.gba", 0x2A000A, 0x0000004 - .incbin "baserom.gba", 0x2A000E, 0x0000002 - .incbin "baserom.gba", 0x2A0010, 0x0000008 - .incbin "baserom.gba", 0x2A0018, 0x0000004 - .incbin "baserom.gba", 0x2A001C, 0x0000017 - .incbin "baserom.gba", 0x2A0033, 0x000003F - .incbin "baserom.gba", 0x2A0072, 0x000038F - .incbin "baserom.gba", 0x2A0401, 0x000000F - .incbin "baserom.gba", 0x2A0410, 0x0000024 - .incbin "baserom.gba", 0x2A0434, 0x000000F - .incbin "baserom.gba", 0x2A0443, 0x0000001 - .incbin "baserom.gba", 0x2A0444, 0x0000010 - .incbin "baserom.gba", 0x2A0454, 0x0000005 - .incbin "baserom.gba", 0x2A0459, 0x000000A - .incbin "baserom.gba", 0x2A0463, 0x0000025 - .incbin "baserom.gba", 0x2A0488, 0x0000379 - .incbin "baserom.gba", 0x2A0801, 0x0000004 - .incbin "baserom.gba", 0x2A0805, 0x0000002 - .incbin "baserom.gba", 0x2A0807, 0x0000022 - .incbin "baserom.gba", 0x2A0829, 0x0000AB5 - .incbin "baserom.gba", 0x2A12DE, 0x0000106 - .incbin "baserom.gba", 0x2A13E4, 0x0000437 - .incbin "baserom.gba", 0x2A181B, 0x00003BC - .incbin "baserom.gba", 0x2A1BD7, 0x0000731 - .incbin "baserom.gba", 0x2A2308, 0x00000F3 - .incbin "baserom.gba", 0x2A23FB, 0x0000309 - .incbin "baserom.gba", 0x2A2704, 0x00001E5 - .incbin "baserom.gba", 0x2A28E9, 0x0000831 - .incbin "baserom.gba", 0x2A311A, 0x000090E - .incbin "baserom.gba", 0x2A3A28, 0x0000009 - .incbin "baserom.gba", 0x2A3A31, 0x00003F4 - .incbin "baserom.gba", 0x2A3E25, 0x0000108 - .incbin "baserom.gba", 0x2A3F2D, 0x000041A - .incbin "baserom.gba", 0x2A4347, 0x000000E - .incbin "baserom.gba", 0x2A4355, 0x00000ED - .incbin "baserom.gba", 0x2A4442, 0x000000B - .incbin "baserom.gba", 0x2A444D, 0x00000F2 - .incbin "baserom.gba", 0x2A453F, 0x0000007 - .incbin "baserom.gba", 0x2A4546, 0x000020E - .incbin "baserom.gba", 0x2A4754, 0x000020E - .incbin "baserom.gba", 0x2A4962, 0x00000D5 - .incbin "baserom.gba", 0x2A4A37, 0x0000020 - .incbin "baserom.gba", 0x2A4A57, 0x0000603 - .incbin "baserom.gba", 0x2A505A, 0x0005CB1 - .incbin "baserom.gba", 0x2AAD0B, 0x0000EAF - .incbin "baserom.gba", 0x2ABBBA, 0x0000332 - .incbin "baserom.gba", 0x2ABEEC, 0x000270A - .incbin "baserom.gba", 0x2AE5F6, 0x000020F - .incbin "baserom.gba", 0x2AE805, 0x000166B - .incbin "baserom.gba", 0x2AFE70, 0x000015E - .incbin "baserom.gba", 0x2AFFCE, 0x0000F3B - .incbin "baserom.gba", 0x2B0F09, 0x0000529 - .incbin "baserom.gba", 0x2B1432, 0x00009BD - .incbin "baserom.gba", 0x2B1DEF, 0x000060F - .incbin "baserom.gba", 0x2B23FE, 0x00006E4 - .incbin "baserom.gba", 0x2B2AE2, 0x000092E - .incbin "baserom.gba", 0x2B3410, 0x0000234 - .incbin "baserom.gba", 0x2B3644, 0x0000115 - .incbin "baserom.gba", 0x2B3759, 0x00005E3 - .incbin "baserom.gba", 0x2B3D3C, 0x0000224 - .incbin "baserom.gba", 0x2B3F60, 0x00005B4 - .incbin "baserom.gba", 0x2B4514, 0x0000448 - .incbin "baserom.gba", 0x2B495C, 0x0000008 - .incbin "baserom.gba", 0x2B4964, 0x0000A05 - .incbin "baserom.gba", 0x2B5369, 0x0002C97 - .incbin "baserom.gba", 0x2B8000, 0x0005C81 - .incbin "baserom.gba", 0x2BDC81, 0x0001F3B - .incbin "baserom.gba", 0x2BFBBC, 0x00002C7 - .incbin "baserom.gba", 0x2BFE83, 0x000017D - .incbin "baserom.gba", 0x2C0000, 0x000003C - .incbin "baserom.gba", 0x2C003C, 0x0000024 - .incbin "baserom.gba", 0x2C0060, 0x00000A7 - .incbin "baserom.gba", 0x2C0107, 0x0000724 - .incbin "baserom.gba", 0x2C082B, 0x00002D5 - .incbin "baserom.gba", 0x2C0B00, 0x0000406 - .incbin "baserom.gba", 0x2C0F06, 0x00016FF - .incbin "baserom.gba", 0x2C2605, 0x00002FE - .incbin "baserom.gba", 0x2C2903, 0x0000E14 - .incbin "baserom.gba", 0x2C3717, 0x0000225 - .incbin "baserom.gba", 0x2C393C, 0x00001DB - .incbin "baserom.gba", 0x2C3B17, 0x000033A - .incbin "baserom.gba", 0x2C3E51, 0x00005E6 - .incbin "baserom.gba", 0x2C4437, 0x0001C39 - .incbin "baserom.gba", 0x2C6070, 0x0000FB1 - .incbin "baserom.gba", 0x2C7021, 0x0000AFF - .incbin "baserom.gba", 0x2C7B20, 0x0004D18 - .incbin "baserom.gba", 0x2CC838, 0x000249E - .incbin "baserom.gba", 0x2CECD6, 0x000132A - .incbin "baserom.gba", 0x2D0000, 0x000006E - .incbin "baserom.gba", 0x2D006E, 0x0000060 - .incbin "baserom.gba", 0x2D00CE, 0x0000171 - .incbin "baserom.gba", 0x2D023F, 0x0000204 - .incbin "baserom.gba", 0x2D0443, 0x0000001 - .incbin "baserom.gba", 0x2D0444, 0x0000015 - .incbin "baserom.gba", 0x2D0459, 0x000002F - .incbin "baserom.gba", 0x2D0488, 0x0000EA1 - .incbin "baserom.gba", 0x2D1329, 0x0000716 - .incbin "baserom.gba", 0x2D1A3F, 0x0000AF1 - .incbin "baserom.gba", 0x2D2530, 0x00001F5 - .incbin "baserom.gba", 0x2D2725, 0x00003F6 - .incbin "baserom.gba", 0x2D2B1B, 0x00000F4 - .incbin "baserom.gba", 0x2D2C0F, 0x0000A1A - .incbin "baserom.gba", 0x2D3629, 0x0000B0F - .incbin "baserom.gba", 0x2D4138, 0x000075C + .incbin "baserom.gba", 0x2474D4, 0x008D3C0 gUnk_082D4894:: .incbin "graphics/pot_portal.4bpp" - .incbin "baserom.gba", 0x2D5A94, 0x00000C1 - .incbin "baserom.gba", 0x2D5B55, 0x0007F92 - .incbin "baserom.gba", 0x2DDAE7, 0x00024E9 - .incbin "baserom.gba", 0x2DFFD0, 0x000006C - .incbin "baserom.gba", 0x2E003C, 0x0000001 - .incbin "baserom.gba", 0x2E003D, 0x00010AA - .incbin "baserom.gba", 0x2E10E7, 0x0000024 - .incbin "baserom.gba", 0x2E110B, 0x00003FE - .incbin "baserom.gba", 0x2E1509, 0x0000211 - .incbin "baserom.gba", 0x2E171A, 0x0000AF8 - .incbin "baserom.gba", 0x2E2212, 0x0000AE9 - .incbin "baserom.gba", 0x2E2CFB, 0x0001805 - .incbin "baserom.gba", 0x2E4500, 0x000053A - .incbin "baserom.gba", 0x2E4A3A, 0x0000F1B - .incbin "baserom.gba", 0x2E5955, 0x0000F9F + .incbin "baserom.gba", 0x2D5A94, 0x0010E60 gUnk_082E68F4:: @ 082E68F4 - .incbin "baserom.gba", 0x2E68F4, 0x0001081 - .incbin "baserom.gba", 0x2E7975, 0x00003B4 - .incbin "baserom.gba", 0x2E7D29, 0x00045C2 - .incbin "baserom.gba", 0x2EC2EB, 0x0002113 - .incbin "baserom.gba", 0x2EE3FE, 0x0000A23 - .incbin "baserom.gba", 0x2EEE21, 0x00011DF - .incbin "baserom.gba", 0x2F0000, 0x0000008 - .incbin "baserom.gba", 0x2F0008, 0x0000008 - .incbin "baserom.gba", 0x2F0010, 0x0000005 - .incbin "baserom.gba", 0x2F0015, 0x0000009 - .incbin "baserom.gba", 0x2F001E, 0x00000B4 - .incbin "baserom.gba", 0x2F00D2, 0x000002C - .incbin "baserom.gba", 0x2F00FE, 0x0000339 - .incbin "baserom.gba", 0x2F0437, 0x0000022 - .incbin "baserom.gba", 0x2F0459, 0x0000025 - .incbin "baserom.gba", 0x2F047E, 0x0000389 - .incbin "baserom.gba", 0x2F0807, 0x00006FC - .incbin "baserom.gba", 0x2F0F03, 0x0000600 - .incbin "baserom.gba", 0x2F1503, 0x0000804 - .incbin "baserom.gba", 0x2F1D07, 0x0000AED + .incbin "baserom.gba", 0x2E68F4, 0x000BF00 gUnk_082F27F4:: @ 082F27F4 - .incbin "baserom.gba", 0x2F27F4, 0x000031B - .incbin "baserom.gba", 0x2F2B0F, 0x0001265 + .incbin "baserom.gba", 0x2F27F4, 0x0001580 gUnk_082F3D74:: @ 082F3D74 .ifdef EU @@ -4515,1178 +2846,49 @@ gUnk_082F3D74:: @ 082F3D74 .else .incbin "baserom.gba", 0x2FE2E1, 0x0001CBE .endif - .incbin "baserom.gba", 0x2FFF9F, 0x0000061 - .incbin "baserom.gba", 0x300000, 0x0000009 - .incbin "baserom.gba", 0x300009, 0x0000018 - .incbin "baserom.gba", 0x300021, 0x0000104 - .incbin "baserom.gba", 0x300125, 0x0000043 - .incbin "baserom.gba", 0x300168, 0x0000239 - .incbin "baserom.gba", 0x3003A1, 0x0000080 - .incbin "baserom.gba", 0x300421, 0x00002FF - .incbin "baserom.gba", 0x300720, 0x0000007 - .incbin "baserom.gba", 0x300727, 0x0000009 - .incbin "baserom.gba", 0x300730, 0x0000010 - .incbin "baserom.gba", 0x300740, 0x0000010 - .incbin "baserom.gba", 0x300750, 0x0000020 - .incbin "baserom.gba", 0x300770, 0x0000040 - .incbin "baserom.gba", 0x3007B0, 0x0000030 - .incbin "baserom.gba", 0x3007E0, 0x0000028 - .incbin "baserom.gba", 0x300808, 0x0000108 - .incbin "baserom.gba", 0x300910, 0x0000104 - .incbin "baserom.gba", 0x300A14, 0x00000ED - .incbin "baserom.gba", 0x300B01, 0x0000560 - .incbin "baserom.gba", 0x301061, 0x0000B00 - .incbin "baserom.gba", 0x301B61, 0x0000240 - .incbin "baserom.gba", 0x301DA1, 0x00001CF - .incbin "baserom.gba", 0x301F70, 0x0000231 - .incbin "baserom.gba", 0x3021A1, 0x0000268 - .incbin "baserom.gba", 0x302409, 0x0000158 - .incbin "baserom.gba", 0x302561, 0x0000140 - .incbin "baserom.gba", 0x3026A1, 0x000006F - .incbin "baserom.gba", 0x302710, 0x00001F5 - .incbin "baserom.gba", 0x302905, 0x000003B - .incbin "baserom.gba", 0x302940, 0x0000221 - .incbin "baserom.gba", 0x302B61, 0x00000D6 - .incbin "baserom.gba", 0x302C37, 0x00000D9 - .incbin "baserom.gba", 0x302D10, 0x0000010 - .incbin "baserom.gba", 0x302D20, 0x0000110 - .incbin "baserom.gba", 0x302E30, 0x00000E1 - .incbin "baserom.gba", 0x302F11, 0x00000FF - .incbin "baserom.gba", 0x303010, 0x0000019 - .incbin "baserom.gba", 0x303029, 0x0000078 - .incbin "baserom.gba", 0x3030A1, 0x0000300 - .incbin "baserom.gba", 0x3033A1, 0x0000067 - .incbin "baserom.gba", 0x303408, 0x0000540 - .incbin "baserom.gba", 0x303948, 0x00002FE - .incbin "baserom.gba", 0x303C46, 0x00000E5 - .incbin "baserom.gba", 0x303D2B, 0x00002F6 - .incbin "baserom.gba", 0x304021, 0x0000612 - .incbin "baserom.gba", 0x304633, 0x0000143 - .incbin "baserom.gba", 0x304776, 0x00002F2 - .incbin "baserom.gba", 0x304A68, 0x00003F9 - .incbin "baserom.gba", 0x304E61, 0x0000407 - .incbin "baserom.gba", 0x305268, 0x0000002 - .incbin "baserom.gba", 0x30526A, 0x000050B - .incbin "baserom.gba", 0x305775, 0x00007A0 - .incbin "baserom.gba", 0x305F15, 0x000006E - .incbin "baserom.gba", 0x305F83, 0x00005C5 - .incbin "baserom.gba", 0x306548, 0x000023B - .incbin "baserom.gba", 0x306783, 0x00001AD - .incbin "baserom.gba", 0x306930, 0x0000757 - .incbin "baserom.gba", 0x307087, 0x00004C8 - .incbin "baserom.gba", 0x30754F, 0x000000E - .incbin "baserom.gba", 0x30755D, 0x000021A - .incbin "baserom.gba", 0x307777, 0x0000201 - .incbin "baserom.gba", 0x307978, 0x000038F - .incbin "baserom.gba", 0x307D07, 0x0000529 - .incbin "baserom.gba", 0x308230, 0x00004E6 - .incbin "baserom.gba", 0x308716, 0x00006F3 + .incbin "baserom.gba", 0x2FFF9F, 0x0008E6A .ifdef EU @ TODO only small differences .incbin "baserom_eu.gba", 0x3084F1, 0x0000817 .else .incbin "baserom.gba", 0x308E09, 0x0000817 .endif - .incbin "baserom.gba", 0x309620, 0x000027A - .incbin "baserom.gba", 0x30989A, 0x00004C0 - .incbin "baserom.gba", 0x309D5A, 0x0000136 - .incbin "baserom.gba", 0x309E90, 0x0000085 - .incbin "baserom.gba", 0x309F15, 0x0000290 - .incbin "baserom.gba", 0x30A1A5, 0x0000BC6 - .incbin "baserom.gba", 0x30AD6B, 0x000009C - .incbin "baserom.gba", 0x30AE07, 0x00001D9 - .incbin "baserom.gba", 0x30AFE0, 0x0000130 - .incbin "baserom.gba", 0x30B110, 0x000006F - .incbin "baserom.gba", 0x30B17F, 0x0000137 - .incbin "baserom.gba", 0x30B2B6, 0x0000062 - .incbin "baserom.gba", 0x30B318, 0x0000090 - .incbin "baserom.gba", 0x30B3A8, 0x000002C - .incbin "baserom.gba", 0x30B3D4, 0x00000E0 - .incbin "baserom.gba", 0x30B4B4, 0x0000005 - .incbin "baserom.gba", 0x30B4B9, 0x00002F7 - .incbin "baserom.gba", 0x30B7B0, 0x00000A2 - .incbin "baserom.gba", 0x30B852, 0x000020F - .incbin "baserom.gba", 0x30BA61, 0x0000360 - .incbin "baserom.gba", 0x30BDC1, 0x0000046 - .incbin "baserom.gba", 0x30BE07, 0x00000CD - .incbin "baserom.gba", 0x30BED4, 0x000009F - .incbin "baserom.gba", 0x30BF73, 0x00001D1 - .incbin "baserom.gba", 0x30C144, 0x00006F0 - .incbin "baserom.gba", 0x30C834, 0x00001C0 - .incbin "baserom.gba", 0x30C9F4, 0x0000013 - .incbin "baserom.gba", 0x30CA07, 0x00002E0 - .incbin "baserom.gba", 0x30CCE7, 0x00002E5 - .incbin "baserom.gba", 0x30CFCC, 0x0000067 - .incbin "baserom.gba", 0x30D033, 0x00002E5 - .incbin "baserom.gba", 0x30D318, 0x0000100 - .incbin "baserom.gba", 0x30D418, 0x00000B6 - .incbin "baserom.gba", 0x30D4CE, 0x0000003 - .incbin "baserom.gba", 0x30D4D1, 0x000010B - .incbin "baserom.gba", 0x30D5DC, 0x000082C - .incbin "baserom.gba", 0x30DE08, 0x0000608 - .incbin "baserom.gba", 0x30E410, 0x0000739 - .incbin "baserom.gba", 0x30EB49, 0x00000BA - .incbin "baserom.gba", 0x30EC03, 0x0000010 - .incbin "baserom.gba", 0x30EC13, 0x00003D4 - .incbin "baserom.gba", 0x30EFE7, 0x00003FA - .incbin "baserom.gba", 0x30F3E1, 0x000060B - .incbin "baserom.gba", 0x30F9EC, 0x0000141 - .incbin "baserom.gba", 0x30FB2D, 0x00001B8 - .incbin "baserom.gba", 0x30FCE5, 0x0000122 - .incbin "baserom.gba", 0x30FE07, 0x0000078 - .incbin "baserom.gba", 0x30FE7F, 0x0000016 - .incbin "baserom.gba", 0x30FE95, 0x0000059 - .incbin "baserom.gba", 0x30FEEE, 0x0000019 - .incbin "baserom.gba", 0x30FF07, 0x000004C - .incbin "baserom.gba", 0x30FF53, 0x00000AD - .incbin "baserom.gba", 0x310000, 0x0000001 - .incbin "baserom.gba", 0x310001, 0x0000001 - .incbin "baserom.gba", 0x310002, 0x0000001 - .incbin "baserom.gba", 0x310003, 0x0000001 - .incbin "baserom.gba", 0x310004, 0x0000001 - .incbin "baserom.gba", 0x310005, 0x0000001 - .incbin "baserom.gba", 0x310006, 0x0000001 - .incbin "baserom.gba", 0x310007, 0x0000001 - .incbin "baserom.gba", 0x310008, 0x0000003 - .incbin "baserom.gba", 0x31000B, 0x0000003 - .incbin "baserom.gba", 0x31000E, 0x0000001 - .incbin "baserom.gba", 0x31000F, 0x0000001 - .incbin "baserom.gba", 0x310010, 0x0000004 - .incbin "baserom.gba", 0x310014, 0x0000001 - .incbin "baserom.gba", 0x310015, 0x000000B - .incbin "baserom.gba", 0x310020, 0x0000003 - .incbin "baserom.gba", 0x310023, 0x000000D - .incbin "baserom.gba", 0x310030, 0x0000009 - .incbin "baserom.gba", 0x310039, 0x000000A - .incbin "baserom.gba", 0x310043, 0x000000D - .incbin "baserom.gba", 0x310050, 0x0000003 - .incbin "baserom.gba", 0x310053, 0x0000007 - .incbin "baserom.gba", 0x31005A, 0x0000002 - .incbin "baserom.gba", 0x31005C, 0x0000004 - .incbin "baserom.gba", 0x310060, 0x0000008 - .incbin "baserom.gba", 0x310068, 0x0000004 - .incbin "baserom.gba", 0x31006C, 0x0000006 - .incbin "baserom.gba", 0x310072, 0x0000006 - .incbin "baserom.gba", 0x310078, 0x0000007 - .incbin "baserom.gba", 0x31007F, 0x0000001 - .incbin "baserom.gba", 0x310080, 0x0000014 - .incbin "baserom.gba", 0x310094, 0x0000004 - .incbin "baserom.gba", 0x310098, 0x0000035 - .incbin "baserom.gba", 0x3100CD, 0x000000B - .incbin "baserom.gba", 0x3100D8, 0x000000A - .incbin "baserom.gba", 0x3100E2, 0x0000029 - .incbin "baserom.gba", 0x31010B, 0x000006D - .incbin "baserom.gba", 0x310178, 0x0000020 - .incbin "baserom.gba", 0x310198, 0x0000032 - .incbin "baserom.gba", 0x3101CA, 0x000005E - .incbin "baserom.gba", 0x310228, 0x0000058 - .incbin "baserom.gba", 0x310280, 0x0000008 - .incbin "baserom.gba", 0x310288, 0x0000010 - .incbin "baserom.gba", 0x310298, 0x0000068 - .incbin "baserom.gba", 0x310300, 0x0000050 - .incbin "baserom.gba", 0x310350, 0x00000B2 - .incbin "baserom.gba", 0x310402, 0x0000032 - .incbin "baserom.gba", 0x310434, 0x0000003 - .incbin "baserom.gba", 0x310437, 0x000000C - .incbin "baserom.gba", 0x310443, 0x0000002 - .incbin "baserom.gba", 0x310445, 0x0000004 - .incbin "baserom.gba", 0x310449, 0x0000001 - .incbin "baserom.gba", 0x31044A, 0x0000001 - .incbin "baserom.gba", 0x31044B, 0x000000E - .incbin "baserom.gba", 0x310459, 0x000000B - .incbin "baserom.gba", 0x310464, 0x000001A - .incbin "baserom.gba", 0x31047E, 0x0000009 - .incbin "baserom.gba", 0x310487, 0x0000001 - .incbin "baserom.gba", 0x310488, 0x00002A8 - .incbin "baserom.gba", 0x310730, 0x00000D0 - .incbin "baserom.gba", 0x310800, 0x0000001 - .incbin "baserom.gba", 0x310801, 0x0000003 - .incbin "baserom.gba", 0x310804, 0x0000001 - .incbin "baserom.gba", 0x310805, 0x0000001 - .incbin "baserom.gba", 0x310806, 0x0000001 - .incbin "baserom.gba", 0x310807, 0x0000002 - .incbin "baserom.gba", 0x310809, 0x0000001 - .incbin "baserom.gba", 0x31080A, 0x0000003 - .incbin "baserom.gba", 0x31080D, 0x0000023 - .incbin "baserom.gba", 0x310830, 0x00007BB - .incbin "baserom.gba", 0x310FEB, 0x0000218 - .incbin "baserom.gba", 0x311203, 0x0000351 - .incbin "baserom.gba", 0x311554, 0x00000BA - .incbin "baserom.gba", 0x31160E, 0x0000123 - .incbin "baserom.gba", 0x311731, 0x00005DF - .incbin "baserom.gba", 0x311D10, 0x00002F0 - .incbin "baserom.gba", 0x312000, 0x000012D - .incbin "baserom.gba", 0x31212D, 0x00009D2 - .incbin "baserom.gba", 0x312AFF, 0x0000630 - .incbin "baserom.gba", 0x31312F, 0x00000DA - .incbin "baserom.gba", 0x313209, 0x000024C - .incbin "baserom.gba", 0x313455, 0x00002EF - .incbin "baserom.gba", 0x313744, 0x00001D8 - .incbin "baserom.gba", 0x31391C, 0x00000E4 - .incbin "baserom.gba", 0x313A00, 0x0000010 - .incbin "baserom.gba", 0x313A10, 0x0000409 - .incbin "baserom.gba", 0x313E19, 0x00005E8 - .incbin "baserom.gba", 0x314401, 0x0000132 - .incbin "baserom.gba", 0x314533, 0x0000220 - .incbin "baserom.gba", 0x314753, 0x00005F2 - .incbin "baserom.gba", 0x314D45, 0x00005FC - .incbin "baserom.gba", 0x315341, 0x0000131 - .incbin "baserom.gba", 0x315472, 0x00005FF - .incbin "baserom.gba", 0x315A71, 0x00004FB - .incbin "baserom.gba", 0x315F6C, 0x0001B94 + .incbin "baserom.gba", 0x309620, 0x000E4E0 .ifdef EU @ TODO only small differences .incbin "baserom_eu.gba", 0x3171E8, 0x00026A1 .else .incbin "baserom.gba", 0x317B00, 0x00026A1 .endif - .incbin "baserom.gba", 0x31A1A1, 0x0001993 - .incbin "baserom.gba", 0x31BB34, 0x00009FB + .incbin "baserom.gba", 0x31A1A1, 0x000238E .ifdef EU @ TODO differs to gUnk_08324AE4 - .incbin "baserom_eu.gba", 0x31BC17, 0x00083D5 + .incbin "baserom_eu.gba", 0x31BC17, 0x00083D5 .else - .incbin "baserom.gba", 0x31C52F, 0x00012C6 - .incbin "baserom.gba", 0x31D7F5, 0x0000720 - .incbin "baserom.gba", 0x31DF15, 0x0000BF2 - .incbin "baserom.gba", 0x31EB07, 0x00003DB - .incbin "baserom.gba", 0x31EEE2, 0x000002B - .incbin "baserom.gba", 0x31EF0D, 0x00009E8 - .incbin "baserom.gba", 0x31F8F5, 0x000069B - .incbin "baserom.gba", 0x31FF90, 0x0000042 - .incbin "baserom.gba", 0x31FFD2, 0x000000A - .incbin "baserom.gba", 0x31FFDC, 0x0000020 - .incbin "baserom.gba", 0x31FFFC, 0x0000004 - .incbin "baserom.gba", 0x320000, 0x0000131 - .incbin "baserom.gba", 0x320131, 0x00001CF - .incbin "baserom.gba", 0x320300, 0x0000030 - .incbin "baserom.gba", 0x320330, 0x00011AF - .incbin "baserom.gba", 0x3214DF, 0x0000921 - .incbin "baserom.gba", 0x321E00, 0x00001EF - .incbin "baserom.gba", 0x321FEF, 0x0000114 - .incbin "baserom.gba", 0x322103, 0x0000134 - .incbin "baserom.gba", 0x322237, 0x0000062 - .incbin "baserom.gba", 0x322299, 0x0000189 - .incbin "baserom.gba", 0x322422, 0x0000034 - .incbin "baserom.gba", 0x322456, 0x00001A2 - .incbin "baserom.gba", 0x3225F8, 0x0000519 - .incbin "baserom.gba", 0x322B11, 0x0000B0B - .incbin "baserom.gba", 0x32361C, 0x0000B23 - .incbin "baserom.gba", 0x32413F, 0x00008F8 - .incbin "baserom.gba", 0x324A37, 0x00000AD + .incbin "baserom.gba", 0x31C52F, 0x00085B5 .endif gUnk_08324AE4:: @ 08324AE4 - .incbin "baserom.gba", 0x324AE4, 0x000018F - .incbin "baserom.gba", 0x324C73, 0x0000241 + .incbin "baserom.gba", 0x324AE4, 0x00003D0 .incbin "data/tilesets/minish_woods/tiles_bottom.4bpp.lz" - .incbin "baserom.gba", 0x327B08, 0x0001AF9 - .incbin "baserom.gba", 0x329601, 0x00053C2 - .incbin "baserom.gba", 0x32E9C3, 0x0000540 - .incbin "baserom.gba", 0x32EF03, 0x0000733 - .incbin "baserom.gba", 0x32F636, 0x00005CA - .incbin "baserom.gba", 0x32FC00, 0x00002EA - .incbin "baserom.gba", 0x32FEEA, 0x0000104 - .incbin "baserom.gba", 0x32FFEE, 0x0000055 - .incbin "baserom.gba", 0x330043, 0x00000C4 - .incbin "baserom.gba", 0x330107, 0x0000004 - .incbin "baserom.gba", 0x33010B, 0x0000119 - .incbin "baserom.gba", 0x330224, 0x0000210 - .incbin "baserom.gba", 0x330434, 0x00008B5 - .incbin "baserom.gba", 0x330CE9, 0x0000213 - .incbin "baserom.gba", 0x330EFC, 0x0000007 - .incbin "baserom.gba", 0x330F03, 0x0000C05 - .incbin "baserom.gba", 0x331B08, 0x0000637 - .incbin "baserom.gba", 0x33213F, 0x0000049 - .incbin "baserom.gba", 0x332188, 0x0000692 - .incbin "baserom.gba", 0x33281A, 0x0000913 - .incbin "baserom.gba", 0x33312D, 0x0000205 - .incbin "baserom.gba", 0x333332, 0x0000001 - .incbin "baserom.gba", 0x333333, 0x0000008 - .incbin "baserom.gba", 0x33333B, 0x00000F2 - .incbin "baserom.gba", 0x33342D, 0x00002F1 - .incbin "baserom.gba", 0x33371E, 0x00001F0 - .incbin "baserom.gba", 0x33390E, 0x0000122 - .incbin "baserom.gba", 0x333A30, 0x00005E8 - .incbin "baserom.gba", 0x334018, 0x00003E9 - .incbin "baserom.gba", 0x334401, 0x000001F - .incbin "baserom.gba", 0x334420, 0x00000BD - .incbin "baserom.gba", 0x3344DD, 0x0000558 - .incbin "baserom.gba", 0x334A35, 0x0000646 - .incbin "baserom.gba", 0x33507B, 0x000054F - .incbin "baserom.gba", 0x3355CA, 0x0000CB3 - .incbin "baserom.gba", 0x33627D, 0x0000CF7 - .incbin "baserom.gba", 0x336F74, 0x000008F - .incbin "baserom.gba", 0x337003, 0x00002FD - .incbin "baserom.gba", 0x337300, 0x0000C03 - .incbin "baserom.gba", 0x337F03, 0x0000330 - .incbin "baserom.gba", 0x338233, 0x0000650 - .incbin "baserom.gba", 0x338883, 0x0001217 - .incbin "baserom.gba", 0x339A9A, 0x0000133 - .incbin "baserom.gba", 0x339BCD, 0x00009DC - .incbin "baserom.gba", 0x33A5A9, 0x0000E5D - .incbin "baserom.gba", 0x33B406, 0x0000706 - .incbin "baserom.gba", 0x33BB0C, 0x00033F6 - .incbin "baserom.gba", 0x33EF02, 0x0000509 - .incbin "baserom.gba", 0x33F40B, 0x0000B2C - .incbin "baserom.gba", 0x33FF37, 0x00003C9 - .incbin "baserom.gba", 0x340300, 0x0000507 - .incbin "baserom.gba", 0x340807, 0x00008F8 - .incbin "baserom.gba", 0x3410FF, 0x0000F48 - .incbin "baserom.gba", 0x342047, 0x00003B2 - .incbin "baserom.gba", 0x3423F9, 0x00000F1 - .incbin "baserom.gba", 0x3424EA, 0x0000D2E - .incbin "baserom.gba", 0x343218, 0x00000F5 - .incbin "baserom.gba", 0x34330D, 0x0000024 - .incbin "baserom.gba", 0x343331, 0x0000EE0 - .incbin "baserom.gba", 0x344211, 0x0000233 - .incbin "baserom.gba", 0x344444, 0x0000505 - .incbin "baserom.gba", 0x344949, 0x000012E - .incbin "baserom.gba", 0x344A77, 0x00008E5 - .incbin "baserom.gba", 0x34535C, 0x000031B + .incbin "baserom.gba", 0x327B08, 0x001DB6F @ TODO EU differs from here .ifdef EU .incbin "baserom_eu.gba", 0x344B7F, 0x025D851 .else - .incbin "baserom.gba", 0x345677, 0x0000325 - .incbin "baserom.gba", 0x34599C, 0x0000575 - .incbin "baserom.gba", 0x345F11, 0x0000617 - .incbin "baserom.gba", 0x346528, 0x000012D - .incbin "baserom.gba", 0x346655, 0x00007E0 - .incbin "baserom.gba", 0x346E35, 0x000013B - .incbin "baserom.gba", 0x346F70, 0x00007F7 - .incbin "baserom.gba", 0x347767, 0x0000055 - .incbin "baserom.gba", 0x3477BC, 0x0003C5C - .incbin "baserom.gba", 0x34B418, 0x0002D8B - .incbin "baserom.gba", 0x34E1A3, 0x00006E6 - .incbin "baserom.gba", 0x34E889, 0x0000A37 - .incbin "baserom.gba", 0x34F2C0, 0x0000D50 - .incbin "baserom.gba", 0x350010, 0x000003A - .incbin "baserom.gba", 0x35004A, 0x00002B6 - .incbin "baserom.gba", 0x350300, 0x0000E3B - .incbin "baserom.gba", 0x35113B, 0x00008CB - .incbin "baserom.gba", 0x351A06, 0x0001A93 - .incbin "baserom.gba", 0x353499, 0x0000294 - .incbin "baserom.gba", 0x35372D, 0x00001E6 - .incbin "baserom.gba", 0x353913, 0x0000705 - .incbin "baserom.gba", 0x354018, 0x0000317 - .incbin "baserom.gba", 0x35432F, 0x000090A - .incbin "baserom.gba", 0x354C39, 0x00007F6 - .incbin "baserom.gba", 0x35542F, 0x0000014 - .incbin "baserom.gba", 0x355443, 0x0000234 - .incbin "baserom.gba", 0x355677, 0x00009DE - .incbin "baserom.gba", 0x356055, 0x0000526 - .incbin "baserom.gba", 0x35657B, 0x0001197 - .incbin "baserom.gba", 0x357712, 0x0007B10 - .incbin "baserom.gba", 0x35F222, 0x0000E9B - .incbin "baserom.gba", 0x3600BD, 0x0000410 - .incbin "baserom.gba", 0x3604CD, 0x0000053 - .incbin "baserom.gba", 0x360520, 0x00003A0 - .incbin "baserom.gba", 0x3608C0, 0x0001AF1 - .incbin "baserom.gba", 0x3623B1, 0x0000639 - .incbin "baserom.gba", 0x3629EA, 0x0000128 - .incbin "baserom.gba", 0x362B12, 0x0000001 - .incbin "baserom.gba", 0x362B13, 0x00003F4 - .incbin "baserom.gba", 0x362F07, 0x000140A - .incbin "baserom.gba", 0x364311, 0x0000020 - .incbin "baserom.gba", 0x364331, 0x000051C - .incbin "baserom.gba", 0x36484D, 0x00007E7 - .incbin "baserom.gba", 0x365034, 0x00004EF - .incbin "baserom.gba", 0x365523, 0x000013E - .incbin "baserom.gba", 0x365661, 0x0000E16 - .incbin "baserom.gba", 0x366477, 0x0006B6C - .incbin "baserom.gba", 0x36CFE3, 0x0001E60 - .incbin "baserom.gba", 0x36EE43, 0x00011CE - .incbin "baserom.gba", 0x370011, 0x00005FF - .incbin "baserom.gba", 0x370610, 0x0000701 - .incbin "baserom.gba", 0x370D11, 0x0001404 - .incbin "baserom.gba", 0x372115, 0x00019FB - .incbin "baserom.gba", 0x373B10, 0x000131A - .incbin "baserom.gba", 0x374E2A, 0x00001D6 - .incbin "baserom.gba", 0x375000, 0x0001841 - .incbin "baserom.gba", 0x376841, 0x00066F7 - .incbin "baserom.gba", 0x37CF38, 0x00012CE - .incbin "baserom.gba", 0x37E206, 0x0001DFA - .incbin "baserom.gba", 0x380000, 0x0000019 - .incbin "baserom.gba", 0x380019, 0x0000023 - .incbin "baserom.gba", 0x38003C, 0x000001E - .incbin "baserom.gba", 0x38005A, 0x000001E - .incbin "baserom.gba", 0x380078, 0x000007F - .incbin "baserom.gba", 0x3800F7, 0x000030A - .incbin "baserom.gba", 0x380401, 0x0000001 - .incbin "baserom.gba", 0x380402, 0x0000057 - .incbin "baserom.gba", 0x380459, 0x0000025 - .incbin "baserom.gba", 0x38047E, 0x0000009 - .incbin "baserom.gba", 0x380487, 0x0000001 - .incbin "baserom.gba", 0x380488, 0x0000380 - .incbin "baserom.gba", 0x380808, 0x0000007 - .incbin "baserom.gba", 0x38080F, 0x0000152 - .incbin "baserom.gba", 0x380961, 0x00005A8 - .incbin "baserom.gba", 0x380F09, 0x00004DD - .incbin "baserom.gba", 0x3813E6, 0x0001048 - .incbin "baserom.gba", 0x38242E, 0x00008E6 - .incbin "baserom.gba", 0x382D14, 0x00008D5 - .incbin "baserom.gba", 0x3835E9, 0x0000517 - .incbin "baserom.gba", 0x383B00, 0x0000122 - .incbin "baserom.gba", 0x383C22, 0x00004DE - .incbin "baserom.gba", 0x384100, 0x0000341 - .incbin "baserom.gba", 0x384441, 0x0000DC3 - .incbin "baserom.gba", 0x385204, 0x0000B6B - .incbin "baserom.gba", 0x385D6F, 0x00006FB - .incbin "baserom.gba", 0x38646A, 0x000030C - .incbin "baserom.gba", 0x386776, 0x0009889 - .incbin "baserom.gba", 0x38FFFF, 0x0000002 - .incbin "baserom.gba", 0x390001, 0x00002DB - .incbin "baserom.gba", 0x3902DC, 0x00003A4 - .incbin "baserom.gba", 0x390680, 0x0000180 - .incbin "baserom.gba", 0x390800, 0x0000706 - .incbin "baserom.gba", 0x390F06, 0x00014CE - .incbin "baserom.gba", 0x3923D4, 0x000084A - .incbin "baserom.gba", 0x392C1E, 0x0001011 - .incbin "baserom.gba", 0x393C2F, 0x00004D1 - .incbin "baserom.gba", 0x394100, 0x0001C00 - .incbin "baserom.gba", 0x395D00, 0x000077B - .incbin "baserom.gba", 0x39647B, 0x0000303 - .incbin "baserom.gba", 0x39677E, 0x000870E - .incbin "baserom.gba", 0x39EE8C, 0x0000001 - .incbin "baserom.gba", 0x39EE8D, 0x000127A - .incbin "baserom.gba", 0x3A0107, 0x0000669 - .incbin "baserom.gba", 0x3A0770, 0x0003990 - .incbin "baserom.gba", 0x3A4100, 0x0003D1D - .incbin "baserom.gba", 0x3A7E1D, 0x0002253 - .incbin "baserom.gba", 0x3AA070, 0x0005F90 - .incbin "baserom.gba", 0x3B0000, 0x0000001 - .incbin "baserom.gba", 0x3B0001, 0x0000007 - .incbin "baserom.gba", 0x3B0008, 0x0000178 - .incbin "baserom.gba", 0x3B0180, 0x000069E - .incbin "baserom.gba", 0x3B081E, 0x000001C - .incbin "baserom.gba", 0x3B083A, 0x00006CC - .incbin "baserom.gba", 0x3B0F06, 0x00012E0 - .incbin "baserom.gba", 0x3B21E6, 0x0000E3E - .incbin "baserom.gba", 0x3B3024, 0x00001DD - .incbin "baserom.gba", 0x3B3201, 0x000061F - .incbin "baserom.gba", 0x3B3820, 0x00008E0 - .incbin "baserom.gba", 0x3B4100, 0x000024B - .incbin "baserom.gba", 0x3B434B, 0x0000074 - .incbin "baserom.gba", 0x3B43BF, 0x00024B8 - .incbin "baserom.gba", 0x3B6877, 0x0009693 - .incbin "baserom.gba", 0x3BFF0A, 0x00000F6 - .incbin "baserom.gba", 0x3C0000, 0x0000001 - .incbin "baserom.gba", 0x3C0001, 0x000000B - .incbin "baserom.gba", 0x3C000C, 0x00013F4 - .incbin "baserom.gba", 0x3C1400, 0x0000841 - .incbin "baserom.gba", 0x3C1C41, 0x00009A8 - .incbin "baserom.gba", 0x3C25E9, 0x00005D9 - .incbin "baserom.gba", 0x3C2BC2, 0x0000620 - .incbin "baserom.gba", 0x3C31E2, 0x0000968 - .incbin "baserom.gba", 0x3C3B4A, 0x00004B6 - .incbin "baserom.gba", 0x3C4000, 0x0002236 - .incbin "baserom.gba", 0x3C6236, 0x0000D44 - .incbin "baserom.gba", 0x3C6F7A, 0x00030A2 - .incbin "baserom.gba", 0x3CA01C, 0x00040BD - .incbin "baserom.gba", 0x3CE0D9, 0x0001F27 - .incbin "baserom.gba", 0x3D0000, 0x0000055 - .incbin "baserom.gba", 0x3D0055, 0x000042B - .incbin "baserom.gba", 0x3D0480, 0x00003BC - .incbin "baserom.gba", 0x3D083C, 0x00037C4 - .incbin "baserom.gba", 0x3D4000, 0x000005C - .incbin "baserom.gba", 0x3D405C, 0x0001B06 - .incbin "baserom.gba", 0x3D5B62, 0x000249E - .incbin "baserom.gba", 0x3D8000, 0x0008000 - .incbin "baserom.gba", 0x3E0000, 0x0000001 - .incbin "baserom.gba", 0x3E0001, 0x0000F05 - .incbin "baserom.gba", 0x3E0F06, 0x0000020 - .incbin "baserom.gba", 0x3E0F26, 0x00019E6 - .incbin "baserom.gba", 0x3E290C, 0x00016F2 - .incbin "baserom.gba", 0x3E3FFE, 0x000006C - .incbin "baserom.gba", 0x3E406A, 0x000006A - .incbin "baserom.gba", 0x3E40D4, 0x000133D - .incbin "baserom.gba", 0x3E5411, 0x0000532 - .incbin "baserom.gba", 0x3E5943, 0x00002E1 - .incbin "baserom.gba", 0x3E5C24, 0x00029EC - .incbin "baserom.gba", 0x3E8610, 0x00079F0 - .incbin "baserom.gba", 0x3F0000, 0x0000001 - .incbin "baserom.gba", 0x3F0001, 0x000003F - .incbin "baserom.gba", 0x3F0040, 0x000037F - .incbin "baserom.gba", 0x3F03BF, 0x0002450 - .incbin "baserom.gba", 0x3F280F, 0x0000BC3 - .incbin "baserom.gba", 0x3F33D2, 0x0000F67 - .incbin "baserom.gba", 0x3F4339, 0x00000CE - .incbin "baserom.gba", 0x3F4407, 0x0000BC8 - .incbin "baserom.gba", 0x3F4FCF, 0x0000035 - .incbin "baserom.gba", 0x3F5004, 0x0000335 - .incbin "baserom.gba", 0x3F5339, 0x000000A - .incbin "baserom.gba", 0x3F5343, 0x0000D77 - .incbin "baserom.gba", 0x3F60BA, 0x0000051 - .incbin "baserom.gba", 0x3F610B, 0x0000057 - .incbin "baserom.gba", 0x3F6162, 0x00006D5 - .incbin "baserom.gba", 0x3F6837, 0x0000907 - .incbin "baserom.gba", 0x3F713E, 0x000033B - .incbin "baserom.gba", 0x3F7479, 0x0000B8A - .incbin "baserom.gba", 0x3F8003, 0x0001086 - .incbin "baserom.gba", 0x3F9089, 0x0003334 - .incbin "baserom.gba", 0x3FC3BD, 0x0000D3C - .incbin "baserom.gba", 0x3FD0F9, 0x0001DF3 - .incbin "baserom.gba", 0x3FEEEC, 0x0001114 - .incbin "baserom.gba", 0x400000, 0x0000001 - .incbin "baserom.gba", 0x400001, 0x0000003 - .incbin "baserom.gba", 0x400004, 0x0000003 - .incbin "baserom.gba", 0x400007, 0x0000003 - .incbin "baserom.gba", 0x40000A, 0x000001D - .incbin "baserom.gba", 0x400027, 0x0000006 - .incbin "baserom.gba", 0x40002D, 0x0000050 - .incbin "baserom.gba", 0x40007D, 0x0000068 - .incbin "baserom.gba", 0x4000E5, 0x0000001 - .incbin "baserom.gba", 0x4000E6, 0x0000001 - .incbin "baserom.gba", 0x4000E7, 0x0000009 - .incbin "baserom.gba", 0x4000F0, 0x0000004 - .incbin "baserom.gba", 0x4000F4, 0x0000002 - .incbin "baserom.gba", 0x4000F6, 0x0000009 - .incbin "baserom.gba", 0x4000FF, 0x0000001 - .incbin "baserom.gba", 0x400100, 0x0000030 - .incbin "baserom.gba", 0x400130, 0x0000078 - .incbin "baserom.gba", 0x4001A8, 0x000001C - .incbin "baserom.gba", 0x4001C4, 0x0000026 - .incbin "baserom.gba", 0x4001EA, 0x000000E - .incbin "baserom.gba", 0x4001F8, 0x0000219 - .incbin "baserom.gba", 0x400411, 0x0000184 - .incbin "baserom.gba", 0x400595, 0x000005B - .incbin "baserom.gba", 0x4005F0, 0x0000015 - .incbin "baserom.gba", 0x400605, 0x000000B - .incbin "baserom.gba", 0x400610, 0x000002E - .incbin "baserom.gba", 0x40063E, 0x00000C2 - .incbin "baserom.gba", 0x400700, 0x0000010 - .incbin "baserom.gba", 0x400710, 0x0000020 - .incbin "baserom.gba", 0x400730, 0x0000010 - .incbin "baserom.gba", 0x400740, 0x000000A - .incbin "baserom.gba", 0x40074A, 0x0000006 - .incbin "baserom.gba", 0x400750, 0x0000010 - .incbin "baserom.gba", 0x400760, 0x0000080 - .incbin "baserom.gba", 0x4007E0, 0x0000030 - .incbin "baserom.gba", 0x400810, 0x0000014 - .incbin "baserom.gba", 0x400824, 0x0000009 - .incbin "baserom.gba", 0x40082D, 0x0000009 - .incbin "baserom.gba", 0x400836, 0x000000A - .incbin "baserom.gba", 0x400840, 0x000005F - .incbin "baserom.gba", 0x40089F, 0x0000451 - .incbin "baserom.gba", 0x400CF0, 0x0000210 - .incbin "baserom.gba", 0x400F00, 0x0000029 - .incbin "baserom.gba", 0x400F29, 0x0000013 - .incbin "baserom.gba", 0x400F3C, 0x0000008 - .incbin "baserom.gba", 0x400F44, 0x0000195 - .incbin "baserom.gba", 0x4010D9, 0x00001A8 - .incbin "baserom.gba", 0x401281, 0x00000C0 - .incbin "baserom.gba", 0x401341, 0x00007B7 - .incbin "baserom.gba", 0x401AF8, 0x00004C8 - .incbin "baserom.gba", 0x401FC0, 0x0000268 - .incbin "baserom.gba", 0x402228, 0x0000518 - .incbin "baserom.gba", 0x402740, 0x0000501 - .incbin "baserom.gba", 0x402C41, 0x00002C7 - .incbin "baserom.gba", 0x402F08, 0x00003F7 - .incbin "baserom.gba", 0x4032FF, 0x0000011 - .incbin "baserom.gba", 0x403310, 0x0000553 - .incbin "baserom.gba", 0x403863, 0x00007A0 - .incbin "baserom.gba", 0x404003, 0x000001D - .incbin "baserom.gba", 0x404020, 0x00001F0 - .incbin "baserom.gba", 0x404210, 0x0000454 - .incbin "baserom.gba", 0x404664, 0x000039C - .incbin "baserom.gba", 0x404A00, 0x0000568 - .incbin "baserom.gba", 0x404F68, 0x0000298 - .incbin "baserom.gba", 0x405200, 0x0000227 - .incbin "baserom.gba", 0x405427, 0x000061A - .incbin "baserom.gba", 0x405A41, 0x0000614 - .incbin "baserom.gba", 0x406055, 0x00000B3 - .incbin "baserom.gba", 0x406108, 0x000021C - .incbin "baserom.gba", 0x406324, 0x0000854 - .incbin "baserom.gba", 0x406B78, 0x0000107 - .incbin "baserom.gba", 0x406C7F, 0x0000389 - .incbin "baserom.gba", 0x407008, 0x0000C52 - .incbin "baserom.gba", 0x407C5A, 0x00002AD - .incbin "baserom.gba", 0x407F07, 0x00003CA - .incbin "baserom.gba", 0x4082D1, 0x000003D - .incbin "baserom.gba", 0x40830E, 0x000028A - .incbin "baserom.gba", 0x408598, 0x00001A8 - .incbin "baserom.gba", 0x408740, 0x00000C8 - .incbin "baserom.gba", 0x408808, 0x00000FF - .incbin "baserom.gba", 0x408907, 0x000018F - .incbin "baserom.gba", 0x408A96, 0x00001E7 - .incbin "baserom.gba", 0x408C7D, 0x000024A - .incbin "baserom.gba", 0x408EC7, 0x000007C - .incbin "baserom.gba", 0x408F43, 0x00000C7 - .incbin "baserom.gba", 0x40900A, 0x0000155 - .incbin "baserom.gba", 0x40915F, 0x000011B - .incbin "baserom.gba", 0x40927A, 0x00002A3 - .incbin "baserom.gba", 0x40951D, 0x00004F4 - .incbin "baserom.gba", 0x409A11, 0x0000739 - .incbin "baserom.gba", 0x40A14A, 0x000044D - .incbin "baserom.gba", 0x40A597, 0x000036A - .incbin "baserom.gba", 0x40A901, 0x0000189 - .incbin "baserom.gba", 0x40AA8A, 0x000043B - .incbin "baserom.gba", 0x40AEC5, 0x0000074 - .incbin "baserom.gba", 0x40AF39, 0x0000067 - .incbin "baserom.gba", 0x40AFA0, 0x00000DF - .incbin "baserom.gba", 0x40B07F, 0x0000289 - .incbin "baserom.gba", 0x40B308, 0x00002C7 - .incbin "baserom.gba", 0x40B5CF, 0x000007D - .incbin "baserom.gba", 0x40B64C, 0x0000098 - .incbin "baserom.gba", 0x40B6E4, 0x00000D9 - .incbin "baserom.gba", 0x40B7BD, 0x0000243 - .incbin "baserom.gba", 0x40BA00, 0x000073D - .incbin "baserom.gba", 0x40C13D, 0x0000446 - .incbin "baserom.gba", 0x40C583, 0x0000042 - .incbin "baserom.gba", 0x40C5C5, 0x000016E - .incbin "baserom.gba", 0x40C733, 0x0000395 - .incbin "baserom.gba", 0x40CAC8, 0x00000F3 - .incbin "baserom.gba", 0x40CBBB, 0x0000098 - .incbin "baserom.gba", 0x40CC53, 0x000000F - .incbin "baserom.gba", 0x40CC62, 0x0000027 - .incbin "baserom.gba", 0x40CC89, 0x00002DD - .incbin "baserom.gba", 0x40CF66, 0x0000136 - .incbin "baserom.gba", 0x40D09C, 0x00000C1 - .incbin "baserom.gba", 0x40D15D, 0x00001A4 - .incbin "baserom.gba", 0x40D301, 0x000003E - .incbin "baserom.gba", 0x40D33F, 0x00003DA - .incbin "baserom.gba", 0x40D719, 0x00003A3 - .incbin "baserom.gba", 0x40DABC, 0x000004C - .incbin "baserom.gba", 0x40DB08, 0x000006F - .incbin "baserom.gba", 0x40DB77, 0x0000002 - .incbin "baserom.gba", 0x40DB79, 0x00000E6 - .incbin "baserom.gba", 0x40DC5F, 0x000001A - .incbin "baserom.gba", 0x40DC79, 0x00000DE - .incbin "baserom.gba", 0x40DD57, 0x00001F9 - .incbin "baserom.gba", 0x40DF50, 0x0000214 - .incbin "baserom.gba", 0x40E164, 0x0000290 - .incbin "baserom.gba", 0x40E3F4, 0x0000204 - .incbin "baserom.gba", 0x40E5F8, 0x0000098 - .incbin "baserom.gba", 0x40E690, 0x000016F - .incbin "baserom.gba", 0x40E7FF, 0x00000CE - .incbin "baserom.gba", 0x40E8CD, 0x000002E - .incbin "baserom.gba", 0x40E8FB, 0x0000301 - .incbin "baserom.gba", 0x40EBFC, 0x00000FA - .incbin "baserom.gba", 0x40ECF6, 0x0000006 - .incbin "baserom.gba", 0x40ECFC, 0x00000FC - .incbin "baserom.gba", 0x40EDF8, 0x00000FF - .incbin "baserom.gba", 0x40EEF7, 0x0000011 - .incbin "baserom.gba", 0x40EF08, 0x00001D8 - .incbin "baserom.gba", 0x40F0E0, 0x0000018 - .incbin "baserom.gba", 0x40F0F8, 0x000000F - .incbin "baserom.gba", 0x40F107, 0x00001E5 - .incbin "baserom.gba", 0x40F2EC, 0x0000264 - .incbin "baserom.gba", 0x40F550, 0x00000A8 - .incbin "baserom.gba", 0x40F5F8, 0x000013D - .incbin "baserom.gba", 0x40F735, 0x00000C3 - .incbin "baserom.gba", 0x40F7F8, 0x00002FC - .incbin "baserom.gba", 0x40FAF4, 0x0000004 - .incbin "baserom.gba", 0x40FAF8, 0x00000FE - .incbin "baserom.gba", 0x40FBF6, 0x0000002 - .incbin "baserom.gba", 0x40FBF8, 0x0000001 - .incbin "baserom.gba", 0x40FBF9, 0x0000001 - .incbin "baserom.gba", 0x40FBFA, 0x00000FE - .incbin "baserom.gba", 0x40FCF8, 0x0000002 - .incbin "baserom.gba", 0x40FCFA, 0x00000FE - .incbin "baserom.gba", 0x40FDF8, 0x000000F - .incbin "baserom.gba", 0x40FE07, 0x00001E2 - .incbin "baserom.gba", 0x40FFE9, 0x000011E - .incbin "baserom.gba", 0x410107, 0x000090A - .incbin "baserom.gba", 0x410A11, 0x0000808 - .incbin "baserom.gba", 0x411219, 0x00001EB - .incbin "baserom.gba", 0x411404, 0x0001D1C - .incbin "baserom.gba", 0x413120, 0x0000103 - .incbin "baserom.gba", 0x413223, 0x000220F - .incbin "baserom.gba", 0x415432, 0x00003CA - .incbin "baserom.gba", 0x4157FC, 0x0001676 - .incbin "baserom.gba", 0x416E72, 0x00011CE - .incbin "baserom.gba", 0x418040, 0x0000BD0 - .incbin "baserom.gba", 0x418C10, 0x00032F8 - .incbin "baserom.gba", 0x41BF08, 0x0002DD7 - .incbin "baserom.gba", 0x41ECDF, 0x0000319 - .incbin "baserom.gba", 0x41EFF8, 0x00003F8 - .incbin "baserom.gba", 0x41F3F0, 0x000000A - .incbin "baserom.gba", 0x41F3FA, 0x00001F6 - .incbin "baserom.gba", 0x41F5F0, 0x00001FE - .incbin "baserom.gba", 0x41F7EE, 0x000010A - .incbin "baserom.gba", 0x41F8F8, 0x0000100 - .incbin "baserom.gba", 0x41F9F8, 0x0000100 - .incbin "baserom.gba", 0x41FAF8, 0x0000508 - .incbin "baserom.gba", 0x420000, 0x0000092 - .incbin "baserom.gba", 0x420092, 0x00003A5 - .incbin "baserom.gba", 0x420437, 0x0000005 - .incbin "baserom.gba", 0x42043C, 0x0000C91 - .incbin "baserom.gba", 0x4210CD, 0x0000058 - .incbin "baserom.gba", 0x421125, 0x0001004 - .incbin "baserom.gba", 0x422129, 0x0000049 - .incbin "baserom.gba", 0x422172, 0x00007C4 - .incbin "baserom.gba", 0x422936, 0x000039B - .incbin "baserom.gba", 0x422CD1, 0x0001637 - .incbin "baserom.gba", 0x424308, 0x0003B7D - .incbin "baserom.gba", 0x427E85, 0x000017A - .incbin "baserom.gba", 0x427FFF, 0x0002A70 - .incbin "baserom.gba", 0x42AA6F, 0x0001AD6 - .incbin "baserom.gba", 0x42C545, 0x0000D8E - .incbin "baserom.gba", 0x42D2D3, 0x0002730 - .incbin "baserom.gba", 0x42FA03, 0x00005FD - .incbin "baserom.gba", 0x430000, 0x000009A - .incbin "baserom.gba", 0x43009A, 0x0000052 - .incbin "baserom.gba", 0x4300EC, 0x0000044 - .incbin "baserom.gba", 0x430130, 0x00001D0 - .incbin "baserom.gba", 0x430300, 0x0000142 - .incbin "baserom.gba", 0x430442, 0x0000A62 - .incbin "baserom.gba", 0x430EA4, 0x00001F1 - .incbin "baserom.gba", 0x431095, 0x000016E - .incbin "baserom.gba", 0x431203, 0x0000020 - .incbin "baserom.gba", 0x431223, 0x000034D - .incbin "baserom.gba", 0x431570, 0x0000490 - .incbin "baserom.gba", 0x431A00, 0x00009E2 - .incbin "baserom.gba", 0x4323E2, 0x0000E16 - .incbin "baserom.gba", 0x4331F8, 0x000013B - .incbin "baserom.gba", 0x433333, 0x0000001 - .incbin "baserom.gba", 0x433334, 0x0000001 - .incbin "baserom.gba", 0x433335, 0x0000FBC - .incbin "baserom.gba", 0x4342F1, 0x0000663 - .incbin "baserom.gba", 0x434954, 0x0000EAB - .incbin "baserom.gba", 0x4357FF, 0x000055E - .incbin "baserom.gba", 0x435D5D, 0x0000802 - .incbin "baserom.gba", 0x43655F, 0x0001288 - .incbin "baserom.gba", 0x4377E7, 0x0000553 - .incbin "baserom.gba", 0x437D3A, 0x00000DC - .incbin "baserom.gba", 0x437E16, 0x0000099 - .incbin "baserom.gba", 0x437EAF, 0x000014B - .incbin "baserom.gba", 0x437FFA, 0x0007B19 - .incbin "baserom.gba", 0x43FB13, 0x0000495 - .incbin "baserom.gba", 0x43FFA8, 0x0000082 - .incbin "baserom.gba", 0x44002A, 0x00001C2 - .incbin "baserom.gba", 0x4401EC, 0x0000A56 - .incbin "baserom.gba", 0x440C42, 0x00004C0 - .incbin "baserom.gba", 0x441102, 0x000000F - .incbin "baserom.gba", 0x441111, 0x0000101 - .incbin "baserom.gba", 0x441212, 0x0000117 - .incbin "baserom.gba", 0x441329, 0x0000311 - .incbin "baserom.gba", 0x44163A, 0x00001EE - .incbin "baserom.gba", 0x441828, 0x00003FC - .incbin "baserom.gba", 0x441C24, 0x00001DD - .incbin "baserom.gba", 0x441E01, 0x0000322 - .incbin "baserom.gba", 0x442123, 0x000107D - .incbin "baserom.gba", 0x4431A0, 0x0000083 - .incbin "baserom.gba", 0x443223, 0x0000023 - .incbin "baserom.gba", 0x443246, 0x00001C5 - .incbin "baserom.gba", 0x44340B, 0x0000F39 - .incbin "baserom.gba", 0x444344, 0x00000F0 - .incbin "baserom.gba", 0x444434, 0x000000E - .incbin "baserom.gba", 0x444442, 0x0000002 - .incbin "baserom.gba", 0x444444, 0x00000B9 - .incbin "baserom.gba", 0x4444FD, 0x0000097 - .incbin "baserom.gba", 0x444594, 0x0000158 - .incbin "baserom.gba", 0x4446EC, 0x000003B - .incbin "baserom.gba", 0x444727, 0x000051E - .incbin "baserom.gba", 0x444C45, 0x00002A5 - .incbin "baserom.gba", 0x444EEA, 0x0000959 - .incbin "baserom.gba", 0x445843, 0x00003E0 - .incbin "baserom.gba", 0x445C23, 0x0000110 - .incbin "baserom.gba", 0x445D33, 0x00000CD - .incbin "baserom.gba", 0x445E00, 0x0000768 - .incbin "baserom.gba", 0x446568, 0x000190A - .incbin "baserom.gba", 0x447E72, 0x00000A2 - .incbin "baserom.gba", 0x447F14, 0x0000232 - .incbin "baserom.gba", 0x448146, 0x00004BA - .incbin "baserom.gba", 0x448600, 0x000151A - .incbin "baserom.gba", 0x449B1A, 0x00009E6 - .incbin "baserom.gba", 0x44A500, 0x0000E33 - .incbin "baserom.gba", 0x44B333, 0x000211A - .incbin "baserom.gba", 0x44D44D, 0x00003B3 - .incbin "baserom.gba", 0x44D800, 0x0001700 - .incbin "baserom.gba", 0x44EF00, 0x000011F - .incbin "baserom.gba", 0x44F01F, 0x00000D9 - .incbin "baserom.gba", 0x44F0F8, 0x0000A0B - .incbin "baserom.gba", 0x44FB03, 0x000050D - .incbin "baserom.gba", 0x450010, 0x00003F1 - .incbin "baserom.gba", 0x450401, 0x0001D21 - .incbin "baserom.gba", 0x452122, 0x00000FE - .incbin "baserom.gba", 0x452220, 0x0000134 - .incbin "baserom.gba", 0x452354, 0x0000DE1 - .incbin "baserom.gba", 0x453135, 0x00000FF - .incbin "baserom.gba", 0x453234, 0x00001D4 - .incbin "baserom.gba", 0x453408, 0x000001C - .incbin "baserom.gba", 0x453424, 0x00006DC - .incbin "baserom.gba", 0x453B00, 0x00005E5 - .incbin "baserom.gba", 0x4540E5, 0x000034F - .incbin "baserom.gba", 0x454434, 0x000002A - .incbin "baserom.gba", 0x45445E, 0x0000093 - .incbin "baserom.gba", 0x4544F1, 0x0000063 - .incbin "baserom.gba", 0x454554, 0x0000BC2 - .incbin "baserom.gba", 0x455116, 0x0000124 - .incbin "baserom.gba", 0x45523A, 0x00000E9 - .incbin "baserom.gba", 0x455323, 0x0000221 - .incbin "baserom.gba", 0x455544, 0x0000011 - .incbin "baserom.gba", 0x455555, 0x00002B2 - .incbin "baserom.gba", 0x455807, 0x0000E1C - .incbin "baserom.gba", 0x456623, 0x000025B - .incbin "baserom.gba", 0x45687E, 0x000228A - .incbin "baserom.gba", 0x458B08, 0x000323D - .incbin "baserom.gba", 0x45BD45, 0x0000D65 - .incbin "baserom.gba", 0x45CAAA, 0x000075D - .incbin "baserom.gba", 0x45D207, 0x0001127 - .incbin "baserom.gba", 0x45E32E, 0x00001D4 - .incbin "baserom.gba", 0x45E502, 0x0000857 - .incbin "baserom.gba", 0x45ED59, 0x0000181 - .incbin "baserom.gba", 0x45EEDA, 0x0000C1E - .incbin "baserom.gba", 0x45FAF8, 0x0000688 - .incbin "baserom.gba", 0x460180, 0x0000290 - .incbin "baserom.gba", 0x460410, 0x0000D45 - .incbin "baserom.gba", 0x461155, 0x00011F0 - .incbin "baserom.gba", 0x462345, 0x00010C5 - .incbin "baserom.gba", 0x46340A, 0x0001BED - .incbin "baserom.gba", 0x464FF7, 0x0000321 - .incbin "baserom.gba", 0x465318, 0x000012D - .incbin "baserom.gba", 0x465445, 0x0000FC4 - .incbin "baserom.gba", 0x466409, 0x000025B - .incbin "baserom.gba", 0x466664, 0x00003F4 - .incbin "baserom.gba", 0x466A58, 0x00005CC - .incbin "baserom.gba", 0x467024, 0x0001203 - .incbin "baserom.gba", 0x468227, 0x00014C7 - .incbin "baserom.gba", 0x4696EE, 0x0006923 - .incbin "baserom.gba", 0x470011, 0x000000C - .incbin "baserom.gba", 0x47001D, 0x000006B - .incbin "baserom.gba", 0x470088, 0x0000378 - .incbin "baserom.gba", 0x470400, 0x00010EE - .incbin "baserom.gba", 0x4714EE, 0x0000008 - .incbin "baserom.gba", 0x4714F6, 0x0000009 - .incbin "baserom.gba", 0x4714FF, 0x00019D7 - .incbin "baserom.gba", 0x472ED6, 0x00009E1 - .incbin "baserom.gba", 0x4738B7, 0x0000E11 - .incbin "baserom.gba", 0x4746C8, 0x00019FB - .incbin "baserom.gba", 0x4760C3, 0x0009F3E - .incbin "baserom.gba", 0x480001, 0x0000003 - .incbin "baserom.gba", 0x480004, 0x0000103 - .incbin "baserom.gba", 0x480107, 0x00003BB - .incbin "baserom.gba", 0x4804C2, 0x0000346 - .incbin "baserom.gba", 0x480808, 0x0000C67 - .incbin "baserom.gba", 0x48146F, 0x0001C83 - .incbin "baserom.gba", 0x4830F2, 0x0002256 - .incbin "baserom.gba", 0x485348, 0x0001E26 - .incbin "baserom.gba", 0x48716E, 0x0000CE6 - .incbin "baserom.gba", 0x487E54, 0x00081B4 - .incbin "baserom.gba", 0x490008, 0x00001D9 - .incbin "baserom.gba", 0x4901E1, 0x0003368 - .incbin "baserom.gba", 0x493549, 0x0002215 - .incbin "baserom.gba", 0x49575E, 0x0001618 - .incbin "baserom.gba", 0x496D76, 0x0000D00 - .incbin "baserom.gba", 0x497A76, 0x0001EEE - .incbin "baserom.gba", 0x499964, 0x00009E5 - .incbin "baserom.gba", 0x49A349, 0x0005DE7 - .incbin "baserom.gba", 0x4A0130, 0x000026F - .incbin "baserom.gba", 0x4A039F, 0x000171F - .incbin "baserom.gba", 0x4A1ABE, 0x0001344 - .incbin "baserom.gba", 0x4A2E02, 0x00018C6 - .incbin "baserom.gba", 0x4A46C8, 0x0000669 - .incbin "baserom.gba", 0x4A4D31, 0x00019F9 - .incbin "baserom.gba", 0x4A672A, 0x0000A4B - .incbin "baserom.gba", 0x4A7175, 0x0000001 - .incbin "baserom.gba", 0x4A7176, 0x00002F9 - .incbin "baserom.gba", 0x4A746F, 0x00009F9 - .incbin "baserom.gba", 0x4A7E68, 0x0002BFC - .incbin "baserom.gba", 0x4AAA64, 0x0005DE6 - .incbin "baserom.gba", 0x4B084A, 0x0000A8A - .incbin "baserom.gba", 0x4B12D4, 0x00004EA - .incbin "baserom.gba", 0x4B17BE, 0x0000045 - .incbin "baserom.gba", 0x4B1803, 0x00002DD - .incbin "baserom.gba", 0x4B1AE0, 0x0001834 - .incbin "baserom.gba", 0x4B3314, 0x0000F36 - .incbin "baserom.gba", 0x4B424A, 0x00005CA - .incbin "baserom.gba", 0x4B4814, 0x00002DD - .incbin "baserom.gba", 0x4B4AF1, 0x0002782 - .incbin "baserom.gba", 0x4B7273, 0x00048B5 - .incbin "baserom.gba", 0x4BBB28, 0x000064C - .incbin "baserom.gba", 0x4BC174, 0x0003E94 - .incbin "baserom.gba", 0x4C0008, 0x000049A - .incbin "baserom.gba", 0x4C04A2, 0x000046F - .incbin "baserom.gba", 0x4C0911, 0x000003B - .incbin "baserom.gba", 0x4C094C, 0x0001DB4 - .incbin "baserom.gba", 0x4C2700, 0x0002503 - .incbin "baserom.gba", 0x4C4C03, 0x000256A - .incbin "baserom.gba", 0x4C716D, 0x0000E92 - .incbin "baserom.gba", 0x4C7FFF, 0x00020B1 - .incbin "baserom.gba", 0x4CA0B0, 0x0003251 - .incbin "baserom.gba", 0x4CD301, 0x000070A - .incbin "baserom.gba", 0x4CDA0B, 0x00025F5 - .incbin "baserom.gba", 0x4D0000, 0x0000004 - .incbin "baserom.gba", 0x4D0004, 0x0000008 - .incbin "baserom.gba", 0x4D000C, 0x0000008 - .incbin "baserom.gba", 0x4D0014, 0x0000064 - .incbin "baserom.gba", 0x4D0078, 0x000001F - .incbin "baserom.gba", 0x4D0097, 0x0000029 - .incbin "baserom.gba", 0x4D00C0, 0x000036A - .incbin "baserom.gba", 0x4D042A, 0x000002F - .incbin "baserom.gba", 0x4D0459, 0x0000ABD - .incbin "baserom.gba", 0x4D0F16, 0x000232D - .incbin "baserom.gba", 0x4D3243, 0x00042EE - .incbin "baserom.gba", 0x4D7531, 0x0004C1C - .incbin "baserom.gba", 0x4DC14D, 0x0002EB2 - .incbin "baserom.gba", 0x4DEFFF, 0x0001001 - .incbin "baserom.gba", 0x4E0000, 0x0000001 - .incbin "baserom.gba", 0x4E0001, 0x000038F - .incbin "baserom.gba", 0x4E0390, 0x0000D4D - .incbin "baserom.gba", 0x4E10DD, 0x00035EB - .incbin "baserom.gba", 0x4E46C8, 0x0000587 - .incbin "baserom.gba", 0x4E4C4F, 0x00002B8 - .incbin "baserom.gba", 0x4E4F07, 0x0002067 - .incbin "baserom.gba", 0x4E6F6E, 0x00009AA - .incbin "baserom.gba", 0x4E7918, 0x0001C57 - .incbin "baserom.gba", 0x4E956F, 0x0000AC0 - .incbin "baserom.gba", 0x4EA02F, 0x0004ED0 - .incbin "baserom.gba", 0x4EEEFF, 0x00011F6 - .incbin "baserom.gba", 0x4F00F5, 0x0000012 - .incbin "baserom.gba", 0x4F0107, 0x0000747 - .incbin "baserom.gba", 0x4F084E, 0x00006B8 - .incbin "baserom.gba", 0x4F0F06, 0x00010DB - .incbin "baserom.gba", 0x4F1FE1, 0x000206D - .incbin "baserom.gba", 0x4F404E, 0x00010BB - .incbin "baserom.gba", 0x4F5109, 0x0002316 - .incbin "baserom.gba", 0x4F741F, 0x0000B31 - .incbin "baserom.gba", 0x4F7F50, 0x0007FB3 - .incbin "baserom.gba", 0x4FFF03, 0x00000FD - .incbin "baserom.gba", 0x500000, 0x0000002 - .incbin "baserom.gba", 0x500002, 0x0000002 - .incbin "baserom.gba", 0x500004, 0x0000002 - .incbin "baserom.gba", 0x500006, 0x0000001 - .incbin "baserom.gba", 0x500007, 0x0000001 - .incbin "baserom.gba", 0x500008, 0x0000002 - .incbin "baserom.gba", 0x50000A, 0x0000001 - .incbin "baserom.gba", 0x50000B, 0x0000001 - .incbin "baserom.gba", 0x50000C, 0x0000001 - .incbin "baserom.gba", 0x50000D, 0x0000002 - .incbin "baserom.gba", 0x50000F, 0x0000001 - .incbin "baserom.gba", 0x500010, 0x0000001 - .incbin "baserom.gba", 0x500011, 0x0000003 - .incbin "baserom.gba", 0x500014, 0x0000008 - .incbin "baserom.gba", 0x50001C, 0x0000002 - .incbin "baserom.gba", 0x50001E, 0x0000002 - .incbin "baserom.gba", 0x500020, 0x000001C - .incbin "baserom.gba", 0x50003C, 0x0000014 - .incbin "baserom.gba", 0x500050, 0x0000006 - .incbin "baserom.gba", 0x500056, 0x000000B - .incbin "baserom.gba", 0x500061, 0x0000001 - .incbin "baserom.gba", 0x500062, 0x000000A - .incbin "baserom.gba", 0x50006C, 0x0000006 - .incbin "baserom.gba", 0x500072, 0x000004E - .incbin "baserom.gba", 0x5000C0, 0x0000030 - .incbin "baserom.gba", 0x5000F0, 0x0000008 - .incbin "baserom.gba", 0x5000F8, 0x0000007 - .incbin "baserom.gba", 0x5000FF, 0x0000001 - .incbin "baserom.gba", 0x500100, 0x000001C - .incbin "baserom.gba", 0x50011C, 0x0000004 - .incbin "baserom.gba", 0x500120, 0x0000010 - .incbin "baserom.gba", 0x500130, 0x0000038 - .incbin "baserom.gba", 0x500168, 0x0000018 - .incbin "baserom.gba", 0x500180, 0x0000281 - .incbin "baserom.gba", 0x500401, 0x0000042 - .incbin "baserom.gba", 0x500443, 0x0000001 - .incbin "baserom.gba", 0x500444, 0x0000015 - .incbin "baserom.gba", 0x500459, 0x000000A - .incbin "baserom.gba", 0x500463, 0x00001ED - .incbin "baserom.gba", 0x500650, 0x00001B6 - .incbin "baserom.gba", 0x500806, 0x0000001 - .incbin "baserom.gba", 0x500807, 0x0000001 - .incbin "baserom.gba", 0x500808, 0x0000049 - .incbin "baserom.gba", 0x500851, 0x00000CA - .incbin "baserom.gba", 0x50091B, 0x0000036 - .incbin "baserom.gba", 0x500951, 0x0000810 - .incbin "baserom.gba", 0x501161, 0x00001C5 - .incbin "baserom.gba", 0x501326, 0x000042B - .incbin "baserom.gba", 0x501751, 0x00002C0 - .incbin "baserom.gba", 0x501A11, 0x00002EF - .incbin "baserom.gba", 0x501D00, 0x0000208 - .incbin "baserom.gba", 0x501F08, 0x0001259 - .incbin "baserom.gba", 0x503161, 0x00001DB - .incbin "baserom.gba", 0x50333C, 0x0001078 - .incbin "baserom.gba", 0x5043B4, 0x0000050 - .incbin "baserom.gba", 0x504404, 0x00002C4 - .incbin "baserom.gba", 0x5046C8, 0x000016F - .incbin "baserom.gba", 0x504837, 0x0000829 - .incbin "baserom.gba", 0x505060, 0x0002206 - .incbin "baserom.gba", 0x507266, 0x0000D2A - .incbin "baserom.gba", 0x507F90, 0x0001B0F - .incbin "baserom.gba", 0x509A9F, 0x0000573 - .incbin "baserom.gba", 0x50A012, 0x0001117 - .incbin "baserom.gba", 0x50B129, 0x000107F - .incbin "baserom.gba", 0x50C1A8, 0x000059D - .incbin "baserom.gba", 0x50C745, 0x0000A8C - .incbin "baserom.gba", 0x50D1D1, 0x000064D - .incbin "baserom.gba", 0x50D81E, 0x0000F5D - .incbin "baserom.gba", 0x50E77B, 0x0001175 - .incbin "baserom.gba", 0x50F8F0, 0x0000101 - .incbin "baserom.gba", 0x50F9F1, 0x00000FF - .incbin "baserom.gba", 0x50FAF0, 0x0000100 - .incbin "baserom.gba", 0x50FBF0, 0x0000100 - .incbin "baserom.gba", 0x50FCF0, 0x0000100 - .incbin "baserom.gba", 0x50FDF0, 0x00000FD - .incbin "baserom.gba", 0x50FEED, 0x0000001 - .incbin "baserom.gba", 0x50FEEE, 0x0000002 - .incbin "baserom.gba", 0x50FEF0, 0x00000DE - .incbin "baserom.gba", 0x50FFCE, 0x0000022 - .incbin "baserom.gba", 0x50FFF0, 0x0000008 - .incbin "baserom.gba", 0x50FFF8, 0x0000002 - .incbin "baserom.gba", 0x50FFFA, 0x0000002 - .incbin "baserom.gba", 0x50FFFC, 0x0000005 - .incbin "baserom.gba", 0x510001, 0x0000019 - .incbin "baserom.gba", 0x51001A, 0x0000136 - .incbin "baserom.gba", 0x510150, 0x000012C - .incbin "baserom.gba", 0x51027C, 0x00000D4 - .incbin "baserom.gba", 0x510350, 0x0001BE0 - .incbin "baserom.gba", 0x511F30, 0x0000821 - .incbin "baserom.gba", 0x512751, 0x00014F3 - .incbin "baserom.gba", 0x513C44, 0x00002DC - .incbin "baserom.gba", 0x513F20, 0x0001829 - .incbin "baserom.gba", 0x515749, 0x0006DD6 - .incbin "baserom.gba", 0x51C51F, 0x00030C9 - .incbin "baserom.gba", 0x51F5E8, 0x0000808 - .incbin "baserom.gba", 0x51FDF0, 0x00000D9 - .incbin "baserom.gba", 0x51FEC9, 0x00004C9 - .incbin "baserom.gba", 0x520392, 0x0000070 - .incbin "baserom.gba", 0x520402, 0x000004F - .incbin "baserom.gba", 0x520451, 0x00002BF - .incbin "baserom.gba", 0x520710, 0x00004B5 - .incbin "baserom.gba", 0x520BC5, 0x000187F - .incbin "baserom.gba", 0x522444, 0x0002001 - .incbin "baserom.gba", 0x524445, 0x0000121 - .incbin "baserom.gba", 0x524566, 0x000103C - .incbin "baserom.gba", 0x5255A2, 0x0000A64 - .incbin "baserom.gba", 0x526006, 0x0001E2C - .incbin "baserom.gba", 0x527E32, 0x0000112 - .incbin "baserom.gba", 0x527F44, 0x00027BD - .incbin "baserom.gba", 0x52A701, 0x0002A02 - .incbin "baserom.gba", 0x52D103, 0x000304F - .incbin "baserom.gba", 0x530152, 0x00001AE - .incbin "baserom.gba", 0x530300, 0x0000050 - .incbin "baserom.gba", 0x530350, 0x0000FD2 - .incbin "baserom.gba", 0x531322, 0x000099D - .incbin "baserom.gba", 0x531CBF, 0x0000E2D - .incbin "baserom.gba", 0x532AEC, 0x0000979 - .incbin "baserom.gba", 0x533465, 0x00001EE - .incbin "baserom.gba", 0x533653, 0x0000EE3 - .incbin "baserom.gba", 0x534536, 0x0001C1C - .incbin "baserom.gba", 0x536152, 0x0001301 - .incbin "baserom.gba", 0x537453, 0x0008BB1 - .incbin "baserom.gba", 0x540004, 0x00000EC - .incbin "baserom.gba", 0x5400F0, 0x0000100 - .incbin "baserom.gba", 0x5401F0, 0x00010CF - .incbin "baserom.gba", 0x5412BF, 0x0000076 - .incbin "baserom.gba", 0x541335, 0x0001FCE - .incbin "baserom.gba", 0x543303, 0x0000F25 - .incbin "baserom.gba", 0x544228, 0x000003F - .incbin "baserom.gba", 0x544267, 0x000009A - .incbin "baserom.gba", 0x544301, 0x0001365 - .incbin "baserom.gba", 0x545666, 0x0000F00 + .incbin "baserom.gba", 0x345677, 0x0200EEF @ TODO JP differs from here .ifdef JP - .incbin "baserom_jp.gba", 0x546192, 0x5C98E + .incbin "baserom_jp.gba", 0x546192, 0x005C98E .else @ TODO JP differs from here .ifdef DEMO_JP - .incbin "baserom_jp.gba", 0x546192, 0x5C98E + .incbin "baserom_jp.gba", 0x546192, 0x005C98E .else - .incbin "baserom.gba", 0x546566, 0x00019E4 - .incbin "baserom.gba", 0x547F4A, 0x000092C - .incbin "baserom.gba", 0x548876, 0x0004666 - .incbin "baserom.gba", 0x54CEDC, 0x0001011 - .incbin "baserom.gba", 0x54DEED, 0x0002114 - .incbin "baserom.gba", 0x550001, 0x0000003 - .incbin "baserom.gba", 0x550004, 0x000000C - .incbin "baserom.gba", 0x550010, 0x0000044 - .incbin "baserom.gba", 0x550054, 0x0000400 - .incbin "baserom.gba", 0x550454, 0x00004FD - .incbin "baserom.gba", 0x550951, 0x00013BF - .incbin "baserom.gba", 0x551D10, 0x0000513 - .incbin "baserom.gba", 0x552223, 0x00001E5 - .incbin "baserom.gba", 0x552408, 0x0001C4C - .incbin "baserom.gba", 0x554054, 0x0000200 - .incbin "baserom.gba", 0x554254, 0x0000002 - .incbin "baserom.gba", 0x554256, 0x00001AD - .incbin "baserom.gba", 0x554403, 0x0000042 - .incbin "baserom.gba", 0x554445, 0x0000630 - .incbin "baserom.gba", 0x554A75, 0x00008AF - .incbin "baserom.gba", 0x555324, 0x0000231 - .incbin "baserom.gba", 0x555555, 0x000000D - .incbin "baserom.gba", 0x555562, 0x0000503 - .incbin "baserom.gba", 0x555A65, 0x0000BAB - .incbin "baserom.gba", 0x556610, 0x000022B - .incbin "baserom.gba", 0x55683B, 0x0000519 - .incbin "baserom.gba", 0x556D54, 0x0000183 - .incbin "baserom.gba", 0x556ED7, 0x0000435 - .incbin "baserom.gba", 0x55730C, 0x0000A4F - .incbin "baserom.gba", 0x557D5B, 0x00014A7 - .incbin "baserom.gba", 0x559202, 0x0005428 - .incbin "baserom.gba", 0x55E62A, 0x0000260 - .incbin "baserom.gba", 0x55E88A, 0x000177E - .incbin "baserom.gba", 0x560008, 0x00000FF - .incbin "baserom.gba", 0x560107, 0x0000258 - .incbin "baserom.gba", 0x56035F, 0x000154E - .incbin "baserom.gba", 0x5618AD, 0x0001BA9 - .incbin "baserom.gba", 0x563456, 0x00008BA - .incbin "baserom.gba", 0x563D10, 0x000071B - .incbin "baserom.gba", 0x56442B, 0x00002D5 - .incbin "baserom.gba", 0x564700, 0x0000C1F - .incbin "baserom.gba", 0x56531F, 0x0000314 - .incbin "baserom.gba", 0x565633, 0x0000F1E - .incbin "baserom.gba", 0x566551, 0x00000D1 - .incbin "baserom.gba", 0x566622, 0x0000DF3 - .incbin "baserom.gba", 0x567415, 0x0000C02 - .incbin "baserom.gba", 0x568017, 0x0000031 - .incbin "baserom.gba", 0x568048, 0x00060DB - .incbin "baserom.gba", 0x56E123, 0x0001EEE - .incbin "baserom.gba", 0x570011, 0x00018E0 - .incbin "baserom.gba", 0x5718F1, 0x000071F - .incbin "baserom.gba", 0x572010, 0x0000679 - .incbin "baserom.gba", 0x572689, 0x0000795 - .incbin "baserom.gba", 0x572E1E, 0x000123A - .incbin "baserom.gba", 0x574058, 0x00021CC - .incbin "baserom.gba", 0x576224, 0x0001408 - .incbin "baserom.gba", 0x57762C, 0x000135B - .incbin "baserom.gba", 0x578987, 0x00036CB - .incbin "baserom.gba", 0x57C052, 0x0003724 - .incbin "baserom.gba", 0x57F776, 0x000088A - .incbin "baserom.gba", 0x580000, 0x0000008 - .incbin "baserom.gba", 0x580008, 0x000003E - .incbin "baserom.gba", 0x580046, 0x0000030 - .incbin "baserom.gba", 0x580076, 0x0000030 - .incbin "baserom.gba", 0x5800A6, 0x00000AC - .incbin "baserom.gba", 0x580152, 0x0000306 - .incbin "baserom.gba", 0x580458, 0x00003B0 - .incbin "baserom.gba", 0x580808, 0x000004F - .incbin "baserom.gba", 0x580857, 0x0006E11 - .incbin "baserom.gba", 0x587668, 0x00007F9 - .incbin "baserom.gba", 0x587E61, 0x00081A0 - .incbin "baserom.gba", 0x590001, 0x00000F1 - .incbin "baserom.gba", 0x5900F2, 0x00007EF - .incbin "baserom.gba", 0x5908E1, 0x0000CC9 - .incbin "baserom.gba", 0x5915AA, 0x00081CD - .incbin "baserom.gba", 0x599777, 0x000184D - .incbin "baserom.gba", 0x59AFC4, 0x000503C - .incbin "baserom.gba", 0x5A0000, 0x0000001 - .incbin "baserom.gba", 0x5A0001, 0x0000001 - .incbin "baserom.gba", 0x5A0002, 0x0000006 - .incbin "baserom.gba", 0x5A0008, 0x0000002 - .incbin "baserom.gba", 0x5A000A, 0x0000002 - .incbin "baserom.gba", 0x5A000C, 0x0000003 - .incbin "baserom.gba", 0x5A000F, 0x0000009 - .incbin "baserom.gba", 0x5A0018, 0x0000006 - .incbin "baserom.gba", 0x5A001E, 0x0000001 - .incbin "baserom.gba", 0x5A001F, 0x000001D - .incbin "baserom.gba", 0x5A003C, 0x000001A - .incbin "baserom.gba", 0x5A0056, 0x0000008 - .incbin "baserom.gba", 0x5A005E, 0x0000033 - .incbin "baserom.gba", 0x5A0091, 0x000005F - .incbin "baserom.gba", 0x5A00F0, 0x0000211 - .incbin "baserom.gba", 0x5A0301, 0x0000100 - .incbin "baserom.gba", 0x5A0401, 0x0000033 - .incbin "baserom.gba", 0x5A0434, 0x000000F - .incbin "baserom.gba", 0x5A0443, 0x0000006 - .incbin "baserom.gba", 0x5A0449, 0x000001A - .incbin "baserom.gba", 0x5A0463, 0x0000001 - .incbin "baserom.gba", 0x5A0464, 0x00003A2 - .incbin "baserom.gba", 0x5A0806, 0x000267A + .incbin "baserom.gba", 0x546566, 0x005C91A .endif .endif @@ -5695,55 +2897,20 @@ gUnk_08324AE4:: @ 08324AE4 @ TODO JP and EU differ to here gGlobalGfxAndPalettes:: @ 085A2E80 - .incbin "baserom.gba", 0x5A2E80, 0x0001382 - .incbin "baserom.gba", 0x5A4202, 0x0001CED - .incbin "baserom.gba", 0x5A5EEF, 0x0000037 - .incbin "baserom.gba", 0x5A5F26, 0x00013FA + .incbin "baserom.gba", 0x5A2E80, 0x00044A0 gUnk_085A7320:: @ 085A7320 .incbin "baserom.gba", 0x5A7320, 0x0002480 gUnk_085A97A0:: @ 085A97A0 - .incbin "baserom.gba", 0x5A97A0, 0x0000CA1 - .incbin "baserom.gba", 0x5AA441, 0x0002B76 - .incbin "baserom.gba", 0x5ACFB7, 0x0002FA5 - .incbin "baserom.gba", 0x5AFF5C, 0x000001C - .incbin "baserom.gba", 0x5AFF78, 0x0000058 - .incbin "baserom.gba", 0x5AFFD0, 0x0000030 - .incbin "baserom.gba", 0x5B0000, 0x0000006 - .incbin "baserom.gba", 0x5B0006, 0x0000004 - .incbin "baserom.gba", 0x5B000A, 0x0000002 - .incbin "baserom.gba", 0x5B000C, 0x0000002 - .incbin "baserom.gba", 0x5B000E, 0x000000E - .incbin "baserom.gba", 0x5B001C, 0x0000002 - .incbin "baserom.gba", 0x5B001E, 0x0000006 - .incbin "baserom.gba", 0x5B0024, 0x0000012 - .incbin "baserom.gba", 0x5B0036, 0x0000006 - .incbin "baserom.gba", 0x5B003C, 0x000000C - .incbin "baserom.gba", 0x5B0048, 0x000000C - .incbin "baserom.gba", 0x5B0054, 0x0000004 - .incbin "baserom.gba", 0x5B0058, 0x000000C - .incbin "baserom.gba", 0x5B0064, 0x0000001 - .incbin "baserom.gba", 0x5B0065, 0x000000F - .incbin "baserom.gba", 0x5B0074, 0x0000060 - .incbin "baserom.gba", 0x5B00D4, 0x0000026 - .incbin "baserom.gba", 0x5B00FA, 0x0000308 - .incbin "baserom.gba", 0x5B0402, 0x0000032 - .incbin "baserom.gba", 0x5B0434, 0x0000015 - .incbin "baserom.gba", 0x5B0449, 0x000001A - .incbin "baserom.gba", 0x5B0463, 0x0000001 - .incbin "baserom.gba", 0x5B0464, 0x00003A2 - .incbin "baserom.gba", 0x5B0806, 0x0000001 - .incbin "baserom.gba", 0x5B0807, 0x000088D - .incbin "baserom.gba", 0x5B1094, 0x00030EC + .incbin "baserom.gba", 0x5A97A0, 0x000A9E0 gUnk_085B4180:: @ 085B4180 .ifdef EU @TODO differs to .incbin "baserom_eu.gba", 0x5B36D0, 0x0001D00 .else - .incbin "baserom.gba", 0x5B4180, 0x0000EB5 - .incbin "baserom.gba", 0x5B5035, 0x0000E8B + .incbin "baserom.gba", 0x5B4180, 0x0001D40 .endif @ TODO figurine Data @@ -5763,8 +2930,7 @@ gUnk_085B6240:: @ 085B6240 .incbin "baserom.gba", 0x5B6240, 0x00000E0 gUnk_085B6320:: @ 085B6320 - .incbin "baserom.gba", 0x5B6320, 0x0000013 - .incbin "baserom.gba", 0x5B6333, 0x00000CD + .incbin "baserom.gba", 0x5B6320, 0x00000E0 gUnk_085B6400:: @ 085B6400 .incbin "baserom.gba", 0x5B6400, 0x00000E0 @@ -5803,8 +2969,7 @@ gUnk_085B6DA0:: @ 085B6DA0 .incbin "baserom.gba", 0x5B6DA0, 0x00000E0 gUnk_085B6E80:: @ 085B6E80 - .incbin "baserom.gba", 0x5B6E80, 0x00000C6 - .incbin "baserom.gba", 0x5B6F46, 0x000001A + .incbin "baserom.gba", 0x5B6E80, 0x00000E0 gUnk_085B6F60:: @ 085B6F60 .incbin "baserom.gba", 0x5B6F60, 0x00000E0 @@ -6149,8 +3314,7 @@ gUnk_085BD280:: @ 085BD280 .incbin "baserom.gba", 0x5BD280, 0x00000E0 gUnk_085BD360:: @ 085BD360 - .incbin "baserom.gba", 0x5BD360, 0x00000A4 - .incbin "baserom.gba", 0x5BD404, 0x000003C + .incbin "baserom.gba", 0x5BD360, 0x00000E0 gUnk_085BD440:: @ 085BD440 .incbin "baserom.gba", 0x5BD440, 0x00000E0 @@ -6162,19 +3326,7 @@ gUnk_085BD520:: @ 085BD520 .incbin "graphics/intro/capcom.gbapal" .incbin "graphics/intro/nintendo.gbapal" - .incbin "baserom.gba", 0x5BD660, 0x0002898 - .incbin "baserom.gba", 0x5BFEF8, 0x000002E - .incbin "baserom.gba", 0x5BFF26, 0x00000AE - .incbin "baserom.gba", 0x5BFFD4, 0x0000024 - .incbin "baserom.gba", 0x5BFFF8, 0x0000007 - .incbin "baserom.gba", 0x5BFFFF, 0x000081D - .incbin "baserom.gba", 0x5C081C, 0x0001163 - .incbin "baserom.gba", 0x5C197F, 0x00003D1 - .incbin "baserom.gba", 0x5C1D50, 0x0000A0C - .incbin "baserom.gba", 0x5C275C, 0x0000AD6 - .incbin "baserom.gba", 0x5C3232, 0x00008CE - .incbin "baserom.gba", 0x5C3B00, 0x0000438 - .incbin "baserom.gba", 0x5C3F38, 0x00006E8 + .incbin "baserom.gba", 0x5BD660, 0x0006FC0 gUnk_085C4620:: @ 085C4620 .incbin "baserom.gba", 0x5C4620, 0x0000500 @@ -6192,273 +3344,17 @@ gUnk_085C4F20:: @ 085C4F20 .incbin "baserom.gba", 0x5C4F20, 0x00000C0 gUnk_085C4FE0:: @ 085C4FE0 - .incbin "baserom.gba", 0x5C4FE0, 0x000B021 - .incbin "baserom.gba", 0x5D0001, 0x0000106 - .incbin "baserom.gba", 0x5D0107, 0x0000055 - .incbin "baserom.gba", 0x5D015C, 0x000045B - .incbin "baserom.gba", 0x5D05B7, 0x00003A6 - .incbin "baserom.gba", 0x5D095D, 0x0001E00 - .incbin "baserom.gba", 0x5D275D, 0x00009A3 - .incbin "baserom.gba", 0x5D3100, 0x000DC31 - .incbin "baserom.gba", 0x5E0D31, 0x00045BC - .incbin "baserom.gba", 0x5E52ED, 0x0004D8F - .incbin "baserom.gba", 0x5EA07C, 0x0005F84 - .incbin "baserom.gba", 0x5F0000, 0x0000006 - .incbin "baserom.gba", 0x5F0006, 0x0000002 - .incbin "baserom.gba", 0x5F0008, 0x0000002 - .incbin "baserom.gba", 0x5F000A, 0x0000011 - .incbin "baserom.gba", 0x5F001B, 0x0000003 - .incbin "baserom.gba", 0x5F001E, 0x000001E - .incbin "baserom.gba", 0x5F003C, 0x0000036 - .incbin "baserom.gba", 0x5F0072, 0x0000006 - .incbin "baserom.gba", 0x5F0078, 0x0000014 - .incbin "baserom.gba", 0x5F008C, 0x0000376 - .incbin "baserom.gba", 0x5F0402, 0x0000032 - .incbin "baserom.gba", 0x5F0434, 0x000000F - .incbin "baserom.gba", 0x5F0443, 0x0000008 - .incbin "baserom.gba", 0x5F044B, 0x000000E - .incbin "baserom.gba", 0x5F0459, 0x0000005 - .incbin "baserom.gba", 0x5F045E, 0x00003A9 - .incbin "baserom.gba", 0x5F0807, 0x0000057 - .incbin "baserom.gba", 0x5F085E, 0x000F259 - .incbin "baserom.gba", 0x5FFAB7, 0x0000050 - .incbin "baserom.gba", 0x5FFB07, 0x00004F8 - .incbin "baserom.gba", 0x5FFFFF, 0x0000001 - .incbin "baserom.gba", 0x600000, 0x0000001 - .incbin "baserom.gba", 0x600001, 0x0000005 - .incbin "baserom.gba", 0x600006, 0x00000E3 - .incbin "baserom.gba", 0x6000E9, 0x0000237 - .incbin "baserom.gba", 0x600320, 0x0000314 - .incbin "baserom.gba", 0x600634, 0x00000FC - .incbin "baserom.gba", 0x600730, 0x00000D8 - .incbin "baserom.gba", 0x600808, 0x0003458 - .incbin "baserom.gba", 0x603C60, 0x000177E - .incbin "baserom.gba", 0x6053DE, 0x0000421 - .incbin "baserom.gba", 0x6057FF, 0x0000F04 - .incbin "baserom.gba", 0x606703, 0x0000750 - .incbin "baserom.gba", 0x606E53, 0x00010AD - .incbin "baserom.gba", 0x607F00, 0x0000052 - .incbin "baserom.gba", 0x607F52, 0x00009AE - .incbin "baserom.gba", 0x608900, 0x0005BEA - .incbin "baserom.gba", 0x60E4EA, 0x0000D01 - .incbin "baserom.gba", 0x60F1EB, 0x0000405 - .incbin "baserom.gba", 0x60F5F0, 0x0000300 - .incbin "baserom.gba", 0x60F8F0, 0x000006B - .incbin "baserom.gba", 0x60F95B, 0x00003A8 - .incbin "baserom.gba", 0x60FD03, 0x00002FD - .incbin "baserom.gba", 0x610000, 0x0000002 - .incbin "baserom.gba", 0x610002, 0x0000002 - .incbin "baserom.gba", 0x610004, 0x0000001 - .incbin "baserom.gba", 0x610005, 0x0000001 - .incbin "baserom.gba", 0x610006, 0x0000001 - .incbin "baserom.gba", 0x610007, 0x0000001 - .incbin "baserom.gba", 0x610008, 0x0000002 - .incbin "baserom.gba", 0x61000A, 0x0000001 - .incbin "baserom.gba", 0x61000B, 0x0000004 - .incbin "baserom.gba", 0x61000F, 0x0000004 - .incbin "baserom.gba", 0x610013, 0x0000001 - .incbin "baserom.gba", 0x610014, 0x000000A - .incbin "baserom.gba", 0x61001E, 0x0000002 - .incbin "baserom.gba", 0x610020, 0x0000006 - .incbin "baserom.gba", 0x610026, 0x000000A - .incbin "baserom.gba", 0x610030, 0x000000C - .incbin "baserom.gba", 0x61003C, 0x0000004 - .incbin "baserom.gba", 0x610040, 0x000000A - .incbin "baserom.gba", 0x61004A, 0x0000006 - .incbin "baserom.gba", 0x610050, 0x0000008 - .incbin "baserom.gba", 0x610058, 0x0000002 - .incbin "baserom.gba", 0x61005A, 0x0000002 - .incbin "baserom.gba", 0x61005C, 0x0000004 - .incbin "baserom.gba", 0x610060, 0x0000008 - .incbin "baserom.gba", 0x610068, 0x000000E - .incbin "baserom.gba", 0x610076, 0x0000002 - .incbin "baserom.gba", 0x610078, 0x0000008 - .incbin "baserom.gba", 0x610080, 0x0000010 - .incbin "baserom.gba", 0x610090, 0x0000008 - .incbin "baserom.gba", 0x610098, 0x0000010 - .incbin "baserom.gba", 0x6100A8, 0x0000010 - .incbin "baserom.gba", 0x6100B8, 0x0000048 - .incbin "baserom.gba", 0x610100, 0x0000008 - .incbin "baserom.gba", 0x610108, 0x0000014 - .incbin "baserom.gba", 0x61011C, 0x0000008 - .incbin "baserom.gba", 0x610124, 0x000001C - .incbin "baserom.gba", 0x610140, 0x0000008 - .incbin "baserom.gba", 0x610148, 0x0000020 - .incbin "baserom.gba", 0x610168, 0x0000018 - .incbin "baserom.gba", 0x610180, 0x0000030 - .incbin "baserom.gba", 0x6101B0, 0x0000010 - .incbin "baserom.gba", 0x6101C0, 0x0000008 - .incbin "baserom.gba", 0x6101C8, 0x0000040 - .incbin "baserom.gba", 0x610208, 0x0000020 - .incbin "baserom.gba", 0x610228, 0x0000010 - .incbin "baserom.gba", 0x610238, 0x0000028 - .incbin "baserom.gba", 0x610260, 0x0000010 - .incbin "baserom.gba", 0x610270, 0x0000008 - .incbin "baserom.gba", 0x610278, 0x0000010 - .incbin "baserom.gba", 0x610288, 0x0000080 - .incbin "baserom.gba", 0x610308, 0x0000018 - .incbin "baserom.gba", 0x610320, 0x0000008 - .incbin "baserom.gba", 0x610328, 0x0000008 - .incbin "baserom.gba", 0x610330, 0x0000008 - .incbin "baserom.gba", 0x610338, 0x0000010 - .incbin "baserom.gba", 0x610348, 0x0000018 - .incbin "baserom.gba", 0x610360, 0x0000038 - .incbin "baserom.gba", 0x610398, 0x0000069 - .incbin "baserom.gba", 0x610401, 0x0000001 - .incbin "baserom.gba", 0x610402, 0x0000041 - .incbin "baserom.gba", 0x610443, 0x0000001 - .incbin "baserom.gba", 0x610444, 0x0000015 - .incbin "baserom.gba", 0x610459, 0x0000057 - .incbin "baserom.gba", 0x6104B0, 0x0000300 - .incbin "baserom.gba", 0x6107B0, 0x0000055 - .incbin "baserom.gba", 0x610805, 0x0000001 - .incbin "baserom.gba", 0x610806, 0x0000001 - .incbin "baserom.gba", 0x610807, 0x0000059 - .incbin "baserom.gba", 0x610860, 0x000059E - .incbin "baserom.gba", 0x610DFE, 0x0002212 - .incbin "baserom.gba", 0x613010, 0x0000334 - .incbin "baserom.gba", 0x613344, 0x00065DE - .incbin "baserom.gba", 0x619922, 0x00006DE - .incbin "baserom.gba", 0x61A000, 0x0000BCC - .incbin "baserom.gba", 0x61ABCC, 0x0001181 - .incbin "baserom.gba", 0x61BD4D, 0x0005403 - .incbin "baserom.gba", 0x621150, 0x00010D5 - .incbin "baserom.gba", 0x622225, 0x0000020 - .incbin "baserom.gba", 0x622245, 0x00001C2 - .incbin "baserom.gba", 0x622407, 0x000203A - .incbin "baserom.gba", 0x624441, 0x000A521 - .incbin "baserom.gba", 0x62E962, 0x00016E1 - .incbin "baserom.gba", 0x630043, 0x00000ED - .incbin "baserom.gba", 0x630130, 0x0000312 - .incbin "baserom.gba", 0x630442, 0x0000120 - .incbin "baserom.gba", 0x630562, 0x00001B0 - .incbin "baserom.gba", 0x630712, 0x0000150 - .incbin "baserom.gba", 0x630862, 0x0005CC3 - .incbin "baserom.gba", 0x636525, 0x0002D5C - .incbin "baserom.gba", 0x639281, 0x0006E86 - .incbin "baserom.gba", 0x640107, 0x0000219 - .incbin "baserom.gba", 0x640320, 0x0000123 - .incbin "baserom.gba", 0x640443, 0x0000B9E - .incbin "baserom.gba", 0x640FE1, 0x0001296 - .incbin "baserom.gba", 0x642277, 0x000218C - .incbin "baserom.gba", 0x644403, 0x000081C - .incbin "baserom.gba", 0x644C1F, 0x0000914 - .incbin "baserom.gba", 0x645533, 0x0000003 - .incbin "baserom.gba", 0x645536, 0x00001EF + .incbin "baserom.gba", 0x5C4FE0, 0x0080745 .ifdef EU @ TODO differs to gUnk_086926A0 .incbin "baserom_eu.gba", 0x644C35, 0x004D23B .else - .incbin "baserom.gba", 0x645725, 0x0005330 - .incbin "baserom.gba", 0x64AA55, 0x00041B3 - .incbin "baserom.gba", 0x64EC08, 0x00013F9 - .incbin "baserom.gba", 0x650001, 0x000000F - .incbin "baserom.gba", 0x650010, 0x0000030 - .incbin "baserom.gba", 0x650040, 0x0000100 - .incbin "baserom.gba", 0x650140, 0x00002C0 - .incbin "baserom.gba", 0x650400, 0x0000064 - .incbin "baserom.gba", 0x650464, 0x000069C - .incbin "baserom.gba", 0x650B00, 0x0000400 - .incbin "baserom.gba", 0x650F00, 0x0000003 - .incbin "baserom.gba", 0x650F03, 0x000131F - .incbin "baserom.gba", 0x652222, 0x00009F6 - .incbin "baserom.gba", 0x652C18, 0x00006FC - .incbin "baserom.gba", 0x653314, 0x00004EC - .incbin "baserom.gba", 0x653800, 0x0001E43 - .incbin "baserom.gba", 0x655643, 0x0002017 - .incbin "baserom.gba", 0x65765A, 0x00017AA - .incbin "baserom.gba", 0x658E04, 0x000581F - .incbin "baserom.gba", 0x65E623, 0x00019DD - .incbin "baserom.gba", 0x660000, 0x0000006 - .incbin "baserom.gba", 0x660006, 0x00002FA - .incbin "baserom.gba", 0x660300, 0x00002B7 - .incbin "baserom.gba", 0x6605B7, 0x00002AF - .incbin "baserom.gba", 0x660866, 0x00012AA - .incbin "baserom.gba", 0x661B10, 0x0000400 - .incbin "baserom.gba", 0x661F10, 0x0000972 - .incbin "baserom.gba", 0x662882, 0x0000BC1 - .incbin "baserom.gba", 0x663443, 0x0000F4D - .incbin "baserom.gba", 0x664390, 0x000003C - .incbin "baserom.gba", 0x6643CC, 0x0000067 - .incbin "baserom.gba", 0x664433, 0x0000F11 - .incbin "baserom.gba", 0x665344, 0x0000223 - .incbin "baserom.gba", 0x665567, 0x0000DCD - .incbin "baserom.gba", 0x666334, 0x000021F - .incbin "baserom.gba", 0x666553, 0x00000AE - .incbin "baserom.gba", 0x666601, 0x0000021 - .incbin "baserom.gba", 0x666622, 0x0000044 - .incbin "baserom.gba", 0x666666, 0x0000117 - .incbin "baserom.gba", 0x66677D, 0x00000A6 - .incbin "baserom.gba", 0x666823, 0x0000DF3 - .incbin "baserom.gba", 0x667616, 0x0000151 - .incbin "baserom.gba", 0x667767, 0x0000748 - .incbin "baserom.gba", 0x667EAF, 0x0000151 - .incbin "baserom.gba", 0x668000, 0x0001999 - .incbin "baserom.gba", 0x669999, 0x000056F - .incbin "baserom.gba", 0x669F08, 0x0000541 - .incbin "baserom.gba", 0x66A449, 0x000185C - .incbin "baserom.gba", 0x66BCA5, 0x0000292 - .incbin "baserom.gba", 0x66BF37, 0x00023CC - .incbin "baserom.gba", 0x66E303, 0x0000F20 - .incbin "baserom.gba", 0x66F223, 0x0000DDD - .incbin "baserom.gba", 0x670000, 0x0000001 - .incbin "baserom.gba", 0x670001, 0x0000001 - .incbin "baserom.gba", 0x670002, 0x0000002 - .incbin "baserom.gba", 0x670004, 0x0000002 - .incbin "baserom.gba", 0x670006, 0x0000001 - .incbin "baserom.gba", 0x670007, 0x0000001 - .incbin "baserom.gba", 0x670008, 0x0000002 - .incbin "baserom.gba", 0x67000A, 0x0000001 - .incbin "baserom.gba", 0x67000B, 0x0000004 - .incbin "baserom.gba", 0x67000F, 0x0000001 - .incbin "baserom.gba", 0x670010, 0x0000001 - .incbin "baserom.gba", 0x670011, 0x0000003 - .incbin "baserom.gba", 0x670014, 0x0000004 - .incbin "baserom.gba", 0x670018, 0x0000024 - .incbin "baserom.gba", 0x67003C, 0x000005A - .incbin "baserom.gba", 0x670096, 0x0000002 - .incbin "baserom.gba", 0x670098, 0x0000128 - .incbin "baserom.gba", 0x6701C0, 0x0000018 - .incbin "baserom.gba", 0x6701D8, 0x0000020 - .incbin "baserom.gba", 0x6701F8, 0x0000028 - .incbin "baserom.gba", 0x670220, 0x0000138 - .incbin "baserom.gba", 0x670358, 0x00000A9 - .incbin "baserom.gba", 0x670401, 0x0000043 - .incbin "baserom.gba", 0x670444, 0x0000015 - .incbin "baserom.gba", 0x670459, 0x00003AE - .incbin "baserom.gba", 0x670807, 0x0000B4F - .incbin "baserom.gba", 0x671356, 0x0002875 - .incbin "baserom.gba", 0x673BCB, 0x0000036 - .incbin "baserom.gba", 0x673C01, 0x0001495 - .incbin "baserom.gba", 0x675096, 0x000016A - .incbin "baserom.gba", 0x675200, 0x0003688 - .incbin "baserom.gba", 0x678888, 0x000010F - .incbin "baserom.gba", 0x678997, 0x0001960 - .incbin "baserom.gba", 0x67A2F7, 0x0002C5C - .incbin "baserom.gba", 0x67CF53, 0x00030AD - .incbin "baserom.gba", 0x680000, 0x00000FF - .incbin "baserom.gba", 0x6800FF, 0x0000768 - .incbin "baserom.gba", 0x680867, 0x0000001 - .incbin "baserom.gba", 0x680868, 0x0004CEE - .incbin "baserom.gba", 0x685556, 0x00032C9 - .incbin "baserom.gba", 0x68881F, 0x000004B - .incbin "baserom.gba", 0x68886A, 0x0007796 - .incbin "baserom.gba", 0x690000, 0x0000868 - .incbin "baserom.gba", 0x690868, 0x0000FDA - .incbin "baserom.gba", 0x691842, 0x0000CF8 - .incbin "baserom.gba", 0x69253A, 0x0000040 - .incbin "baserom.gba", 0x69257A, 0x0000060 - .incbin "baserom.gba", 0x6925DA, 0x0000040 - .incbin "baserom.gba", 0x69261A, 0x0000086 + .incbin "baserom.gba", 0x645725, 0x004CF7B .endif gUnk_086926A0:: @ 086926A0 - .incbin "baserom.gba", 0x6926A0, 0x000001A - .incbin "baserom.gba", 0x6926BA, 0x0000090 - .incbin "baserom.gba", 0x69274A, 0x0000009 - .incbin "baserom.gba", 0x692753, 0x0000006 - .incbin "baserom.gba", 0x692759, 0x0000027 + .incbin "baserom.gba", 0x6926A0, 0x00000E0 gUnk_08692780:: @ 08692780 .incbin "baserom.gba", 0x692780, 0x00000E0 @@ -6482,8 +3378,7 @@ gUnk_08692CC0:: @ 08692CC0 .incbin "baserom.gba", 0x692CC0, 0x00000E0 gUnk_08692DA0:: @ 08692DA0 - .incbin "baserom.gba", 0x692DA0, 0x0000062 - .incbin "baserom.gba", 0x692E02, 0x000007E + .incbin "baserom.gba", 0x692DA0, 0x00000E0 gUnk_08692E80:: @ 08692E80 .incbin "baserom.gba", 0x692E80, 0x00000E0 @@ -6506,487 +3401,26 @@ gUnk_086A2A60:: @ 086A2A60 .incbin "baserom.gba", 0x6A2A60, 0x0000480 gUnk_086A2EE0:: @ 086A2EE0 - .incbin "baserom.gba", 0x6A2EE0, 0x0001423 - .incbin "baserom.gba", 0x6A4303, 0x0000C03 - .incbin "baserom.gba", 0x6A4F06, 0x000281C - .incbin "baserom.gba", 0x6A7722, 0x0000268 - .incbin "baserom.gba", 0x6A798A, 0x0002DEE - .incbin "baserom.gba", 0x6AA778, 0x00002F0 - .incbin "baserom.gba", 0x6AAA68, 0x0000478 + .incbin "baserom.gba", 0x6A2EE0, 0x0008000 gUnk_086AAEE0:: @ 086AAEE0 - .incbin "baserom.gba", 0x6AAEE0, 0x0004EC7 - .incbin "baserom.gba", 0x6AFDA7, 0x0000272 - .incbin "baserom.gba", 0x6B0019, 0x000002C - .incbin "baserom.gba", 0x6B0045, 0x00000C2 - .incbin "baserom.gba", 0x6B0107, 0x0000763 - .incbin "baserom.gba", 0x6B086A, 0x0001070 - .incbin "baserom.gba", 0x6B18DA, 0x000028A - .incbin "baserom.gba", 0x6B1B64, 0x00003AC - .incbin "baserom.gba", 0x6B1F10, 0x0000F0D - .incbin "baserom.gba", 0x6B2E1D, 0x00073E9 - .incbin "baserom.gba", 0x6BA206, 0x0005E00 - .incbin "baserom.gba", 0x6C0006, 0x00046C2 - .incbin "baserom.gba", 0x6C46C8, 0x00025A5 - .incbin "baserom.gba", 0x6C6C6D, 0x000605F - .incbin "baserom.gba", 0x6CCCCC, 0x0003336 - .incbin "baserom.gba", 0x6D0002, 0x000001C - .incbin "baserom.gba", 0x6D001E, 0x000013B - .incbin "baserom.gba", 0x6D0159, 0x0000013 - .incbin "baserom.gba", 0x6D016C, 0x0000300 - .incbin "baserom.gba", 0x6D046C, 0x000039A - .incbin "baserom.gba", 0x6D0806, 0x000001D - .incbin "baserom.gba", 0x6D0823, 0x0001CE5 - .incbin "baserom.gba", 0x6D2508, 0x0001C1D - .incbin "baserom.gba", 0x6D4125, 0x00002E2 - .incbin "baserom.gba", 0x6D4407, 0x0000059 + .incbin "baserom.gba", 0x6AAEE0, 0x0029580 gUnk_086D4460:: @ 086D4460 - .incbin "baserom.gba", 0x6D4460, 0x0000BA4 - .incbin "baserom.gba", 0x6D5004, 0x0008965 - .incbin "baserom.gba", 0x6DD969, 0x0000456 - .incbin "baserom.gba", 0x6DDDBF, 0x0000007 - .incbin "baserom.gba", 0x6DDDC6, 0x000223E - .incbin "baserom.gba", 0x6E0004, 0x000000C - .incbin "baserom.gba", 0x6E0010, 0x000005D - .incbin "baserom.gba", 0x6E006D, 0x0000013 - .incbin "baserom.gba", 0x6E0080, 0x0000080 - .incbin "baserom.gba", 0x6E0100, 0x0000359 - .incbin "baserom.gba", 0x6E0459, 0x0000414 - .incbin "baserom.gba", 0x6E086D, 0x000001D - .incbin "baserom.gba", 0x6E088A, 0x0001755 - .incbin "baserom.gba", 0x6E1FDF, 0x0000E23 - .incbin "baserom.gba", 0x6E2E02, 0x000166D - .incbin "baserom.gba", 0x6E446F, 0x0000259 - .incbin "baserom.gba", 0x6E46C8, 0x0003D98 + .incbin "baserom.gba", 0x6D4460, 0x0014000 gUnk_086E8460:: @ 086E8460 - .incbin "baserom.gba", 0x6E8460, 0x0007BA1 - .incbin "baserom.gba", 0x6F0001, 0x0000001 - .incbin "baserom.gba", 0x6F0002, 0x000001E - .incbin "baserom.gba", 0x6F0020, 0x00000F0 - .incbin "baserom.gba", 0x6F0110, 0x000000C - .incbin "baserom.gba", 0x6F011C, 0x000007E - .incbin "baserom.gba", 0x6F019A, 0x0000069 - .incbin "baserom.gba", 0x6F0203, 0x00005FD - .incbin "baserom.gba", 0x6F0800, 0x000001B - .incbin "baserom.gba", 0x6F081B, 0x00006EB - .incbin "baserom.gba", 0x6F0F06, 0x00001AF - .incbin "baserom.gba", 0x6F10B5, 0x000094A - .incbin "baserom.gba", 0x6F19FF, 0x0000C01 - .incbin "baserom.gba", 0x6F2600, 0x000B121 - .incbin "baserom.gba", 0x6FD721, 0x000238E - .incbin "baserom.gba", 0x6FFAAF, 0x0000551 - .incbin "baserom.gba", 0x700000, 0x0000001 - .incbin "baserom.gba", 0x700001, 0x0000003 - .incbin "baserom.gba", 0x700004, 0x0000002 - .incbin "baserom.gba", 0x700006, 0x000002A - .incbin "baserom.gba", 0x700030, 0x000000C - .incbin "baserom.gba", 0x70003C, 0x00001C4 - .incbin "baserom.gba", 0x700200, 0x0000051 - .incbin "baserom.gba", 0x700251, 0x000019F - .incbin "baserom.gba", 0x7003F0, 0x0000240 - .incbin "baserom.gba", 0x700630, 0x00002C0 - .incbin "baserom.gba", 0x7008F0, 0x00000D0 - .incbin "baserom.gba", 0x7009C0, 0x0000119 - .incbin "baserom.gba", 0x700AD9, 0x00000C7 - .incbin "baserom.gba", 0x700BA0, 0x0001BD0 - .incbin "baserom.gba", 0x702770, 0x00053AB - .incbin "baserom.gba", 0x707B1B, 0x00011EB - .incbin "baserom.gba", 0x708D06, 0x000110B - .incbin "baserom.gba", 0x709E11, 0x0002FF6 - .incbin "baserom.gba", 0x70CE07, 0x00031F9 - .incbin "baserom.gba", 0x710000, 0x0000020 - .incbin "baserom.gba", 0x710020, 0x000001C - .incbin "baserom.gba", 0x71003C, 0x0000004 - .incbin "baserom.gba", 0x710040, 0x00000DC - .incbin "baserom.gba", 0x71011C, 0x0000045 - .incbin "baserom.gba", 0x710161, 0x000029F - .incbin "baserom.gba", 0x710400, 0x0000091 - .incbin "baserom.gba", 0x710491, 0x000026F - .incbin "baserom.gba", 0x710700, 0x0000070 - .incbin "baserom.gba", 0x710770, 0x0001811 - .incbin "baserom.gba", 0x711F81, 0x00007F0 - .incbin "baserom.gba", 0x712771, 0x00027A0 - .incbin "baserom.gba", 0x714F11, 0x0003277 - .incbin "baserom.gba", 0x718188, 0x0007E81 - .incbin "baserom.gba", 0x720009, 0x00000FE - .incbin "baserom.gba", 0x720107, 0x000016A - .incbin "baserom.gba", 0x720271, 0x000048F - .incbin "baserom.gba", 0x720700, 0x000014E - .incbin "baserom.gba", 0x72084E, 0x000048C - .incbin "baserom.gba", 0x720CDA, 0x000154B - .incbin "baserom.gba", 0x722225, 0x000DDE2 - .incbin "baserom.gba", 0x730007, 0x00001E9 - .incbin "baserom.gba", 0x7301F0, 0x0000520 - .incbin "baserom.gba", 0x730710, 0x0000063 - .incbin "baserom.gba", 0x730773, 0x00020A0 - .incbin "baserom.gba", 0x732813, 0x00006C1 - .incbin "baserom.gba", 0x732ED4, 0x00021B6 - .incbin "baserom.gba", 0x73508A, 0x000AF86 - .incbin "baserom.gba", 0x740010, 0x0000760 - .incbin "baserom.gba", 0x740770, 0x0000200 - .incbin "baserom.gba", 0x740970, 0x0000326 - .incbin "baserom.gba", 0x740C96, 0x0003695 - .incbin "baserom.gba", 0x74432B, 0x0000118 - .incbin "baserom.gba", 0x744443, 0x00001C0 - .incbin "baserom.gba", 0x744603, 0x00065CA - .incbin "baserom.gba", 0x74ABCD, 0x000543B - .incbin "baserom.gba", 0x750008, 0x00002F8 - .incbin "baserom.gba", 0x750300, 0x0000074 - .incbin "baserom.gba", 0x750374, 0x000048F - .incbin "baserom.gba", 0x750803, 0x0000703 - .incbin "baserom.gba", 0x750F06, 0x000344E - .incbin "baserom.gba", 0x754354, 0x0000756 - .incbin "baserom.gba", 0x754AAA, 0x000C45C - .incbin "baserom.gba", 0x760F06, 0x000120B - .incbin "baserom.gba", 0x762111, 0x00015FB - .incbin "baserom.gba", 0x76370C, 0x00009C4 - .incbin "baserom.gba", 0x7640D0, 0x0000496 - .incbin "baserom.gba", 0x764566, 0x0000CC5 - .incbin "baserom.gba", 0x76522B, 0x000032B - .incbin "baserom.gba", 0x765556, 0x0001110 - .incbin "baserom.gba", 0x766666, 0x0000020 - .incbin "baserom.gba", 0x766686, 0x0000021 - .incbin "baserom.gba", 0x7666A7, 0x00008FA - .incbin "baserom.gba", 0x766FA1, 0x0005D23 - .incbin "baserom.gba", 0x76CCC4, 0x000110B - .incbin "baserom.gba", 0x76DDCF, 0x0002242 - .incbin "baserom.gba", 0x770011, 0x00000A8 - .incbin "baserom.gba", 0x7700B9, 0x0000287 - .incbin "baserom.gba", 0x770340, 0x00000E2 - .incbin "baserom.gba", 0x770422, 0x0000154 - .incbin "baserom.gba", 0x770576, 0x0000300 - .incbin "baserom.gba", 0x770876, 0x0000791 - .incbin "baserom.gba", 0x771007, 0x000006E - .incbin "baserom.gba", 0x771075, 0x0000B8B - .incbin "baserom.gba", 0x771C00, 0x0005775 - .incbin "baserom.gba", 0x777375, 0x00003F0 - .incbin "baserom.gba", 0x777765, 0x0000011 - .incbin "baserom.gba", 0x777776, 0x0000012 - .incbin "baserom.gba", 0x777788, 0x0000877 - .incbin "baserom.gba", 0x777FFF, 0x0000067 - .incbin "baserom.gba", 0x778066, 0x0000703 - .incbin "baserom.gba", 0x778769, 0x0000E2C - .incbin "baserom.gba", 0x779595, 0x000148E - .incbin "baserom.gba", 0x77AA23, 0x0000017 - .incbin "baserom.gba", 0x77AA3A, 0x0000190 - .incbin "baserom.gba", 0x77ABCA, 0x0000537 - .incbin "baserom.gba", 0x77B101, 0x000290E - .incbin "baserom.gba", 0x77DA0F, 0x0002649 - .incbin "baserom.gba", 0x780058, 0x00000E8 - .incbin "baserom.gba", 0x780140, 0x0000836 - .incbin "baserom.gba", 0x780976, 0x000018A - .incbin "baserom.gba", 0x780B00, 0x0006410 - .incbin "baserom.gba", 0x786F10, 0x0000919 - .incbin "baserom.gba", 0x787829, 0x000084E - .incbin "baserom.gba", 0x788077, 0x00001CF - .incbin "baserom.gba", 0x788246, 0x0001375 - .incbin "baserom.gba", 0x7895BB, 0x0000933 - .incbin "baserom.gba", 0x789EEE, 0x000610A - .incbin "baserom.gba", 0x78FFF8, 0x0000008 - .incbin "baserom.gba", 0x790000, 0x0000001 - .incbin "baserom.gba", 0x790001, 0x0000001 - .incbin "baserom.gba", 0x790002, 0x0000001 - .incbin "baserom.gba", 0x790003, 0x0000001 - .incbin "baserom.gba", 0x790004, 0x0000002 - .incbin "baserom.gba", 0x790006, 0x0000001 - .incbin "baserom.gba", 0x790007, 0x0000001 - .incbin "baserom.gba", 0x790008, 0x0000002 - .incbin "baserom.gba", 0x79000A, 0x0000001 - .incbin "baserom.gba", 0x79000B, 0x0000004 - .incbin "baserom.gba", 0x79000F, 0x0000001 - .incbin "baserom.gba", 0x790010, 0x0000003 - .incbin "baserom.gba", 0x790013, 0x0000007 - .incbin "baserom.gba", 0x79001A, 0x0000004 - .incbin "baserom.gba", 0x79001E, 0x0000002 - .incbin "baserom.gba", 0x790020, 0x000000C - .incbin "baserom.gba", 0x79002C, 0x0000010 - .incbin "baserom.gba", 0x79003C, 0x0000004 - .incbin "baserom.gba", 0x790040, 0x0000008 - .incbin "baserom.gba", 0x790048, 0x000000C - .incbin "baserom.gba", 0x790054, 0x0000004 - .incbin "baserom.gba", 0x790058, 0x0000002 - .incbin "baserom.gba", 0x79005A, 0x000000E - .incbin "baserom.gba", 0x790068, 0x0000004 - .incbin "baserom.gba", 0x79006C, 0x000000C - .incbin "baserom.gba", 0x790078, 0x0000008 - .incbin "baserom.gba", 0x790080, 0x0000002 - .incbin "baserom.gba", 0x790082, 0x000000A - .incbin "baserom.gba", 0x79008C, 0x0000009 - .incbin "baserom.gba", 0x790095, 0x0000001 - .incbin "baserom.gba", 0x790096, 0x0000022 - .incbin "baserom.gba", 0x7900B8, 0x0000018 - .incbin "baserom.gba", 0x7900D0, 0x0000019 - .incbin "baserom.gba", 0x7900E9, 0x0000007 - .incbin "baserom.gba", 0x7900F0, 0x0000001 - .incbin "baserom.gba", 0x7900F1, 0x000000F - .incbin "baserom.gba", 0x790100, 0x0000007 - .incbin "baserom.gba", 0x790107, 0x000000A - .incbin "baserom.gba", 0x790111, 0x000002F - .incbin "baserom.gba", 0x790140, 0x0000040 - .incbin "baserom.gba", 0x790180, 0x0000008 - .incbin "baserom.gba", 0x790188, 0x0000008 - .incbin "baserom.gba", 0x790190, 0x0000039 - .incbin "baserom.gba", 0x7901C9, 0x000002A - .incbin "baserom.gba", 0x7901F3, 0x000000D - .incbin "baserom.gba", 0x790200, 0x0000201 - .incbin "baserom.gba", 0x790401, 0x0000001 - .incbin "baserom.gba", 0x790402, 0x0000041 - .incbin "baserom.gba", 0x790443, 0x0000001 - .incbin "baserom.gba", 0x790444, 0x0000006 - .incbin "baserom.gba", 0x79044A, 0x0000009 - .incbin "baserom.gba", 0x790453, 0x0000006 - .incbin "baserom.gba", 0x790459, 0x000000A - .incbin "baserom.gba", 0x790463, 0x0000001 - .incbin "baserom.gba", 0x790464, 0x0000024 - .incbin "baserom.gba", 0x790488, 0x0000378 - .incbin "baserom.gba", 0x790800, 0x0000001 - .incbin "baserom.gba", 0x790801, 0x0000004 - .incbin "baserom.gba", 0x790805, 0x0000001 - .incbin "baserom.gba", 0x790806, 0x0000001 - .incbin "baserom.gba", 0x790807, 0x0000003 - .incbin "baserom.gba", 0x79080A, 0x0000003 - .incbin "baserom.gba", 0x79080D, 0x0000002 - .incbin "baserom.gba", 0x79080F, 0x0000ABA - .incbin "baserom.gba", 0x7912C9, 0x0000957 - .incbin "baserom.gba", 0x791C20, 0x00023E0 - .incbin "baserom.gba", 0x794000, 0x0000107 - .incbin "baserom.gba", 0x794107, 0x0000FF9 - .incbin "baserom.gba", 0x795100, 0x0001000 - .incbin "baserom.gba", 0x796100, 0x0001879 - .incbin "baserom.gba", 0x797979, 0x0000687 - .incbin "baserom.gba", 0x798000, 0x0001992 - .incbin "baserom.gba", 0x799992, 0x000008E - .incbin "baserom.gba", 0x799A20, 0x00064DE - .incbin "baserom.gba", 0x79FEFE, 0x00000BA - .incbin "baserom.gba", 0x79FFB8, 0x0000004 - .incbin "baserom.gba", 0x79FFBC, 0x0000010 - .incbin "baserom.gba", 0x79FFCC, 0x0000004 - .incbin "baserom.gba", 0x79FFD0, 0x0000010 - .incbin "baserom.gba", 0x79FFE0, 0x0000006 - .incbin "baserom.gba", 0x79FFE6, 0x0000002 - .incbin "baserom.gba", 0x79FFE8, 0x0000008 - .incbin "baserom.gba", 0x79FFF0, 0x0000008 - .incbin "baserom.gba", 0x79FFF8, 0x0000002 - .incbin "baserom.gba", 0x79FFFA, 0x0000005 - .incbin "baserom.gba", 0x79FFFF, 0x000007A - .incbin "baserom.gba", 0x7A0079, 0x0001650 - .incbin "baserom.gba", 0x7A16C9, 0x000A940 - .incbin "baserom.gba", 0x7AC009, 0x0000DD4 - .incbin "baserom.gba", 0x7ACDDD, 0x0003223 - .incbin "baserom.gba", 0x7B0000, 0x0000002 - .incbin "baserom.gba", 0x7B0002, 0x0000002 - .incbin "baserom.gba", 0x7B0004, 0x0000001 - .incbin "baserom.gba", 0x7B0005, 0x0000002 - .incbin "baserom.gba", 0x7B0007, 0x0000001 - .incbin "baserom.gba", 0x7B0008, 0x0000001 - .incbin "baserom.gba", 0x7B0009, 0x0000006 - .incbin "baserom.gba", 0x7B000F, 0x0000001 - .incbin "baserom.gba", 0x7B0010, 0x0000002 - .incbin "baserom.gba", 0x7B0012, 0x0000002 - .incbin "baserom.gba", 0x7B0014, 0x0000002 - .incbin "baserom.gba", 0x7B0016, 0x0000008 - .incbin "baserom.gba", 0x7B001E, 0x000000A - .incbin "baserom.gba", 0x7B0028, 0x0000008 - .incbin "baserom.gba", 0x7B0030, 0x000000C - .incbin "baserom.gba", 0x7B003C, 0x0000038 - .incbin "baserom.gba", 0x7B0074, 0x0000004 - .incbin "baserom.gba", 0x7B0078, 0x000001E - .incbin "baserom.gba", 0x7B0096, 0x0000022 - .incbin "baserom.gba", 0x7B00B8, 0x0000040 - .incbin "baserom.gba", 0x7B00F8, 0x0000019 - .incbin "baserom.gba", 0x7B0111, 0x000002B - .incbin "baserom.gba", 0x7B013C, 0x0000004 - .incbin "baserom.gba", 0x7B0140, 0x0000087 - .incbin "baserom.gba", 0x7B01C7, 0x00000B3 - .incbin "baserom.gba", 0x7B027A, 0x0000187 - .incbin "baserom.gba", 0x7B0401, 0x0000001 - .incbin "baserom.gba", 0x7B0402, 0x0000035 - .incbin "baserom.gba", 0x7B0437, 0x0000008 - .incbin "baserom.gba", 0x7B043F, 0x000003F - .incbin "baserom.gba", 0x7B047E, 0x0000170 - .incbin "baserom.gba", 0x7B05EE, 0x0000212 - .incbin "baserom.gba", 0x7B0800, 0x0000001 - .incbin "baserom.gba", 0x7B0801, 0x0000003 - .incbin "baserom.gba", 0x7B0804, 0x0000002 - .incbin "baserom.gba", 0x7B0806, 0x0000001 - .incbin "baserom.gba", 0x7B0807, 0x0000002 - .incbin "baserom.gba", 0x7B0809, 0x000002A - .incbin "baserom.gba", 0x7B0833, 0x0000047 - .incbin "baserom.gba", 0x7B087A, 0x0000ABE - .incbin "baserom.gba", 0x7B1338, 0x0004EC5 - .incbin "baserom.gba", 0x7B61FD, 0x0006BE1 - .incbin "baserom.gba", 0x7BCDDE, 0x00020FF - .incbin "baserom.gba", 0x7BEEDD, 0x0001123 - .incbin "baserom.gba", 0x7C0000, 0x0000004 - .incbin "baserom.gba", 0x7C0004, 0x0000038 - .incbin "baserom.gba", 0x7C003C, 0x0000104 - .incbin "baserom.gba", 0x7C0140, 0x00002C1 - .incbin "baserom.gba", 0x7C0401, 0x0000036 - .incbin "baserom.gba", 0x7C0437, 0x000000D - .incbin "baserom.gba", 0x7C0444, 0x0000005 - .incbin "baserom.gba", 0x7C0449, 0x0000010 - .incbin "baserom.gba", 0x7C0459, 0x0000025 - .incbin "baserom.gba", 0x7C047E, 0x0000292 - .incbin "baserom.gba", 0x7C0710, 0x0000024 - .incbin "baserom.gba", 0x7C0734, 0x00000D1 - .incbin "baserom.gba", 0x7C0805, 0x0000076 - .incbin "baserom.gba", 0x7C087B, 0x000F74F - .incbin "baserom.gba", 0x7CFFCA, 0x0000030 - .incbin "baserom.gba", 0x7CFFFA, 0x0006683 - .incbin "baserom.gba", 0x7D667D, 0x0002614 - .incbin "baserom.gba", 0x7D8C91, 0x000739D - .incbin "baserom.gba", 0x7E002E, 0x00006D2 - .incbin "baserom.gba", 0x7E0700, 0x0000598 - .incbin "baserom.gba", 0x7E0C98, 0x000095B - .incbin "baserom.gba", 0x7E15F3, 0x000A6BF - .incbin "baserom.gba", 0x7EBCB2, 0x000323C - .incbin "baserom.gba", 0x7EEEEE, 0x000112A - .incbin "baserom.gba", 0x7F0018, 0x0000064 - .incbin "baserom.gba", 0x7F007C, 0x0000260 - .incbin "baserom.gba", 0x7F02DC, 0x0000824 - .incbin "baserom.gba", 0x7F0B00, 0x0000422 - .incbin "baserom.gba", 0x7F0F22, 0x0000067 - .incbin "baserom.gba", 0x7F0F89, 0x00000F6 - .incbin "baserom.gba", 0x7F107F, 0x0000020 - .incbin "baserom.gba", 0x7F109F, 0x0000003 - .incbin "baserom.gba", 0x7F10A2, 0x000053F - .incbin "baserom.gba", 0x7F15E1, 0x0001F74 - .incbin "baserom.gba", 0x7F3555, 0x0002B9E - .incbin "baserom.gba", 0x7F60F3, 0x0002643 - .incbin "baserom.gba", 0x7F8736, 0x0003695 - .incbin "baserom.gba", 0x7FBDCB, 0x0000001 - .incbin "baserom.gba", 0x7FBDCC, 0x000023A - .incbin "baserom.gba", 0x7FC006, 0x000310B - .incbin "baserom.gba", 0x7FF111, 0x000011B - .incbin "baserom.gba", 0x7FF22C, 0x000066B - .incbin "baserom.gba", 0x7FF897, 0x0000769 - .incbin "baserom.gba", 0x800000, 0x0000002 - .incbin "baserom.gba", 0x800002, 0x0000002 - .incbin "baserom.gba", 0x800004, 0x0000002 - .incbin "baserom.gba", 0x800006, 0x0000001 - .incbin "baserom.gba", 0x800007, 0x0000001 - .incbin "baserom.gba", 0x800008, 0x0000001 - .incbin "baserom.gba", 0x800009, 0x0000001 - .incbin "baserom.gba", 0x80000A, 0x0000039 - .incbin "baserom.gba", 0x800043, 0x000007D - .incbin "baserom.gba", 0x8000C0, 0x0000047 - .incbin "baserom.gba", 0x800107, 0x0000009 - .incbin "baserom.gba", 0x800110, 0x0000324 - .incbin "baserom.gba", 0x800434, 0x000000F - .incbin "baserom.gba", 0x800443, 0x00001FD - .incbin "baserom.gba", 0x800640, 0x00002B0 - .incbin "baserom.gba", 0x8008F0, 0x00000F6 - .incbin "baserom.gba", 0x8009E6, 0x0000242 - .incbin "baserom.gba", 0x800C28, 0x0000FD8 - .incbin "baserom.gba", 0x801C00, 0x0000B80 - .incbin "baserom.gba", 0x802780, 0x0000EE3 - .incbin "baserom.gba", 0x803663, 0x00009A1 - .incbin "baserom.gba", 0x804004, 0x0000114 - .incbin "baserom.gba", 0x804118, 0x000001A - .incbin "baserom.gba", 0x804132, 0x0002501 - .incbin "baserom.gba", 0x806633, 0x000101B - .incbin "baserom.gba", 0x80764E, 0x00004B9 - .incbin "baserom.gba", 0x807B07, 0x0000C7A - .incbin "baserom.gba", 0x808781, 0x000007F - .incbin "baserom.gba", 0x808800, 0x0002C08 - .incbin "baserom.gba", 0x80B408, 0x0000BFA - .incbin "baserom.gba", 0x80C002, 0x00013EF - .incbin "baserom.gba", 0x80D3F1, 0x0000986 - .incbin "baserom.gba", 0x80DD77, 0x0000B90 - .incbin "baserom.gba", 0x80E907, 0x00000F3 - .incbin "baserom.gba", 0x80E9FA, 0x000000E - .incbin "baserom.gba", 0x80EA08, 0x00000F8 - .incbin "baserom.gba", 0x80EB00, 0x0000008 - .incbin "baserom.gba", 0x80EB08, 0x0000001 - .incbin "baserom.gba", 0x80EB09, 0x0000001 - .incbin "baserom.gba", 0x80EB0A, 0x00000E1 - .incbin "baserom.gba", 0x80EBEB, 0x0000005 - .incbin "baserom.gba", 0x80EBF0, 0x0000018 - .incbin "baserom.gba", 0x80EC08, 0x0000003 - .incbin "baserom.gba", 0x80EC0B, 0x00000E5 - .incbin "baserom.gba", 0x80ECF0, 0x000021A - .incbin "baserom.gba", 0x80EF0A, 0x00000E7 - .incbin "baserom.gba", 0x80EFF1, 0x000000B - .incbin "baserom.gba", 0x80EFFC, 0x0000110 - .incbin "baserom.gba", 0x80F10C, 0x00001F8 - .incbin "baserom.gba", 0x80F304, 0x00001F8 - .incbin "baserom.gba", 0x80F4FC, 0x000000B - .incbin "baserom.gba", 0x80F507, 0x00003F1 - .incbin "baserom.gba", 0x80F8F8, 0x0000304 - .incbin "baserom.gba", 0x80FBFC, 0x0000584 - .incbin "baserom.gba", 0x810180, 0x0000601 - .incbin "baserom.gba", 0x810781, 0x000017E - .incbin "baserom.gba", 0x8108FF, 0x0000E82 - .incbin "baserom.gba", 0x811781, 0x000099F - .incbin "baserom.gba", 0x812120, 0x0000C61 - .incbin "baserom.gba", 0x812D81, 0x0001000 - .incbin "baserom.gba", 0x813D81, 0x000027F - .incbin "baserom.gba", 0x814000, 0x0000105 - .incbin "baserom.gba", 0x814105, 0x000033F - .incbin "baserom.gba", 0x814444, 0x00027BB - .incbin "baserom.gba", 0x816BFF, 0x0001569 - .incbin "baserom.gba", 0x818168, 0x00006CC - .incbin "baserom.gba", 0x818834, 0x00053A0 - .incbin "baserom.gba", 0x81DBD4, 0x000092C - .incbin "baserom.gba", 0x81E500, 0x0000481 - .incbin "baserom.gba", 0x81E981, 0x0000373 - .incbin "baserom.gba", 0x81ECF4, 0x000008C - .incbin "baserom.gba", 0x81ED80, 0x0000D75 - .incbin "baserom.gba", 0x81FAF5, 0x0000402 - .incbin "baserom.gba", 0x81FEF7, 0x0000109 - .incbin "baserom.gba", 0x820000, 0x0000008 - .incbin "baserom.gba", 0x820008, 0x0000016 - .incbin "baserom.gba", 0x82001E, 0x0000081 - .incbin "baserom.gba", 0x82009F, 0x0000001 - .incbin "baserom.gba", 0x8200A0, 0x0000013 - .incbin "baserom.gba", 0x8200B3, 0x000025D - .incbin "baserom.gba", 0x820310, 0x0000149 - .incbin "baserom.gba", 0x820459, 0x00002AC - .incbin "baserom.gba", 0x820705, 0x0000100 - .incbin "baserom.gba", 0x820805, 0x0000001 - .incbin "baserom.gba", 0x820806, 0x000054C - .incbin "baserom.gba", 0x820D52, 0x00012AE - .incbin "baserom.gba", 0x822000, 0x0000782 - .incbin "baserom.gba", 0x822782, 0x0000400 - .incbin "baserom.gba", 0x822B82, 0x00001A9 - .incbin "baserom.gba", 0x822D2B, 0x0000556 - .incbin "baserom.gba", 0x823281, 0x0000D85 - .incbin "baserom.gba", 0x824006, 0x0000550 - .incbin "baserom.gba", 0x824556, 0x0000ACD - .incbin "baserom.gba", 0x825023, 0x0000C52 - .incbin "baserom.gba", 0x825C75, 0x000250C - .incbin "baserom.gba", 0x828181, 0x00071B2 - .incbin "baserom.gba", 0x82F333, 0x0000C8F - .incbin "baserom.gba", 0x82FFC2, 0x000003E - .incbin "baserom.gba", 0x830000, 0x0000004 - .incbin "baserom.gba", 0x830004, 0x0000003 - .incbin "baserom.gba", 0x830007, 0x0000001 - .incbin "baserom.gba", 0x830008, 0x0000008 - .incbin "baserom.gba", 0x830010, 0x0000432 - .incbin "baserom.gba", 0x830442, 0x0002B41 - .incbin "baserom.gba", 0x832F83, 0x0001574 - .incbin "baserom.gba", 0x8344F7, 0x000006F - .incbin "baserom.gba", 0x834566, 0x0006DAC - .incbin "baserom.gba", 0x83B312, 0x00047EE + .incbin "baserom.gba", 0x6E8460, 0x01576A0 @ TODO start of figurine data gUnk_0883FB00:: @ 0883FB00 - .incbin "baserom.gba", 0x83FB00, 0x0000509 - .incbin "baserom.gba", 0x840009, 0x0000011 - .incbin "baserom.gba", 0x84001A, 0x0000066 + .incbin "baserom.gba", 0x83FB00, 0x0000580 gUnk_08840080:: @ 08840080 - .incbin "baserom.gba", 0x840080, 0x00001E9 - .incbin "baserom.gba", 0x840269, 0x0000128 - .incbin "baserom.gba", 0x840391, 0x00000B2 - .incbin "baserom.gba", 0x840443, 0x000021D + .incbin "baserom.gba", 0x840080, 0x00005E0 gUnk_08840660:: @ 08840660 - .incbin "baserom.gba", 0x840660, 0x0000203 - .incbin "baserom.gba", 0x840863, 0x0000129 - .incbin "baserom.gba", 0x84098C, 0x0000154 + .incbin "baserom.gba", 0x840660, 0x0000480 gUnk_08840AE0:: @ 08840AE0 .incbin "baserom.gba", 0x840AE0, 0x00004C0 @@ -7004,33 +3438,25 @@ gUnk_08841AE0:: @ 08841AE0 .incbin "baserom.gba", 0x841AE0, 0x00004E0 gUnk_08841FC0:: @ 08841FC0 - .incbin "baserom.gba", 0x841FC0, 0x000026C - .incbin "baserom.gba", 0x84222C, 0x00000B4 + .incbin "baserom.gba", 0x841FC0, 0x0000320 gUnk_088422E0:: @ 088422E0 .incbin "baserom.gba", 0x8422E0, 0x0000DA0 gUnk_08843080:: @ 08843080 - .incbin "baserom.gba", 0x843080, 0x00002B3 - .incbin "baserom.gba", 0x843333, 0x00001AF - .incbin "baserom.gba", 0x8434E2, 0x00009FE + .incbin "baserom.gba", 0x843080, 0x0000E60 gUnk_08843EE0:: @ 08843EE0 - .incbin "baserom.gba", 0x843EE0, 0x0000375 - .incbin "baserom.gba", 0x844255, 0x00001F0 - .incbin "baserom.gba", 0x844445, 0x000097B + .incbin "baserom.gba", 0x843EE0, 0x0000EE0 gUnk_08844DC0:: @ 08844DC0 - .incbin "baserom.gba", 0x844DC0, 0x0000795 - .incbin "baserom.gba", 0x845555, 0x000064B + .incbin "baserom.gba", 0x844DC0, 0x0000DE0 gUnk_08845BA0:: @ 08845BA0 .incbin "baserom.gba", 0x845BA0, 0x0001A00 gUnk_088475A0:: @ 088475A0 - .incbin "baserom.gba", 0x8475A0, 0x00002E7 - .incbin "baserom.gba", 0x847887, 0x00007FE - .incbin "baserom.gba", 0x848085, 0x0000EDB + .incbin "baserom.gba", 0x8475A0, 0x00019C0 gUnk_08848F60:: @ 08848F60 .incbin "baserom.gba", 0x848F60, 0x00010C0 @@ -7045,12 +3471,10 @@ gUnk_0884A7A0:: @ 0884A7A0 .incbin "baserom.gba", 0x84A7A0, 0x0000360 gUnk_0884AB00:: @ 0884AB00 - .incbin "baserom.gba", 0x84AB00, 0x00000CD - .incbin "baserom.gba", 0x84ABCD, 0x0000AB3 + .incbin "baserom.gba", 0x84AB00, 0x0000B80 gUnk_0884B680:: @ 0884B680 - .incbin "baserom.gba", 0x84B680, 0x00006B2 - .incbin "baserom.gba", 0x84BD32, 0x000044E + .incbin "baserom.gba", 0x84B680, 0x0000B00 gUnk_0884C180:: @ 0884C180 .incbin "baserom.gba", 0x84C180, 0x0000AE0 @@ -7071,33 +3495,16 @@ gUnk_0884DB00:: @ 0884DB00 .incbin "baserom.gba", 0x84DB00, 0x0000400 gUnk_0884DF00:: @ 0884DF00 - .incbin "baserom.gba", 0x84DF00, 0x00006F0 - .incbin "baserom.gba", 0x84E5F0, 0x00000F0 + .incbin "baserom.gba", 0x84DF00, 0x00007E0 gUnk_0884E6E0:: @ 0884E6E0 - .incbin "baserom.gba", 0x84E6E0, 0x0000428 - .incbin "baserom.gba", 0x84EB08, 0x0000100 - .incbin "baserom.gba", 0x84EC08, 0x0000400 - .incbin "baserom.gba", 0x84F008, 0x00000EC - .incbin "baserom.gba", 0x84F0F4, 0x0000100 - .incbin "baserom.gba", 0x84F1F4, 0x0000E0D - .incbin "baserom.gba", 0x850001, 0x0000007 - .incbin "baserom.gba", 0x850008, 0x000047D - .incbin "baserom.gba", 0x850485, 0x00003FF - .incbin "baserom.gba", 0x850884, 0x0000101 - .incbin "baserom.gba", 0x850985, 0x000075B + .incbin "baserom.gba", 0x84E6E0, 0x0002A00 gUnk_088510E0:: @ 088510E0 - .incbin "baserom.gba", 0x8510E0, 0x00001B1 - .incbin "baserom.gba", 0x851291, 0x00015F4 - .incbin "baserom.gba", 0x852885, 0x0000100 - .incbin "baserom.gba", 0x852985, 0x0001073 - .incbin "baserom.gba", 0x8539F8, 0x00000E8 + .incbin "baserom.gba", 0x8510E0, 0x0002A00 gUnk_08853AE0:: @ 08853AE0 - .incbin "baserom.gba", 0x853AE0, 0x0000FCA - .incbin "baserom.gba", 0x854AAA, 0x0000B10 - .incbin "baserom.gba", 0x8555BA, 0x0000F26 + .incbin "baserom.gba", 0x853AE0, 0x0002A00 gUnk_088564E0:: @ 088564E0 .incbin "baserom.gba", 0x8564E0, 0x00003C0 @@ -7118,8 +3525,7 @@ gUnk_08857880:: @ 08857880 .incbin "baserom.gba", 0x857880, 0x0000480 gUnk_08857D00:: @ 08857D00 - .incbin "baserom.gba", 0x857D00, 0x000030A - .incbin "baserom.gba", 0x85800A, 0x0000176 + .incbin "baserom.gba", 0x857D00, 0x0000480 gUnk_08858180:: @ 08858180 .incbin "baserom.gba", 0x858180, 0x0000500 @@ -7146,156 +3552,67 @@ gUnk_0885C720:: @ 0885C720 .incbin "baserom.gba", 0x85C720, 0x0000500 gUnk_0885CC20:: @ 0885CC20 - .incbin "baserom.gba", 0x85CC20, 0x0001BF3 - .incbin "baserom.gba", 0x85E813, 0x00000E5 - .incbin "baserom.gba", 0x85E8F8, 0x00013A8 + .incbin "baserom.gba", 0x85CC20, 0x0003080 gUnk_0885FCA0:: @ 0885FCA0 - .incbin "baserom.gba", 0x85FCA0, 0x0000362 - .incbin "baserom.gba", 0x860002, 0x00000CB - .incbin "baserom.gba", 0x8600CD, 0x0000075 - .incbin "baserom.gba", 0x860142, 0x00007C1 - .incbin "baserom.gba", 0x860903, 0x0000383 - .incbin "baserom.gba", 0x860C86, 0x000028A - .incbin "baserom.gba", 0x860F10, 0x0001770 + .incbin "baserom.gba", 0x85FCA0, 0x00029E0 gUnk_08862680:: @ 08862680 - .incbin "baserom.gba", 0x862680, 0x0000413 - .incbin "baserom.gba", 0x862A93, 0x0001974 - .incbin "baserom.gba", 0x864407, 0x0001C79 + .incbin "baserom.gba", 0x862680, 0x0003A00 gUnk_08866080:: @ 08866080 - .incbin "baserom.gba", 0x866080, 0x00006F7 - .incbin "baserom.gba", 0x866777, 0x0000BDE - .incbin "baserom.gba", 0x867355, 0x0001498 - .incbin "baserom.gba", 0x8687ED, 0x0000253 + .incbin "baserom.gba", 0x866080, 0x00029C0 gUnk_08868A40:: @ 08868A40 - .incbin "baserom.gba", 0x868A40, 0x0001F58 - .incbin "baserom.gba", 0x86A998, 0x0000156 - .incbin "baserom.gba", 0x86AAEE, 0x0000367 - .incbin "baserom.gba", 0x86AE55, 0x0000009 - .incbin "baserom.gba", 0x86AE5E, 0x00010C2 + .incbin "baserom.gba", 0x868A40, 0x00034E0 gUnk_0886BF20:: @ 0886BF20 .incbin "baserom.gba", 0x86BF20, 0x0003900 gUnk_0886F820:: @ 0886F820 - .incbin "baserom.gba", 0x86F820, 0x00007E7 - .incbin "baserom.gba", 0x870007, 0x000000A - .incbin "baserom.gba", 0x870011, 0x000005A - .incbin "baserom.gba", 0x87006B, 0x000001B - .incbin "baserom.gba", 0x870086, 0x00001E9 - .incbin "baserom.gba", 0x87026F, 0x0002691 + .incbin "baserom.gba", 0x86F820, 0x00030E0 gUnk_08872900:: @ 08872900 .incbin "baserom.gba", 0x872900, 0x0002C80 gUnk_08875580:: @ 08875580 - .incbin "baserom.gba", 0x875580, 0x0001A83 - .incbin "baserom.gba", 0x877003, 0x0000663 - .incbin "baserom.gba", 0x877666, 0x0000107 - .incbin "baserom.gba", 0x87776D, 0x0000072 - .incbin "baserom.gba", 0x8777DF, 0x0000011 - .incbin "baserom.gba", 0x8777F0, 0x00010BF - .incbin "baserom.gba", 0x8788AF, 0x00001D1 + .incbin "baserom.gba", 0x875580, 0x0003500 gUnk_08878A80:: @ 08878A80 - .incbin "baserom.gba", 0x878A80, 0x000142B - .incbin "baserom.gba", 0x879EAB, 0x0001355 + .incbin "baserom.gba", 0x878A80, 0x0002780 gUnk_0887B200:: @ 0887B200 .incbin "baserom.gba", 0x87B200, 0x0002EA0 gUnk_0887E0A0:: @ 0887E0A0 - .incbin "baserom.gba", 0x87E0A0, 0x0000668 - .incbin "baserom.gba", 0x87E708, 0x00018F8 - .incbin "baserom.gba", 0x880000, 0x00000AA - .incbin "baserom.gba", 0x8800AA, 0x0000056 - .incbin "baserom.gba", 0x880100, 0x0000087 - .incbin "baserom.gba", 0x880187, 0x000028D - .incbin "baserom.gba", 0x880414, 0x00003F4 - .incbin "baserom.gba", 0x880808, 0x000098B - .incbin "baserom.gba", 0x881193, 0x000022D + .incbin "baserom.gba", 0x87E0A0, 0x0003320 gUnk_088813C0:: @ 088813C0 - .incbin "baserom.gba", 0x8813C0, 0x000050C - .incbin "baserom.gba", 0x8818CC, 0x0000975 - .incbin "baserom.gba", 0x882241, 0x0000747 - .incbin "baserom.gba", 0x882988, 0x0000A13 - .incbin "baserom.gba", 0x88339B, 0x0000B05 + .incbin "baserom.gba", 0x8813C0, 0x0002AE0 gUnk_08883EA0:: @ 08883EA0 .incbin "baserom.gba", 0x883EA0, 0x0001F00 gUnk_08885DA0:: @ 08885DA0 - .incbin "baserom.gba", 0x885DA0, 0x00019D7 - .incbin "baserom.gba", 0x887777, 0x0000889 - .incbin "baserom.gba", 0x888000, 0x0000188 - .incbin "baserom.gba", 0x888188, 0x0000414 - .incbin "baserom.gba", 0x88859C, 0x00001CA - .incbin "baserom.gba", 0x888766, 0x000000A - .incbin "baserom.gba", 0x888770, 0x0000090 - .incbin "baserom.gba", 0x888800, 0x0000080 - .incbin "baserom.gba", 0x888880, 0x0000008 - .incbin "baserom.gba", 0x888888, 0x0000001 - .incbin "baserom.gba", 0x888889, 0x0000010 - .incbin "baserom.gba", 0x888899, 0x00000EF - .incbin "baserom.gba", 0x888988, 0x0000012 - .incbin "baserom.gba", 0x88899A, 0x0000110 - .incbin "baserom.gba", 0x888AAA, 0x000043B - .incbin "baserom.gba", 0x888EE5, 0x0000093 - .incbin "baserom.gba", 0x888F78, 0x0000912 - .incbin "baserom.gba", 0x88988A, 0x0000076 - .incbin "baserom.gba", 0x889900, 0x000008E - .incbin "baserom.gba", 0x88998E, 0x000000B - .incbin "baserom.gba", 0x889999, 0x0000011 - .incbin "baserom.gba", 0x8899AA, 0x00003F6 + .incbin "baserom.gba", 0x885DA0, 0x0004000 gUnk_08889DA0:: @ 08889DA0 - .incbin "baserom.gba", 0x889DA0, 0x000014E - .incbin "baserom.gba", 0x889EEE, 0x0000BAC - .incbin "baserom.gba", 0x88AA9A, 0x0000066 - .incbin "baserom.gba", 0x88AB00, 0x0000311 - .incbin "baserom.gba", 0x88AE11, 0x00001F7 - .incbin "baserom.gba", 0x88B008, 0x0002D18 + .incbin "baserom.gba", 0x889DA0, 0x0003F80 gUnk_0888DD20:: @ 0888DD20 - .incbin "baserom.gba", 0x88DD20, 0x0000140 - .incbin "baserom.gba", 0x88DE60, 0x0001B00 + .incbin "baserom.gba", 0x88DD20, 0x0001C40 gUnk_0888F960:: @ 0888F960 - .incbin "baserom.gba", 0x88F960, 0x00006A0 - .incbin "baserom.gba", 0x890000, 0x000003C - .incbin "baserom.gba", 0x89003C, 0x0000014 - .incbin "baserom.gba", 0x890050, 0x0000028 - .incbin "baserom.gba", 0x890078, 0x0000008 - .incbin "baserom.gba", 0x890080, 0x0000034 - .incbin "baserom.gba", 0x8900B4, 0x00000B4 - .incbin "baserom.gba", 0x890168, 0x0000058 - .incbin "baserom.gba", 0x8901C0, 0x0000098 - .incbin "baserom.gba", 0x890258, 0x00001A9 - .incbin "baserom.gba", 0x890401, 0x0000048 - .incbin "baserom.gba", 0x890449, 0x0000010 - .incbin "baserom.gba", 0x890459, 0x000001D - .incbin "baserom.gba", 0x890476, 0x0000012 - .incbin "baserom.gba", 0x890488, 0x0000378 - .incbin "baserom.gba", 0x890800, 0x0000006 - .incbin "baserom.gba", 0x890806, 0x0000001 - .incbin "baserom.gba", 0x890807, 0x00000C5 - .incbin "baserom.gba", 0x8908CC, 0x000063A - .incbin "baserom.gba", 0x890F06, 0x00000BA + .incbin "baserom.gba", 0x88F960, 0x0001660 gUnk_08890FC0:: @ 08890FC0 - .incbin "baserom.gba", 0x890FC0, 0x000116E - .incbin "baserom.gba", 0x89212E, 0x0000B12 + .incbin "baserom.gba", 0x890FC0, 0x0001C80 gUnk_08892C40:: @ 08892C40 .incbin "baserom.gba", 0x892C40, 0x0002300 gUnk_08894F40:: @ 08894F40 - .incbin "baserom.gba", 0x894F40, 0x0001749 - .incbin "baserom.gba", 0x896689, 0x0000D37 + .incbin "baserom.gba", 0x894F40, 0x0002480 gUnk_088973C0:: @ 088973C0 .incbin "baserom.gba", 0x8973C0, 0x0000440 @@ -7304,23 +3621,13 @@ gUnk_08897800:: @ 08897800 .incbin "baserom.gba", 0x897800, 0x00008C0 gUnk_088980C0:: @ 088980C0 - .incbin "baserom.gba", 0x8980C0, 0x0000495 - .incbin "baserom.gba", 0x898555, 0x0000445 - .incbin "baserom.gba", 0x89899A, 0x0000011 - .incbin "baserom.gba", 0x8989AB, 0x0000515 + .incbin "baserom.gba", 0x8980C0, 0x0000E00 gUnk_08898EC0:: @ 08898EC0 - .incbin "baserom.gba", 0x898EC0, 0x00000B7 - .incbin "baserom.gba", 0x898F77, 0x00002C9 + .incbin "baserom.gba", 0x898EC0, 0x0000380 gUnk_08899240:: @ 08899240 - .incbin "baserom.gba", 0x899240, 0x00004C0 - .incbin "baserom.gba", 0x899700, 0x0000298 - .incbin "baserom.gba", 0x899998, 0x0000001 - .incbin "baserom.gba", 0x899999, 0x000004B - .incbin "baserom.gba", 0x8999E4, 0x0000093 - .incbin "baserom.gba", 0x899A77, 0x0000033 - .incbin "baserom.gba", 0x899AAA, 0x00000B6 + .incbin "baserom.gba", 0x899240, 0x0000920 gUnk_08899B60:: @ 08899B60 .incbin "baserom.gba", 0x899B60, 0x00002E0 @@ -7332,32 +3639,22 @@ gUnk_0889A5E0:: @ 0889A5E0 .incbin "baserom.gba", 0x89A5E0, 0x0000300 gUnk_0889A8E0:: @ 0889A8E0 - .incbin "baserom.gba", 0x89A8E0, 0x00001BE - .incbin "baserom.gba", 0x89AA9E, 0x0000004 - .incbin "baserom.gba", 0x89AAA2, 0x0000008 - .incbin "baserom.gba", 0x89AAAA, 0x0000001 - .incbin "baserom.gba", 0x89AAAB, 0x0000010 - .incbin "baserom.gba", 0x89AABB, 0x0000100 - .incbin "baserom.gba", 0x89ABBB, 0x0000001 - .incbin "baserom.gba", 0x89ABBC, 0x0000C24 + .incbin "baserom.gba", 0x89A8E0, 0x0000F00 gUnk_0889B7E0:: @ 0889B7E0 .incbin "baserom.gba", 0x89B7E0, 0x0000360 gUnk_0889BB40:: @ 0889BB40 - .incbin "baserom.gba", 0x89BB40, 0x000018C - .incbin "baserom.gba", 0x89BCCC, 0x00005F4 + .incbin "baserom.gba", 0x89BB40, 0x0000780 gUnk_0889C2C0:: @ 0889C2C0 .incbin "baserom.gba", 0x89C2C0, 0x0000400 gUnk_0889C6C0:: @ 0889C6C0 - .incbin "baserom.gba", 0x89C6C0, 0x000005C - .incbin "baserom.gba", 0x89C71C, 0x0000324 + .incbin "baserom.gba", 0x89C6C0, 0x0000380 gUnk_0889CA40:: @ 0889CA40 - .incbin "baserom.gba", 0x89CA40, 0x00005B0 - .incbin "baserom.gba", 0x89CFF0, 0x0000450 + .incbin "baserom.gba", 0x89CA40, 0x0000A00 gUnk_0889D440:: @ 0889D440 .incbin "baserom.gba", 0x89D440, 0x0000A00 @@ -7366,43 +3663,34 @@ gUnk_0889DE40:: @ 0889DE40 .incbin "baserom.gba", 0x89DE40, 0x0000300 gUnk_0889E140:: @ 0889E140 - .incbin "baserom.gba", 0x89E140, 0x00003D1 - .incbin "baserom.gba", 0x89E511, 0x00000EF + .incbin "baserom.gba", 0x89E140, 0x00004C0 gUnk_0889E600:: @ 0889E600 .incbin "baserom.gba", 0x89E600, 0x00007C0 gUnk_0889EDC0:: @ 0889EDC0 - .incbin "baserom.gba", 0x89EDC0, 0x000012E - .incbin "baserom.gba", 0x89EEEE, 0x00009F2 + .incbin "baserom.gba", 0x89EDC0, 0x0000B20 gUnk_0889F8E0:: @ 0889F8E0 - .incbin "baserom.gba", 0x89F8E0, 0x00007D3 - .incbin "baserom.gba", 0x8A00B3, 0x000000D + .incbin "baserom.gba", 0x89F8E0, 0x00007E0 gUnk_088A00C0:: @ 088A00C0 .incbin "baserom.gba", 0x8A00C0, 0x0000360 gUnk_088A0420:: @ 088A0420 - .incbin "baserom.gba", 0x8A0420, 0x0000469 - .incbin "baserom.gba", 0x8A0889, 0x0000024 - .incbin "baserom.gba", 0x8A08AD, 0x0000433 + .incbin "baserom.gba", 0x8A0420, 0x00008C0 gUnk_088A0CE0:: @ 088A0CE0 - .incbin "baserom.gba", 0x8A0CE0, 0x000007F - .incbin "baserom.gba", 0x8A0D5F, 0x000062F - .incbin "baserom.gba", 0x8A138E, 0x0000112 + .incbin "baserom.gba", 0x8A0CE0, 0x00007C0 gUnk_088A14A0:: @ 088A14A0 .incbin "baserom.gba", 0x8A14A0, 0x0000DC0 gUnk_088A2260:: @ 088A2260 - .incbin "baserom.gba", 0x8A2260, 0x00000E5 - .incbin "baserom.gba", 0x8A2345, 0x000021B + .incbin "baserom.gba", 0x8A2260, 0x0000300 gUnk_088A2560:: @ 088A2560 - .incbin "baserom.gba", 0x8A2560, 0x00002A8 - .incbin "baserom.gba", 0x8A2808, 0x0000038 + .incbin "baserom.gba", 0x8A2560, 0x00002E0 gUnk_088A2840:: @ 088A2840 .incbin "baserom.gba", 0x8A2840, 0x0000500 @@ -7438,9 +3726,7 @@ gUnk_088A6CE0:: @ 088A6CE0 .incbin "baserom.gba", 0x8A6CE0, 0x00007C0 gUnk_088A74A0:: @ 088A74A0 - .incbin "baserom.gba", 0x8A74A0, 0x0000408 - .incbin "baserom.gba", 0x8A78A8, 0x0000139 - .incbin "baserom.gba", 0x8A79E1, 0x00002DF + .incbin "baserom.gba", 0x8A74A0, 0x0000820 gUnk_088A7CC0:: @ 088A7CC0 .incbin "baserom.gba", 0x8A7CC0, 0x0000340 @@ -7452,15 +3738,13 @@ gUnk_088A8500:: @ 088A8500 .incbin "baserom.gba", 0x8A8500, 0x0000500 gUnk_088A8A00:: @ 088A8A00 - .incbin "baserom.gba", 0x8A8A00, 0x00001CA - .incbin "baserom.gba", 0x8A8BCA, 0x00005F6 + .incbin "baserom.gba", 0x8A8A00, 0x00007C0 gUnk_088A91C0:: @ 088A91C0 .incbin "baserom.gba", 0x8A91C0, 0x0000660 gUnk_088A9820:: @ 088A9820 - .incbin "baserom.gba", 0x8A9820, 0x0000179 - .incbin "baserom.gba", 0x8A9999, 0x0000247 + .incbin "baserom.gba", 0x8A9820, 0x00003C0 gUnk_088A9BE0:: @ 088A9BE0 .incbin "baserom.gba", 0x8A9BE0, 0x0000460 @@ -7469,27 +3753,22 @@ gUnk_088AA040:: @ 088AA040 .incbin "baserom.gba", 0x8AA040, 0x0000380 gUnk_088AA3C0:: @ 088AA3C0 - .incbin "baserom.gba", 0x8AA3C0, 0x00004E0 - .incbin "baserom.gba", 0x8AA8A0, 0x0000209 - .incbin "baserom.gba", 0x8AAAA9, 0x0000137 + .incbin "baserom.gba", 0x8AA3C0, 0x0000820 gUnk_088AABE0:: @ 088AABE0 .incbin "baserom.gba", 0x8AABE0, 0x00006A0 gUnk_088AB280:: @ 088AB280 - .incbin "baserom.gba", 0x8AB280, 0x00008A4 - .incbin "baserom.gba", 0x8ABB24, 0x00000DC + .incbin "baserom.gba", 0x8AB280, 0x0000980 gUnk_088ABC00:: @ 088ABC00 - .incbin "baserom.gba", 0x8ABC00, 0x00001D6 - .incbin "baserom.gba", 0x8ABDD6, 0x000040A + .incbin "baserom.gba", 0x8ABC00, 0x00005E0 gUnk_088AC1E0:: @ 088AC1E0 .incbin "baserom.gba", 0x8AC1E0, 0x00008A0 gUnk_088ACA80:: @ 088ACA80 - .incbin "baserom.gba", 0x8ACA80, 0x000024B - .incbin "baserom.gba", 0x8ACCCB, 0x0000675 + .incbin "baserom.gba", 0x8ACA80, 0x00008C0 gUnk_088AD340:: @ 088AD340 .incbin "baserom.gba", 0x8AD340, 0x00005A0 @@ -7501,17 +3780,13 @@ gUnk_088ADF00:: @ 088ADF00 .incbin "baserom.gba", 0x8ADF00, 0x0000F00 gUnk_088AEE00:: @ 088AEE00 - .incbin "baserom.gba", 0x8AEE00, 0x00000EE - .incbin "baserom.gba", 0x8AEEEE, 0x0000552 + .incbin "baserom.gba", 0x8AEE00, 0x0000640 gUnk_088AF440:: @ 088AF440 - .incbin "baserom.gba", 0x8AF440, 0x00012C0 - .incbin "baserom.gba", 0x8B0700, 0x000018A - .incbin "baserom.gba", 0x8B088A, 0x0001136 + .incbin "baserom.gba", 0x8AF440, 0x0002580 gUnk_088B19C0:: @ 088B19C0 - .incbin "baserom.gba", 0x8B19C0, 0x000076E - .incbin "baserom.gba", 0x8B212E, 0x0001032 + .incbin "baserom.gba", 0x8B19C0, 0x00017A0 gUnk_088B3160:: @ 088B3160 .incbin "baserom.gba", 0x8B3160, 0x00019A0 @@ -7526,13 +3801,10 @@ gUnk_088B7CA0:: @ 088B7CA0 .incbin "baserom.gba", 0x8B7CA0, 0x0001640 gUnk_088B92E0:: @ 088B92E0 - .incbin "baserom.gba", 0x8B92E0, 0x00010AB - .incbin "baserom.gba", 0x8BA38B, 0x0000715 + .incbin "baserom.gba", 0x8B92E0, 0x00017C0 gUnk_088BAAA0:: @ 088BAAA0 - .incbin "baserom.gba", 0x8BAAA0, 0x000001B - .incbin "baserom.gba", 0x8BAABB, 0x00000D0 - .incbin "baserom.gba", 0x8BAB8B, 0x0000D15 + .incbin "baserom.gba", 0x8BAAA0, 0x0000E00 gUnk_088BB8A0:: @ 088BB8A0 .incbin "baserom.gba", 0x8BB8A0, 0x0000580 @@ -7544,276 +3816,18 @@ gUnk_088BCA60:: @ 088BCA60 .incbin "baserom.gba", 0x8BCA60, 0x0001100 gUnk_088BDB60:: @ 088BDB60 - .incbin "baserom.gba", 0x8BDB60, 0x0001304 - .incbin "baserom.gba", 0x8BEE64, 0x000127C + .incbin "baserom.gba", 0x8BDB60, 0x0002580 gUnk_088C00E0:: @ 088C00E0 - .incbin "baserom.gba", 0x8C00E0, 0x0000220 - .incbin "baserom.gba", 0x8C0300, 0x000035C - .incbin "baserom.gba", 0x8C065C, 0x00002A4 - .incbin "baserom.gba", 0x8C0900, 0x0001980 + .incbin "baserom.gba", 0x8C00E0, 0x00021A0 @ TODO end of figurine data .incbin "graphics/intro/nintendo_capcom.4bpp" - .incbin "baserom.gba", 0x8C31E0, 0x00030AC - .incbin "baserom.gba", 0x8C628C, 0x00003FC - .incbin "baserom.gba", 0x8C6688, 0x00016A8 - .incbin "baserom.gba", 0x8C7D30, 0x0007178 - .incbin "baserom.gba", 0x8CEEA8, 0x0001162 - .incbin "baserom.gba", 0x8D000A, 0x0000982 - .incbin "baserom.gba", 0x8D098C, 0x0001A31 - .incbin "baserom.gba", 0x8D23BD, 0x0001343 - .incbin "baserom.gba", 0x8D3700, 0x0000FC8 - .incbin "baserom.gba", 0x8D46C8, 0x0002078 - .incbin "baserom.gba", 0x8D6740, 0x00020F3 - .incbin "baserom.gba", 0x8D8833, 0x0001AD5 - .incbin "baserom.gba", 0x8DA308, 0x00030A4 - .incbin "baserom.gba", 0x8DD3AC, 0x0002C5B - .incbin "baserom.gba", 0x8E0007, 0x0000088 - .incbin "baserom.gba", 0x8E008F, 0x0000075 - .incbin "baserom.gba", 0x8E0104, 0x0000231 - .incbin "baserom.gba", 0x8E0335, 0x0000159 - .incbin "baserom.gba", 0x8E048E, 0x0000FEB - .incbin "baserom.gba", 0x8E1479, 0x0005A09 - .incbin "baserom.gba", 0x8E6E82, 0x0000EF7 - .incbin "baserom.gba", 0x8E7D79, 0x0004315 - .incbin "baserom.gba", 0x8EC08E, 0x0002E60 - .incbin "baserom.gba", 0x8EEEEE, 0x0001292 - .incbin "baserom.gba", 0x8F0180, 0x000020D - .incbin "baserom.gba", 0x8F038D, 0x0000DC4 - .incbin "baserom.gba", 0x8F1151, 0x000045D - .incbin "baserom.gba", 0x8F15AE, 0x0002FB8 - .incbin "baserom.gba", 0x8F4566, 0x000119C - .incbin "baserom.gba", 0x8F5702, 0x0005186 - .incbin "baserom.gba", 0x8FA888, 0x0000107 - .incbin "baserom.gba", 0x8FA98F, 0x000422C - .incbin "baserom.gba", 0x8FEBBB, 0x0000BCD - .incbin "baserom.gba", 0x8FF788, 0x0000878 - .incbin "baserom.gba", 0x900000, 0x0000099 - .incbin "baserom.gba", 0x900099, 0x0000035 - .incbin "baserom.gba", 0x9000CE, 0x0000042 - .incbin "baserom.gba", 0x900110, 0x0000270 - .incbin "baserom.gba", 0x900380, 0x00002A0 + .incbin "baserom.gba", 0x8C31E0, 0x003D440 .ifdef EU - .incbin "baserom_eu.gba", 0x8FFDF0, 0x00AED70 + .incbin "baserom_eu.gba", 0x8FFDF0, 0x00AED70 .else - .incbin "baserom.gba", 0x900620, 0x0003D2B - .incbin "baserom.gba", 0x90434B, 0x0009DB3 - .incbin "baserom.gba", 0x90E0FE, 0x0000302 - .incbin "baserom.gba", 0x90E400, 0x0000004 - .incbin "baserom.gba", 0x90E404, 0x0000100 - .incbin "baserom.gba", 0x90E504, 0x0000100 - .incbin "baserom.gba", 0x90E604, 0x00002FB - .incbin "baserom.gba", 0x90E8FF, 0x00007E9 - .incbin "baserom.gba", 0x90F0E8, 0x0000F18 - .incbin "baserom.gba", 0x910000, 0x0000007 - .incbin "baserom.gba", 0x910007, 0x00002F9 - .incbin "baserom.gba", 0x910300, 0x0000168 - .incbin "baserom.gba", 0x910468, 0x0000398 - .incbin "baserom.gba", 0x910800, 0x0000090 - .incbin "baserom.gba", 0x910890, 0x0000993 - .incbin "baserom.gba", 0x911223, 0x0000776 - .incbin "baserom.gba", 0x911999, 0x0000467 - .incbin "baserom.gba", 0x911E00, 0x0002418 - .incbin "baserom.gba", 0x914218, 0x000012E - .incbin "baserom.gba", 0x914346, 0x00003BA - .incbin "baserom.gba", 0x914700, 0x0002BFF - .incbin "baserom.gba", 0x9172FF, 0x0000589 - .incbin "baserom.gba", 0x917888, 0x0000345 - .incbin "baserom.gba", 0x917BCD, 0x0000FBE - .incbin "baserom.gba", 0x918B8B, 0x000250E - .incbin "baserom.gba", 0x91B099, 0x0000A11 - .incbin "baserom.gba", 0x91BAAA, 0x0002757 - .incbin "baserom.gba", 0x91E201, 0x0001D00 - .incbin "baserom.gba", 0x91FF01, 0x00000EF - .incbin "baserom.gba", 0x91FFF0, 0x0000010 - .incbin "baserom.gba", 0x920000, 0x0000120 - .incbin "baserom.gba", 0x920120, 0x0000672 - .incbin "baserom.gba", 0x920792, 0x00000FF - .incbin "baserom.gba", 0x920891, 0x0000802 - .incbin "baserom.gba", 0x921093, 0x00001F7 - .incbin "baserom.gba", 0x92128A, 0x0001B9F - .incbin "baserom.gba", 0x922E29, 0x0004969 - .incbin "baserom.gba", 0x927792, 0x0000305 - .incbin "baserom.gba", 0x927A97, 0x0001520 - .incbin "baserom.gba", 0x928FB7, 0x00003DA - .incbin "baserom.gba", 0x929391, 0x00000C6 - .incbin "baserom.gba", 0x929457, 0x0000879 - .incbin "baserom.gba", 0x929CD0, 0x00001B9 - .incbin "baserom.gba", 0x929E89, 0x0003465 - .incbin "baserom.gba", 0x92D2EE, 0x0000FAB - .incbin "baserom.gba", 0x92E299, 0x00000F9 - .incbin "baserom.gba", 0x92E392, 0x0000A90 - .incbin "baserom.gba", 0x92EE22, 0x000000B - .incbin "baserom.gba", 0x92EE2D, 0x00011D3 - .incbin "baserom.gba", 0x930000, 0x0000010 - .incbin "baserom.gba", 0x930010, 0x0000773 - .incbin "baserom.gba", 0x930783, 0x0000010 - .incbin "baserom.gba", 0x930793, 0x00000FF - .incbin "baserom.gba", 0x930892, 0x0001FB2 - .incbin "baserom.gba", 0x932844, 0x00016BC - .incbin "baserom.gba", 0x933F00, 0x0002200 - .incbin "baserom.gba", 0x936100, 0x00020A6 - .incbin "baserom.gba", 0x9381A6, 0x0000EC1 - .incbin "baserom.gba", 0x939067, 0x000032C - .incbin "baserom.gba", 0x939393, 0x00071F8 - .incbin "baserom.gba", 0x94058B, 0x0000308 - .incbin "baserom.gba", 0x940893, 0x0000B9C - .incbin "baserom.gba", 0x94142F, 0x0000CD1 - .incbin "baserom.gba", 0x942100, 0x0000267 - .incbin "baserom.gba", 0x942367, 0x00010DF - .incbin "baserom.gba", 0x943446, 0x0000DDB - .incbin "baserom.gba", 0x944221, 0x00006DD - .incbin "baserom.gba", 0x9448FE, 0x0000C57 - .incbin "baserom.gba", 0x945555, 0x0003F18 - .incbin "baserom.gba", 0x94946D, 0x0001760 - .incbin "baserom.gba", 0x94ABCD, 0x0001FEE - .incbin "baserom.gba", 0x94CBBB, 0x000344C - .incbin "baserom.gba", 0x950007, 0x00008F9 - .incbin "baserom.gba", 0x950900, 0x0002600 - .incbin "baserom.gba", 0x952F00, 0x0000791 - .incbin "baserom.gba", 0x953691, 0x000076F - .incbin "baserom.gba", 0x953E00, 0x0001654 - .incbin "baserom.gba", 0x955454, 0x00000F0 - .incbin "baserom.gba", 0x955544, 0x0000011 - .incbin "baserom.gba", 0x955555, 0x0003B72 - .incbin "baserom.gba", 0x9590C7, 0x0001642 - .incbin "baserom.gba", 0x95A709, 0x00058F7 - .incbin "baserom.gba", 0x960000, 0x0000132 - .incbin "baserom.gba", 0x960132, 0x0000B5E - .incbin "baserom.gba", 0x960C90, 0x00000A4 - .incbin "baserom.gba", 0x960D34, 0x00004E2 - .incbin "baserom.gba", 0x961216, 0x000CBD8 - .incbin "baserom.gba", 0x96DDEE, 0x0002212 - .incbin "baserom.gba", 0x970000, 0x000000A - .incbin "baserom.gba", 0x97000A, 0x0000009 - .incbin "baserom.gba", 0x970013, 0x000002D - .incbin "baserom.gba", 0x970040, 0x0000856 - .incbin "baserom.gba", 0x970896, 0x000076B - .incbin "baserom.gba", 0x971001, 0x000005A - .incbin "baserom.gba", 0x97105B, 0x0001D85 - .incbin "baserom.gba", 0x972DE0, 0x0001553 - .incbin "baserom.gba", 0x974333, 0x0001200 - .incbin "baserom.gba", 0x975533, 0x00022AB - .incbin "baserom.gba", 0x9777DE, 0x0001DB0 - .incbin "baserom.gba", 0x97958E, 0x0001C62 - .incbin "baserom.gba", 0x97B1F0, 0x00007A7 - .incbin "baserom.gba", 0x97B997, 0x0004669 - .incbin "baserom.gba", 0x980000, 0x0000012 - .incbin "baserom.gba", 0x980012, 0x0000196 - .incbin "baserom.gba", 0x9801A8, 0x0001769 - .incbin "baserom.gba", 0x981911, 0x00018EF - .incbin "baserom.gba", 0x983200, 0x00002AD - .incbin "baserom.gba", 0x9834AD, 0x00010A8 - .incbin "baserom.gba", 0x984555, 0x0001AAB - .incbin "baserom.gba", 0x986000, 0x000189E - .incbin "baserom.gba", 0x98789E, 0x0000074 - .incbin "baserom.gba", 0x987912, 0x0000CEE - .incbin "baserom.gba", 0x988600, 0x0000178 - .incbin "baserom.gba", 0x988778, 0x0000110 - .incbin "baserom.gba", 0x988888, 0x0000F77 - .incbin "baserom.gba", 0x9897FF, 0x000009F - .incbin "baserom.gba", 0x98989E, 0x000000C - .incbin "baserom.gba", 0x9898AA, 0x0000176 - .incbin "baserom.gba", 0x989A20, 0x00004CE - .incbin "baserom.gba", 0x989EEE, 0x00011C9 - .incbin "baserom.gba", 0x98B0B7, 0x00008D2 - .incbin "baserom.gba", 0x98B989, 0x0001455 - .incbin "baserom.gba", 0x98CDDE, 0x0002222 - .incbin "baserom.gba", 0x98F000, 0x0000799 - .incbin "baserom.gba", 0x98F799, 0x0000755 - .incbin "baserom.gba", 0x98FEEE, 0x0000112 - .incbin "baserom.gba", 0x990000, 0x000001B - .incbin "baserom.gba", 0x99001B, 0x00000B3 - .incbin "baserom.gba", 0x9900CE, 0x0000001 - .incbin "baserom.gba", 0x9900CF, 0x0000070 - .incbin "baserom.gba", 0x99013F, 0x0000001 - .incbin "baserom.gba", 0x990140, 0x0000030 - .incbin "baserom.gba", 0x990170, 0x0000098 - .incbin "baserom.gba", 0x990208, 0x0000108 - .incbin "baserom.gba", 0x990310, 0x00002F0 - .incbin "baserom.gba", 0x990600, 0x0000400 - .incbin "baserom.gba", 0x990A00, 0x000177A - .incbin "baserom.gba", 0x99217A, 0x0000C74 - .incbin "baserom.gba", 0x992DEE, 0x00000F4 - .incbin "baserom.gba", 0x992EE2, 0x000000B - .incbin "baserom.gba", 0x992EED, 0x0000813 - .incbin "baserom.gba", 0x993700, 0x0000B44 - .incbin "baserom.gba", 0x994244, 0x0001311 - .incbin "baserom.gba", 0x995555, 0x00019AB - .incbin "baserom.gba", 0x996F00, 0x0000755 - .incbin "baserom.gba", 0x997655, 0x000061C - .incbin "baserom.gba", 0x997C71, 0x0000B27 - .incbin "baserom.gba", 0x998798, 0x00000EF - .incbin "baserom.gba", 0x998887, 0x0000001 - .incbin "baserom.gba", 0x998888, 0x0000028 - .incbin "baserom.gba", 0x9988B0, 0x00000A5 - .incbin "baserom.gba", 0x998955, 0x0000034 - .incbin "baserom.gba", 0x998989, 0x0000177 - .incbin "baserom.gba", 0x998B00, 0x0000488 - .incbin "baserom.gba", 0x998F88, 0x0000057 - .incbin "baserom.gba", 0x998FDF, 0x00002FF - .incbin "baserom.gba", 0x9992DE, 0x0000004 - .incbin "baserom.gba", 0x9992E2, 0x000058E - .incbin "baserom.gba", 0x999870, 0x0000004 - .incbin "baserom.gba", 0x999874, 0x0000013 - .incbin "baserom.gba", 0x999887, 0x0000013 - .incbin "baserom.gba", 0x99989A, 0x0000001 - .incbin "baserom.gba", 0x99989B, 0x0000066 - .incbin "baserom.gba", 0x999901, 0x0000021 - .incbin "baserom.gba", 0x999922, 0x000005E - .incbin "baserom.gba", 0x999980, 0x0000007 - .incbin "baserom.gba", 0x999987, 0x0000001 - .incbin "baserom.gba", 0x999988, 0x0000001 - .incbin "baserom.gba", 0x999989, 0x0000001 - .incbin "baserom.gba", 0x99998A, 0x000000E - .incbin "baserom.gba", 0x999998, 0x0000001 - .incbin "baserom.gba", 0x999999, 0x0000013 - .incbin "baserom.gba", 0x9999AC, 0x0000010 - .incbin "baserom.gba", 0x9999BC, 0x000003C - .incbin "baserom.gba", 0x9999F8, 0x00000B2 - .incbin "baserom.gba", 0x999AAA, 0x0000056 - .incbin "baserom.gba", 0x999B00, 0x00000CC - .incbin "baserom.gba", 0x999BCC, 0x00003BC - .incbin "baserom.gba", 0x999F88, 0x00008AB - .incbin "baserom.gba", 0x99A833, 0x0000201 - .incbin "baserom.gba", 0x99AA34, 0x0000075 - .incbin "baserom.gba", 0x99AAA9, 0x0000012 - .incbin "baserom.gba", 0x99AABB, 0x0000545 - .incbin "baserom.gba", 0x99B000, 0x00003FF - .incbin "baserom.gba", 0x99B3FF, 0x000059A - .incbin "baserom.gba", 0x99B999, 0x0000006 - .incbin "baserom.gba", 0x99B99F, 0x0000620 - .incbin "baserom.gba", 0x99BFBF, 0x000003A - .incbin "baserom.gba", 0x99BFF9, 0x0000708 - .incbin "baserom.gba", 0x99C701, 0x00027ED - .incbin "baserom.gba", 0x99EEEE, 0x000012D - .incbin "baserom.gba", 0x99F01B, 0x0000FE6 - .incbin "baserom.gba", 0x9A0001, 0x0000087 - .incbin "baserom.gba", 0x9A0088, 0x0000811 - .incbin "baserom.gba", 0x9A0899, 0x00000F7 - .incbin "baserom.gba", 0x9A0990, 0x0000B3C - .incbin "baserom.gba", 0x9A14CC, 0x0001B34 - .incbin "baserom.gba", 0x9A3000, 0x0000D18 - .incbin "baserom.gba", 0x9A3D18, 0x000073D - .incbin "baserom.gba", 0x9A4455, 0x0001188 - .incbin "baserom.gba", 0x9A55DD, 0x0002E3B - .incbin "baserom.gba", 0x9A8418, 0x00013E7 - .incbin "baserom.gba", 0x9A97FF, 0x000019A - .incbin "baserom.gba", 0x9A9999, 0x0000101 - .incbin "baserom.gba", 0x9A9A9A, 0x0000F00 - .incbin "baserom.gba", 0x9AA99A, 0x0000089 - .incbin "baserom.gba", 0x9AAA23, 0x0000087 - .incbin "baserom.gba", 0x9AAAAA, 0x0000111 - .incbin "baserom.gba", 0x9AABBB, 0x0000011 - .incbin "baserom.gba", 0x9AABCC, 0x0000FEF - .incbin "baserom.gba", 0x9ABBBB, 0x0000A33 - .incbin "baserom.gba", 0x9AC5EE, 0x00018ED - .incbin "baserom.gba", 0x9ADEDB, 0x0002125 - .incbin "baserom.gba", 0x9B0000, 0x00002BC - .incbin "baserom.gba", 0x9B02BC, 0x0000054 - .incbin "baserom.gba", 0x9B0310, 0x0000CF0 - .incbin "baserom.gba", 0x9B1000, 0x0000D90 + .incbin "baserom.gba", 0x900620, 0x00B1770 .endif diff --git a/data/data_089FC6C4.s b/data/data_089FC6C4.s index 5665c10d..9f0f4d61 100644 --- a/data/data_089FC6C4.s +++ b/data/data_089FC6C4.s @@ -292,8 +292,7 @@ gUnk_089FE9A0:: @ 089FE9A0 .incbin "baserom.gba", 0x9FEF9C, 0x0000004 gUnk_089FEFA0:: @ 089FEFA0 - .incbin "baserom.gba", 0x9FEFA0, 0x0000060 - .incbin "baserom.gba", 0x9FF000, 0x0000154 + .incbin "baserom.gba", 0x9FEFA0, 0x00001B4 .4byte gUnk_08A6CB30 .incbin "baserom.gba", 0x9FF158, 0x0000074 .4byte gUnk_08A792C0 @@ -336,9 +335,7 @@ gUnk_089FF24C:: @ 089FF24C .4byte gUnk_08AAA1D0 .incbin "baserom.gba", 0x9FF518, 0x0000014 .4byte gUnk_08A94EFC - .incbin "baserom.gba", 0x9FF530, 0x0000025 - .incbin "baserom.gba", 0x9FF555, 0x0000169 - .incbin "baserom.gba", 0x9FF6BE, 0x0000186 + .incbin "baserom.gba", 0x9FF530, 0x0000314 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0x9FF848, 0x0000004 @@ -351,8 +348,7 @@ gUnk_089FF84C:: @ 089FF84C .4byte gUnk_08A231A4 .incbin "baserom.gba", 0x9FF9EC, 0x0000008 .4byte gUnk_08A240F8 - .incbin "baserom.gba", 0x9FF9F8, 0x000028B - .incbin "baserom.gba", 0x9FFC83, 0x00001C1 + .incbin "baserom.gba", 0x9FF9F8, 0x000044C .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0x9FFE48, 0x0000004 @@ -385,8 +381,7 @@ gUnk_089FFE4C:: @ 089FFE4C .4byte gUnk_08A47F98 .incbin "baserom.gba", 0xA00070, 0x0000008 .4byte gUnk_08A792C0 - .incbin "baserom.gba", 0xA0007C, 0x0000001 - .incbin "baserom.gba", 0xA0007D, 0x0000007 + .incbin "baserom.gba", 0xA0007C, 0x0000008 .4byte gUnk_08A7BF5C .incbin "baserom.gba", 0xA00088, 0x0000014 .4byte gUnk_08A4EDE8 @@ -399,8 +394,7 @@ gUnk_089FFE4C:: @ 089FFE4C .incbin "baserom.gba", 0xA00448, 0x0000004 gUnk_08A0044C:: @ 08A0044C - .incbin "baserom.gba", 0xA0044C, 0x0000046 - .incbin "baserom.gba", 0xA00492, 0x0000072 + .incbin "baserom.gba", 0xA0044C, 0x00000B8 .4byte gUnk_08A11C1C .incbin "baserom.gba", 0xA00508, 0x00000C8 .4byte gUnk_08A1F640 @@ -412,9 +406,7 @@ gUnk_08A0044C:: @ 08A0044C .4byte gUnk_08A240F8 .incbin "baserom.gba", 0xA005F8, 0x00000BC .4byte gUnk_08A84DCC - .incbin "baserom.gba", 0xA006B8, 0x00000C8 - .incbin "baserom.gba", 0xA00780, 0x00000A7 - .incbin "baserom.gba", 0xA00827, 0x000021D + .incbin "baserom.gba", 0xA006B8, 0x000038C .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA00A48, 0x0000004 @@ -482,8 +474,7 @@ gUnk_08A00CF8:: @ 08A00CF8 .4byte gUnk_08A8F6A8 .incbin "baserom.gba", 0xA00FB8, 0x0000044 .4byte gUnk_08AF5C90 - .incbin "baserom.gba", 0xA01000, 0x000001F - .incbin "baserom.gba", 0xA0101F, 0x00002D1 + .incbin "baserom.gba", 0xA01000, 0x00002F0 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA012F4, 0x0000004 @@ -736,8 +727,7 @@ gUnk_08A03D94:: @ 08A03D94 .4byte gUnk_08A5496C .incbin "baserom.gba", 0xA0400C, 0x0000008 .4byte gUnk_08A5496C - .incbin "baserom.gba", 0xA04018, 0x0000057 - .incbin "baserom.gba", 0xA0406F, 0x000031D + .incbin "baserom.gba", 0xA04018, 0x0000374 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA04390, 0x0000004 @@ -899,8 +889,7 @@ gUnk_08A05594:: @ 08A05594 .4byte gUnk_08B25CD0 .incbin "baserom.gba", 0xA058A8, 0x0000008 .4byte gUnk_08B2A77C - .incbin "baserom.gba", 0xA058B4, 0x000004C - .incbin "baserom.gba", 0xA05900, 0x000028C + .incbin "baserom.gba", 0xA058B4, 0x00002D8 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA05B90, 0x0000004 @@ -1070,8 +1059,7 @@ gUnk_08A06D94:: @ 08A06D94 .4byte gUnk_08A5496C .incbin "baserom.gba", 0xA0700C, 0x0000008 .4byte gUnk_08A88854 - .incbin "baserom.gba", 0xA07018, 0x0000188 - .incbin "baserom.gba", 0xA071A0, 0x00001EC + .incbin "baserom.gba", 0xA07018, 0x0000374 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA07390, 0x0000004 @@ -1159,8 +1147,7 @@ gUnk_08A07C10:: @ 08A07C10 .4byte gUnk_08A7BF5C .incbin "baserom.gba", 0xA07E4C, 0x0000038 .4byte gUnk_08A5496C - .incbin "baserom.gba", 0xA07E88, 0x0000178 - .incbin "baserom.gba", 0xA08000, 0x0000208 + .incbin "baserom.gba", 0xA07E88, 0x0000380 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA0820C, 0x0000004 @@ -1396,8 +1383,7 @@ gUnk_08A096D4:: @ 08A096D4 .incbin "baserom.gba", 0xA09CD0, 0x0000004 gUnk_08A09CD4:: @ 08A09CD4 - .incbin "baserom.gba", 0xA09CD4, 0x0000007 - .incbin "baserom.gba", 0xA09CDB, 0x00000B1 + .incbin "baserom.gba", 0xA09CD4, 0x00000B8 .4byte gUnk_08A11C1C .incbin "baserom.gba", 0xA09D90, 0x00000A4 .4byte gUnk_08A16610 @@ -1434,9 +1420,7 @@ gUnk_08A09F44:: @ 08A09F44 .4byte gUnk_08A240F8 .incbin "baserom.gba", 0xA0A0F0, 0x00000C8 .4byte gUnk_08A5496C - .incbin "baserom.gba", 0xA0A1BC, 0x000015C - .incbin "baserom.gba", 0xA0A318, 0x0000100 - .incbin "baserom.gba", 0xA0A418, 0x0000124 + .incbin "baserom.gba", 0xA0A1BC, 0x0000380 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA0A540, 0x0000004 @@ -1457,14 +1441,12 @@ gUnk_08A0A544:: @ 08A0A544 .4byte gUnk_08A2834C .incbin "baserom.gba", 0xA0A708, 0x00000B0 .4byte gUnk_08A5496C - .incbin "baserom.gba", 0xA0A7BC, 0x00000F4 - .incbin "baserom.gba", 0xA0A8B0, 0x000028C + .incbin "baserom.gba", 0xA0A7BC, 0x0000380 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA0AB40, 0x0000004 gUnk_08A0AB44:: @ 08A0AB44 - .incbin "baserom.gba", 0xA0AB44, 0x0000045 - .incbin "baserom.gba", 0xA0AB89, 0x0000073 + .incbin "baserom.gba", 0xA0AB44, 0x00000B8 .4byte gUnk_08A11C1C .incbin "baserom.gba", 0xA0AC00, 0x00000A4 .4byte gUnk_08A16610 @@ -1651,8 +1633,7 @@ gUnk_08A0C944:: @ 08A0C944 .4byte gUnk_08B08B14 .incbin "baserom.gba", 0xA0CC70, 0x0000008 .4byte gUnk_08B3F61C - .incbin "baserom.gba", 0xA0CC7C, 0x00001A6 - .incbin "baserom.gba", 0xA0CE22, 0x000011A + .incbin "baserom.gba", 0xA0CC7C, 0x00002C0 .4byte gUnk_08A0FCE0 .incbin "baserom.gba", 0xA0CF40, 0x0000004 @@ -1913,8 +1894,7 @@ gUnk_08A0ED44:: @ 08A0ED44 gUnk_08A0F014:: @ 08A0F014 .incbin "baserom.gba", 0xA0F014, 0x00000B8 .4byte gUnk_08A11C1C - .incbin "baserom.gba", 0xA0F0D0, 0x0000027 - .incbin "baserom.gba", 0xA0F0F7, 0x000007D + .incbin "baserom.gba", 0xA0F0D0, 0x00000A4 .4byte gUnk_08A16610 .incbin "baserom.gba", 0xA0F178, 0x0000008 .4byte gUnk_08A12ED0 @@ -1969,8 +1949,7 @@ gUnk_08A0F614:: @ 08A0F614 .4byte gUnk_08A1F640 .incbin "baserom.gba", 0xA0F79C, 0x000002C .4byte gUnk_08A6CB30 - .incbin "baserom.gba", 0xA0F7CC, 0x0000025 - .incbin "baserom.gba", 0xA0F7F1, 0x0000007 + .incbin "baserom.gba", 0xA0F7CC, 0x000002C .4byte gUnk_08A3C71C .incbin "baserom.gba", 0xA0F7FC, 0x0000008 .4byte gUnk_08A5A90C @@ -2064,8 +2043,7 @@ gUnk_08A0FFF8:: @ 08A0FFF8 .incbin "baserom.gba", 0xA0FFF8, 0x000000C gUnk_08A10004:: @ 08A10004 - .incbin "baserom.gba", 0xA10004, 0x0000006 - .incbin "baserom.gba", 0xA1000A, 0x0000006 + .incbin "baserom.gba", 0xA10004, 0x000000C gUnk_08A10010:: @ 08A10010 .incbin "baserom.gba", 0xA10010, 0x0000018 @@ -2700,8 +2678,7 @@ gUnk_08A107E4:: @ 08A107E4 .incbin "baserom.gba", 0xA107E4, 0x0000018 gUnk_08A107FC:: @ 08A107FC - .incbin "baserom.gba", 0xA107FC, 0x0000004 - .incbin "baserom.gba", 0xA10800, 0x0000020 + .incbin "baserom.gba", 0xA107FC, 0x0000024 gUnk_08A10820:: @ 08A10820 .incbin "baserom.gba", 0xA10820, 0x0000018 @@ -2825,8 +2802,7 @@ gUnk_08A10A9C:: @ 08A10A9C .incbin "baserom.gba", 0xA10AA4, 0x0000004 gUnk_08A10AA8:: @ 08A10AA8 - .incbin "baserom.gba", 0xA10AA8, 0x0000003 - .incbin "baserom.gba", 0xA10AAB, 0x0000009 + .incbin "baserom.gba", 0xA10AA8, 0x000000C gUnk_08A10AB4:: @ 08A10AB4 .incbin "baserom.gba", 0xA10AB4, 0x0000004 diff --git a/data/data_08A127A1.s b/data/data_08A127A1.s index 3a8641c3..39c71986 100644 --- a/data/data_08A127A1.s +++ b/data/data_08A127A1.s @@ -11,26 +11,16 @@ gUnk_08A12ED0:: @ 08A12ED0 .incbin "baserom.gba", 0xA12ED0, 0x0003740 gUnk_08A16610:: @ 08A16610 - .incbin "baserom.gba", 0xA16610, 0x0001712 - .incbin "baserom.gba", 0xA17D22, 0x000109E - .incbin "baserom.gba", 0xA18DC0, 0x000178C + .incbin "baserom.gba", 0xA16610, 0x0003F3C gUnk_08A1A54C:: @ 08A1A54C - .incbin "baserom.gba", 0xA1A54C, 0x000055E - .incbin "baserom.gba", 0xA1AAAA, 0x0002466 - .incbin "baserom.gba", 0xA1CF10, 0x00014E8 - .incbin "baserom.gba", 0xA1E3F8, 0x0001248 + .incbin "baserom.gba", 0xA1A54C, 0x00050F4 gUnk_08A1F640:: @ 08A1F640 - .incbin "baserom.gba", 0xA1F640, 0x00009B0 - .incbin "baserom.gba", 0xA1FFF0, 0x0000110 - .incbin "baserom.gba", 0xA20100, 0x00016F7 - .incbin "baserom.gba", 0xA217F7, 0x00019AD + .incbin "baserom.gba", 0xA1F640, 0x0003B64 gUnk_08A231A4:: @ 08A231A4 - .incbin "baserom.gba", 0xA231A4, 0x00009E5 - .incbin "baserom.gba", 0xA23B89, 0x00003B7 - .incbin "baserom.gba", 0xA23F40, 0x00001B8 + .incbin "baserom.gba", 0xA231A4, 0x0000F54 gUnk_08A240F8:: @ 08A240F8 .incbin "baserom.gba", 0xA240F8, 0x0004254 @@ -39,332 +29,118 @@ gUnk_08A2834C:: @ 08A2834C .incbin "baserom.gba", 0xA2834C, 0x000420C gUnk_08A2C558:: @ 08A2C558 - .incbin "baserom.gba", 0xA2C558, 0x000144A - .incbin "baserom.gba", 0xA2D9A2, 0x0000500 - .incbin "baserom.gba", 0xA2DEA2, 0x0000A60 - .incbin "baserom.gba", 0xA2E902, 0x0001705 - .incbin "baserom.gba", 0xA30007, 0x0000009 - .incbin "baserom.gba", 0xA30010, 0x0000092 - .incbin "baserom.gba", 0xA300A2, 0x0000001 - .incbin "baserom.gba", 0xA300A3, 0x00007FF - .incbin "baserom.gba", 0xA308A2, 0x0001435 - .incbin "baserom.gba", 0xA31CD7, 0x0000694 - .incbin "baserom.gba", 0xA3236B, 0x0002B89 + .incbin "baserom.gba", 0xA2C558, 0x000899C gUnk_08A34EF4:: @ 08A34EF4 - .incbin "baserom.gba", 0xA34EF4, 0x000010C - .incbin "baserom.gba", 0xA35000, 0x00033A3 - .incbin "baserom.gba", 0xA383A3, 0x000275C - .incbin "baserom.gba", 0xA3AAFF, 0x0001C1D + .incbin "baserom.gba", 0xA34EF4, 0x0007828 gUnk_08A3C71C:: @ 08A3C71C - .incbin "baserom.gba", 0xA3C71C, 0x0003035 - .incbin "baserom.gba", 0xA3F751, 0x0005A0F + .incbin "baserom.gba", 0xA3C71C, 0x0008A44 gUnk_08A45160:: @ 08A45160 - .incbin "baserom.gba", 0xA45160, 0x00029AD - .incbin "baserom.gba", 0xA47B0D, 0x000048B + .incbin "baserom.gba", 0xA45160, 0x0002E38 gUnk_08A47F98:: @ 08A47F98 - .incbin "baserom.gba", 0xA47F98, 0x000100D - .incbin "baserom.gba", 0xA48FA5, 0x000110A - .incbin "baserom.gba", 0xA4A0AF, 0x0003157 - .incbin "baserom.gba", 0xA4D206, 0x0000E02 - .incbin "baserom.gba", 0xA4E008, 0x0000100 - .incbin "baserom.gba", 0xA4E108, 0x0000300 - .incbin "baserom.gba", 0xA4E408, 0x000049C - .incbin "baserom.gba", 0xA4E8A4, 0x0000544 + .incbin "baserom.gba", 0xA47F98, 0x0006E50 gUnk_08A4EDE8:: @ 08A4EDE8 - .incbin "baserom.gba", 0xA4EDE8, 0x0000218 - .incbin "baserom.gba", 0xA4F000, 0x00000F9 - .incbin "baserom.gba", 0xA4F0F9, 0x0000307 - .incbin "baserom.gba", 0xA4F400, 0x0000CA4 - .incbin "baserom.gba", 0xA500A4, 0x00013D7 - .incbin "baserom.gba", 0xA5147B, 0x00034F1 + .incbin "baserom.gba", 0xA4EDE8, 0x0005B84 gUnk_08A5496C:: @ 08A5496C - .incbin "baserom.gba", 0xA5496C, 0x0000683 - .incbin "baserom.gba", 0xA54FEF, 0x0003119 - .incbin "baserom.gba", 0xA58108, 0x0002804 + .incbin "baserom.gba", 0xA5496C, 0x0005FA0 gUnk_08A5A90C:: @ 08A5A90C .incbin "baserom.gba", 0xA5A90C, 0x000362C gUnk_08A5DF38:: @ 08A5DF38 - .incbin "baserom.gba", 0xA5DF38, 0x00024BF - .incbin "baserom.gba", 0xA603F7, 0x0000411 - .incbin "baserom.gba", 0xA60808, 0x000007D - .incbin "baserom.gba", 0xA60885, 0x00032AB - .incbin "baserom.gba", 0xA63B30, 0x000286C + .incbin "baserom.gba", 0xA5DF38, 0x0008464 gUnk_08A6639C:: @ 08A6639C - .incbin "baserom.gba", 0xA6639C, 0x000366A - .incbin "baserom.gba", 0xA69A06, 0x000312A + .incbin "baserom.gba", 0xA6639C, 0x0006794 gUnk_08A6CB30:: @ 08A6CB30 - .incbin "baserom.gba", 0xA6CB30, 0x00016E4 - .incbin "baserom.gba", 0xA6E214, 0x0001E0B - .incbin "baserom.gba", 0xA7001F, 0x00001F6 - .incbin "baserom.gba", 0xA70215, 0x000002A - .incbin "baserom.gba", 0xA7023F, 0x0001E2A - .incbin "baserom.gba", 0xA72069, 0x00001EC - .incbin "baserom.gba", 0xA72255, 0x0002D2E - .incbin "baserom.gba", 0xA74F83, 0x0000323 - .incbin "baserom.gba", 0xA752A6, 0x0003AF2 - .incbin "baserom.gba", 0xA78D98, 0x0000528 + .incbin "baserom.gba", 0xA6CB30, 0x000C790 gUnk_08A792C0:: @ 08A792C0 - .incbin "baserom.gba", 0xA792C0, 0x000143B - .incbin "baserom.gba", 0xA7A6FB, 0x0001861 + .incbin "baserom.gba", 0xA792C0, 0x0002C9C gUnk_08A7BF5C:: @ 08A7BF5C - .incbin "baserom.gba", 0xA7BF5C, 0x000119C - .incbin "baserom.gba", 0xA7D0F8, 0x0000690 + .incbin "baserom.gba", 0xA7BF5C, 0x000182C gUnk_08A7D788:: @ 08A7D788 - .incbin "baserom.gba", 0xA7D788, 0x000258F - .incbin "baserom.gba", 0xA7FD17, 0x00002E9 - .incbin "baserom.gba", 0xA80000, 0x0000001 - .incbin "baserom.gba", 0xA80001, 0x00008A7 - .incbin "baserom.gba", 0xA808A8, 0x000007C + .incbin "baserom.gba", 0xA7D788, 0x000319C gUnk_08A80924:: @ 08A80924 - .incbin "baserom.gba", 0xA80924, 0x00009C0 - .incbin "baserom.gba", 0xA812E4, 0x0000779 - .incbin "baserom.gba", 0xA81A5D, 0x0000AA3 - .incbin "baserom.gba", 0xA82500, 0x00028CC + .incbin "baserom.gba", 0xA80924, 0x00044A8 gUnk_08A84DCC:: @ 08A84DCC - .incbin "baserom.gba", 0xA84DCC, 0x0001FDD - .incbin "baserom.gba", 0xA86DA9, 0x0000710 - .incbin "baserom.gba", 0xA874B9, 0x00009F6 - .incbin "baserom.gba", 0xA87EAF, 0x00009A5 + .incbin "baserom.gba", 0xA84DCC, 0x0003A88 gUnk_08A88854:: @ 08A88854 - .incbin "baserom.gba", 0xA88854, 0x00000A7 - .incbin "baserom.gba", 0xA888FB, 0x00001E5 - .incbin "baserom.gba", 0xA88AE0, 0x00012F8 - .incbin "baserom.gba", 0xA89DD8, 0x000196B - .incbin "baserom.gba", 0xA8B743, 0x00019DB - .incbin "baserom.gba", 0xA8D11E, 0x00011F5 - .incbin "baserom.gba", 0xA8E313, 0x0001395 + .incbin "baserom.gba", 0xA88854, 0x0006E54 gUnk_08A8F6A8:: @ 08A8F6A8 - .incbin "baserom.gba", 0xA8F6A8, 0x0000DBC - .incbin "baserom.gba", 0xA90464, 0x000189C - .incbin "baserom.gba", 0xA91D00, 0x00031FC + .incbin "baserom.gba", 0xA8F6A8, 0x0005854 gUnk_08A94EFC:: @ 08A94EFC - .incbin "baserom.gba", 0xA94EFC, 0x00007F8 - .incbin "baserom.gba", 0xA956F4, 0x0002C3F - .incbin "baserom.gba", 0xA98333, 0x0000582 - .incbin "baserom.gba", 0xA988B5, 0x00010D3 - .incbin "baserom.gba", 0xA99988, 0x0000011 - .incbin "baserom.gba", 0xA99999, 0x00000CA - .incbin "baserom.gba", 0xA99A63, 0x0000035 - .incbin "baserom.gba", 0xA99A98, 0x0000F79 - .incbin "baserom.gba", 0xA9AA11, 0x0000FA7 - .incbin "baserom.gba", 0xA9B9B8, 0x0000100 - .incbin "baserom.gba", 0xA9BAB8, 0x0000001 - .incbin "baserom.gba", 0xA9BAB9, 0x0000001 - .incbin "baserom.gba", 0xA9BABA, 0x0000103 - .incbin "baserom.gba", 0xA9BBBD, 0x0000E8B + .incbin "baserom.gba", 0xA94EFC, 0x0007B4C gUnk_08A9CA48:: @ 08A9CA48 - .incbin "baserom.gba", 0xA9CA48, 0x00035B8 - .incbin "baserom.gba", 0xAA0000, 0x0000007 - .incbin "baserom.gba", 0xAA0007, 0x000000D - .incbin "baserom.gba", 0xAA0014, 0x00000A7 - .incbin "baserom.gba", 0xAA00BB, 0x0000645 - .incbin "baserom.gba", 0xAA0700, 0x0000A11 - .incbin "baserom.gba", 0xAA1111, 0x0000121 - .incbin "baserom.gba", 0xAA1232, 0x00003CE - .incbin "baserom.gba", 0xAA1600, 0x0000501 - .incbin "baserom.gba", 0xAA1B01, 0x0000C1F + .incbin "baserom.gba", 0xA9CA48, 0x0005CD8 gUnk_08AA2720:: @ 08AA2720 - .incbin "baserom.gba", 0xAA2720, 0x00020E5 - .incbin "baserom.gba", 0xAA4805, 0x00001E6 - .incbin "baserom.gba", 0xAA49EB, 0x0000B7B - .incbin "baserom.gba", 0xAA5566, 0x0000A9B - .incbin "baserom.gba", 0xAA6001, 0x0000DB8 - .incbin "baserom.gba", 0xAA6DB9, 0x0000370 - .incbin "baserom.gba", 0xAA7129, 0x00012FF - .incbin "baserom.gba", 0xAA8428, 0x0000400 - .incbin "baserom.gba", 0xAA8828, 0x00007D7 - .incbin "baserom.gba", 0xAA8FFF, 0x0000389 - .incbin "baserom.gba", 0xAA9388, 0x00000A1 - .incbin "baserom.gba", 0xAA9429, 0x00003E6 - .incbin "baserom.gba", 0xAA980F, 0x000019A - .incbin "baserom.gba", 0xAA99A9, 0x0000827 + .incbin "baserom.gba", 0xAA2720, 0x0007AB0 gUnk_08AAA1D0:: @ 08AAA1D0 - .incbin "baserom.gba", 0xAAA1D0, 0x0000030 - .incbin "baserom.gba", 0xAAA200, 0x0000100 - .incbin "baserom.gba", 0xAAA300, 0x00007AA - .incbin "baserom.gba", 0xAAAAAA, 0x0000111 - .incbin "baserom.gba", 0xAAABBB, 0x0000DFD - .incbin "baserom.gba", 0xAAB9B8, 0x0000003 - .incbin "baserom.gba", 0xAAB9BB, 0x0000200 - .incbin "baserom.gba", 0xAABBBB, 0x000051D + .incbin "baserom.gba", 0xAAA1D0, 0x0001F08 gUnk_08AAC0D8:: @ 08AAC0D8 - .incbin "baserom.gba", 0xAAC0D8, 0x0003E5A - .incbin "baserom.gba", 0xAAFF32, 0x0000023 - .incbin "baserom.gba", 0xAAFF55, 0x00000B1 - .incbin "baserom.gba", 0xAB0006, 0x0000033 - .incbin "baserom.gba", 0xAB0039, 0x00009C7 - .incbin "baserom.gba", 0xAB0A00, 0x0000FE7 - .incbin "baserom.gba", 0xAB19E7, 0x0002A4C - .incbin "baserom.gba", 0xAB4433, 0x0000E44 - .incbin "baserom.gba", 0xAB5277, 0x0001D89 - .incbin "baserom.gba", 0xAB7000, 0x0003800 - .incbin "baserom.gba", 0xABA800, 0x0000F6A - .incbin "baserom.gba", 0xABB76A, 0x0000328 - .incbin "baserom.gba", 0xABBA92, 0x000108E - .incbin "baserom.gba", 0xABCB20, 0x0000C1F - .incbin "baserom.gba", 0xABD73F, 0x000159F - .incbin "baserom.gba", 0xABECDE, 0x000110E + .incbin "baserom.gba", 0xAAC0D8, 0x0013D14 gUnk_08ABFDEC:: @ 08ABFDEC - .incbin "baserom.gba", 0xABFDEC, 0x000151F - .incbin "baserom.gba", 0xAC130B, 0x0004695 - .incbin "baserom.gba", 0xAC59A0, 0x0001FE4 + .incbin "baserom.gba", 0xABFDEC, 0x0007B98 gUnk_08AC7984:: @ 08AC7984 - .incbin "baserom.gba", 0xAC7984, 0x0000774 - .incbin "baserom.gba", 0xAC80F8, 0x0001F50 - .incbin "baserom.gba", 0xACA048, 0x00000B0 - .incbin "baserom.gba", 0xACA0F8, 0x0000CF4 - .incbin "baserom.gba", 0xACADEC, 0x0000DAA - .incbin "baserom.gba", 0xACBB96, 0x0001062 - .incbin "baserom.gba", 0xACCBF8, 0x00000F2 - .incbin "baserom.gba", 0xACCCEA, 0x00000F3 - .incbin "baserom.gba", 0xACCDDD, 0x0000FCB - .incbin "baserom.gba", 0xACDDA8, 0x0000350 - .incbin "baserom.gba", 0xACE0F8, 0x00004F8 - .incbin "baserom.gba", 0xACE5F0, 0x00006FE - .incbin "baserom.gba", 0xACECEE, 0x0001F10 - .incbin "baserom.gba", 0xAD0BFE, 0x00073CF - .incbin "baserom.gba", 0xAD7FCD, 0x0002DED - .incbin "baserom.gba", 0xADADBA, 0x000249E + .incbin "baserom.gba", 0xAC7984, 0x00158D4 gUnk_08ADD258:: @ 08ADD258 - .incbin "baserom.gba", 0xADD258, 0x00035A8 - .incbin "baserom.gba", 0xAE0800, 0x0004D65 - .incbin "baserom.gba", 0xAE5565, 0x000025A - .incbin "baserom.gba", 0xAE57BF, 0x0000040 - .incbin "baserom.gba", 0xAE57FF, 0x000193A - .incbin "baserom.gba", 0xAE7139, 0x00004F2 - .incbin "baserom.gba", 0xAE762B, 0x00009D5 - .incbin "baserom.gba", 0xAE8000, 0x00021B5 - .incbin "baserom.gba", 0xAEA1B5, 0x0000CF8 - .incbin "baserom.gba", 0xAEAEAD, 0x0000222 - .incbin "baserom.gba", 0xAEB0CF, 0x00027B7 - .incbin "baserom.gba", 0xAED886, 0x0001762 - .incbin "baserom.gba", 0xAEEFE8, 0x0002649 - .incbin "baserom.gba", 0xAF1631, 0x000080B + .incbin "baserom.gba", 0xADD258, 0x0014BE4 gUnk_08AF1E3C:: @ 08AF1E3C - .incbin "baserom.gba", 0xAF1E3C, 0x0003718 - .incbin "baserom.gba", 0xAF5554, 0x000073C + .incbin "baserom.gba", 0xAF1E3C, 0x0003E54 gUnk_08AF5C90:: @ 08AF5C90 - .incbin "baserom.gba", 0xAF5C90, 0x000322F - .incbin "baserom.gba", 0xAF8EBF, 0x0001D09 - .incbin "baserom.gba", 0xAFABC8, 0x000072B - .incbin "baserom.gba", 0xAFB2F3, 0x0004D0D - .incbin "baserom.gba", 0xB00000, 0x00000FE - .incbin "baserom.gba", 0xB000FE, 0x0000013 - .incbin "baserom.gba", 0xB00111, 0x000004F - .incbin "baserom.gba", 0xB00160, 0x0000330 - .incbin "baserom.gba", 0xB00490, 0x0000026 - .incbin "baserom.gba", 0xB004B6, 0x00000EA - .incbin "baserom.gba", 0xB005A0, 0x000022C - .incbin "baserom.gba", 0xB007CC, 0x00000E3 - .incbin "baserom.gba", 0xB008AF, 0x0000928 - .incbin "baserom.gba", 0xB011D7, 0x0000129 - .incbin "baserom.gba", 0xB01300, 0x0007814 + .incbin "baserom.gba", 0xAF5C90, 0x0012E84 gUnk_08B08B14:: @ 08B08B14 - .incbin "baserom.gba", 0xB08B14, 0x0000E85 - .incbin "baserom.gba", 0xB09999, 0x0003F66 - .incbin "baserom.gba", 0xB0D8FF, 0x0000A34 - .incbin "baserom.gba", 0xB0E333, 0x000067D - .incbin "baserom.gba", 0xB0E9B0, 0x0000D91 - .incbin "baserom.gba", 0xB0F741, 0x00008BF - .incbin "baserom.gba", 0xB10000, 0x0000006 - .incbin "baserom.gba", 0xB10006, 0x0000001 - .incbin "baserom.gba", 0xB10007, 0x00003A9 - .incbin "baserom.gba", 0xB103B0, 0x00001B8 + .incbin "baserom.gba", 0xB08B14, 0x0007A54 gUnk_08B10568:: @ 08B10568 - .incbin "baserom.gba", 0xB10568, 0x0000249 - .incbin "baserom.gba", 0xB107B1, 0x0002000 - .incbin "baserom.gba", 0xB127B1, 0x0000200 - .incbin "baserom.gba", 0xB129B1, 0x0000600 - .incbin "baserom.gba", 0xB12FB1, 0x0001861 - .incbin "baserom.gba", 0xB14812, 0x0000EF1 - .incbin "baserom.gba", 0xB15703, 0x000103C - .incbin "baserom.gba", 0xB1673F, 0x000547C - .incbin "baserom.gba", 0xB1BBBB, 0x00010C1 + .incbin "baserom.gba", 0xB10568, 0x000C714 gUnk_08B1CC7C:: @ 08B1CC7C - .incbin "baserom.gba", 0xB1CC7C, 0x000200E - .incbin "baserom.gba", 0xB1EC8A, 0x0000EA8 - .incbin "baserom.gba", 0xB1FB32, 0x0001527 - .incbin "baserom.gba", 0xB21059, 0x00004E6 - .incbin "baserom.gba", 0xB2153F, 0x0001DD4 - .incbin "baserom.gba", 0xB23313, 0x0000007 - .incbin "baserom.gba", 0xB2331A, 0x00009A4 - .incbin "baserom.gba", 0xB23CBE, 0x0000813 - .incbin "baserom.gba", 0xB244D1, 0x00017FF + .incbin "baserom.gba", 0xB1CC7C, 0x0009054 gUnk_08B25CD0:: @ 08B25CD0 - .incbin "baserom.gba", 0xB25CD0, 0x0003EF4 - .incbin "baserom.gba", 0xB29BC4, 0x0000BB8 + .incbin "baserom.gba", 0xB25CD0, 0x0004AAC gUnk_08B2A77C:: @ 08B2A77C - .incbin "baserom.gba", 0xB2A77C, 0x0000934 - .incbin "baserom.gba", 0xB2B0B0, 0x0002E4F - .incbin "baserom.gba", 0xB2DEFF, 0x00009B7 - .incbin "baserom.gba", 0xB2E8B6, 0x00002DA + .incbin "baserom.gba", 0xB2A77C, 0x0004414 gUnk_08B2EB90:: @ 08B2EB90 - .incbin "baserom.gba", 0xB2EB90, 0x000030E - .incbin "baserom.gba", 0xB2EE9E, 0x0001172 - .incbin "baserom.gba", 0xB30010, 0x0000010 - .incbin "baserom.gba", 0xB30020, 0x0000758 - .incbin "baserom.gba", 0xB30778, 0x000193E - .incbin "baserom.gba", 0xB320B6, 0x0001397 - .incbin "baserom.gba", 0xB3344D, 0x0002166 - .incbin "baserom.gba", 0xB355B3, 0x0003505 - .incbin "baserom.gba", 0xB38AB8, 0x00012A8 + .incbin "baserom.gba", 0xB2EB90, 0x000B1D0 gUnk_08B39D60:: @ 08B39D60 - .incbin "baserom.gba", 0xB39D60, 0x0000375 - .incbin "baserom.gba", 0xB3A0D5, 0x00031E0 - .incbin "baserom.gba", 0xB3D2B5, 0x0002367 + .incbin "baserom.gba", 0xB39D60, 0x00058BC gUnk_08B3F61C:: @ 08B3F61C - .incbin "baserom.gba", 0xB3F61C, 0x0000AF4 - .incbin "baserom.gba", 0xB40110, 0x00004F0 - .incbin "baserom.gba", 0xB40600, 0x0000100 - .incbin "baserom.gba", 0xB40700, 0x0000080 - .incbin "baserom.gba", 0xB40780, 0x0000140 - .incbin "baserom.gba", 0xB408C0, 0x000003F - .incbin "baserom.gba", 0xB408FF, 0x0002B45 - .incbin "baserom.gba", 0xB43444, 0x0000E77 - .incbin "baserom.gba", 0xB442BB, 0x0002E59 + .incbin "baserom.gba", 0xB3F61C, 0x0007AF8 gUnk_08B47114:: @ 08B47114 .incbin "baserom.gba", 0xB47114, 0x0002B6C gUnk_08B49C80:: @ 08B49C80 - .incbin "baserom.gba", 0xB49C80, 0x0000622 - .incbin "baserom.gba", 0xB4A2A2, 0x000050E - .incbin "baserom.gba", 0xB4A7B0, 0x0000424 + .incbin "baserom.gba", 0xB49C80, 0x0000F54 gUnk_08B4ABD4:: @ 08B4ABD4 .incbin "baserom.gba", 0xB4ABD4, 0x0001A9C @@ -376,36 +152,22 @@ gUnk_08B4CBB4:: @ 08B4CBB4 .incbin "baserom.gba", 0xB4CBB4, 0x00016D8 gUnk_08B4E28C:: @ 08B4E28C - .incbin "baserom.gba", 0xB4E28C, 0x0001D8B - .incbin "baserom.gba", 0xB50017, 0x0000012 - .incbin "baserom.gba", 0xB50029, 0x00000D7 - .incbin "baserom.gba", 0xB50100, 0x00000B4 - .incbin "baserom.gba", 0xB501B4, 0x0000100 - .incbin "baserom.gba", 0xB502B4, 0x0000700 - .incbin "baserom.gba", 0xB509B4, 0x0000544 - .incbin "baserom.gba", 0xB50EF8, 0x00007F3 - .incbin "baserom.gba", 0xB516EB, 0x000014D + .incbin "baserom.gba", 0xB4E28C, 0x00035AC gUnk_08B51838:: @ 08B51838 - .incbin "baserom.gba", 0xB51838, 0x000313E - .incbin "baserom.gba", 0xB54976, 0x0001236 + .incbin "baserom.gba", 0xB51838, 0x0004374 gUnk_08B55BAC:: @ 08B55BAC .incbin "baserom.gba", 0xB55BAC, 0x0000EA4 gUnk_08B56A50:: @ 08B56A50 - .incbin "baserom.gba", 0xB56A50, 0x0001865 - .incbin "baserom.gba", 0xB582B5, 0x0000FFF - .incbin "baserom.gba", 0xB592B4, 0x0000010 + .incbin "baserom.gba", 0xB56A50, 0x0002874 gUnk_08B592C4:: @ 08B592C4 - .incbin "baserom.gba", 0xB592C4, 0x000007E - .incbin "baserom.gba", 0xB59342, 0x0000350 - .incbin "baserom.gba", 0xB59692, 0x0001BDA + .incbin "baserom.gba", 0xB592C4, 0x0001FA8 gUnk_08B5B26C:: @ 08B5B26C - .incbin "baserom.gba", 0xB5B26C, 0x000056A - .incbin "baserom.gba", 0xB5B7D6, 0x00005B2 + .incbin "baserom.gba", 0xB5B26C, 0x0000B1C gUnk_08B5BD88:: @ 08B5BD88 .incbin "baserom.gba", 0xB5BD88, 0x0000F78 @@ -417,19 +179,16 @@ gUnk_08B5E02C:: @ 08B5E02C .incbin "baserom.gba", 0xB5E02C, 0x0005470 gUnk_08B6349C:: @ 08B6349C - .incbin "baserom.gba", 0xB6349C, 0x000065C - .incbin "baserom.gba", 0xB63AF8, 0x00003E0 + .incbin "baserom.gba", 0xB6349C, 0x0000A3C gUnk_08B63ED8:: @ 08B63ED8 - .incbin "baserom.gba", 0xB63ED8, 0x00009C5 - .incbin "baserom.gba", 0xB6489D, 0x00000BF + .incbin "baserom.gba", 0xB63ED8, 0x0000A84 gUnk_08B6495C:: @ 08B6495C .incbin "baserom.gba", 0xB6495C, 0x00040C0 gUnk_08B68A1C:: @ 08B68A1C - .incbin "baserom.gba", 0xB68A1C, 0x00005A0 - .incbin "baserom.gba", 0xB68FBC, 0x0001264 + .incbin "baserom.gba", 0xB68A1C, 0x0001804 gUnk_08B6A220:: @ 08B6A220 .incbin "baserom.gba", 0xB6A220, 0x000275C @@ -438,115 +197,70 @@ gUnk_08B6C97C:: @ 08B6C97C .incbin "baserom.gba", 0xB6C97C, 0x0001BC0 gUnk_08B6E53C:: @ 08B6E53C - .incbin "baserom.gba", 0xB6E53C, 0x0001ACA - .incbin "baserom.gba", 0xB70006, 0x0000102 - .incbin "baserom.gba", 0xB70108, 0x000038C + .incbin "baserom.gba", 0xB6E53C, 0x0001F58 gUnk_08B70494:: @ 08B70494 - .incbin "baserom.gba", 0xB70494, 0x000028C - .incbin "baserom.gba", 0xB70720, 0x00000E0 - .incbin "baserom.gba", 0xB70800, 0x00000B6 - .incbin "baserom.gba", 0xB708B6, 0x0001D62 + .incbin "baserom.gba", 0xB70494, 0x0002184 gUnk_08B72618:: @ 08B72618 .incbin "baserom.gba", 0xB72618, 0x0000F84 gUnk_08B7359C:: @ 08B7359C - .incbin "baserom.gba", 0xB7359C, 0x0001C64 - .incbin "baserom.gba", 0xB75200, 0x00029B0 + .incbin "baserom.gba", 0xB7359C, 0x0004614 gUnk_08B77BB0:: @ 08B77BB0 - .incbin "baserom.gba", 0xB77BB0, 0x0002615 - .incbin "baserom.gba", 0xB7A1C5, 0x0000507 - .incbin "baserom.gba", 0xB7A6CC, 0x00000F8 - .incbin "baserom.gba", 0xB7A7C4, 0x0000828 + .incbin "baserom.gba", 0xB77BB0, 0x000343C gUnk_08B7AFEC:: @ 08B7AFEC - .incbin "baserom.gba", 0xB7AFEC, 0x0001AD9 - .incbin "baserom.gba", 0xB7CAC5, 0x0000867 + .incbin "baserom.gba", 0xB7AFEC, 0x0002340 gUnk_08B7D32C:: @ 08B7D32C - .incbin "baserom.gba", 0xB7D32C, 0x0001BD7 - .incbin "baserom.gba", 0xB7EF03, 0x0001104 - .incbin "baserom.gba", 0xB80007, 0x00002B0 - .incbin "baserom.gba", 0xB802B7, 0x0000BA1 - .incbin "baserom.gba", 0xB80E58, 0x00005B8 + .incbin "baserom.gba", 0xB7D32C, 0x00040E4 gUnk_08B81410:: @ 08B81410 - .incbin "baserom.gba", 0xB81410, 0x0000D13 - .incbin "baserom.gba", 0xB82123, 0x0000E21 + .incbin "baserom.gba", 0xB81410, 0x0001B34 gUnk_08B82F44:: @ 08B82F44 - .incbin "baserom.gba", 0xB82F44, 0x00001A2 - .incbin "baserom.gba", 0xB830E6, 0x0003106 + .incbin "baserom.gba", 0xB82F44, 0x00032A8 gUnk_08B861EC:: @ 08B861EC .incbin "baserom.gba", 0xB861EC, 0x00018B8 gUnk_08B87AA4:: @ 08B87AA4 - .incbin "baserom.gba", 0xB87AA4, 0x0000FF4 - .incbin "baserom.gba", 0xB88A98, 0x0000826 - .incbin "baserom.gba", 0xB892BE, 0x00013F4 - .incbin "baserom.gba", 0xB8A6B2, 0x0000712 + .incbin "baserom.gba", 0xB87AA4, 0x0003320 gUnk_08B8ADC4:: @ 08B8ADC4 - .incbin "baserom.gba", 0xB8ADC4, 0x00013F5 - .incbin "baserom.gba", 0xB8C1B9, 0x00018C7 + .incbin "baserom.gba", 0xB8ADC4, 0x0002CBC gUnk_08B8DA80:: @ 08B8DA80 - .incbin "baserom.gba", 0xB8DA80, 0x0002DF3 - .incbin "baserom.gba", 0xB90873, 0x0000A06 - .incbin "baserom.gba", 0xB91279, 0x0000240 - .incbin "baserom.gba", 0xB914B9, 0x00024D7 + .incbin "baserom.gba", 0xB8DA80, 0x0005F10 gUnk_08B93990:: @ 08B93990 .incbin "baserom.gba", 0xB93990, 0x00037C4 gUnk_08B97154:: @ 08B97154 - .incbin "baserom.gba", 0xB97154, 0x0001847 - .incbin "baserom.gba", 0xB9899B, 0x0001489 + .incbin "baserom.gba", 0xB97154, 0x0002CD0 gUnk_08B99E24:: @ 08B99E24 - .incbin "baserom.gba", 0xB99E24, 0x0000F9F - .incbin "baserom.gba", 0xB9ADC3, 0x0000E5D + .incbin "baserom.gba", 0xB99E24, 0x0001DFC gUnk_08B9BC20:: @ 08B9BC20 - .incbin "baserom.gba", 0xB9BC20, 0x0000EEB - .incbin "baserom.gba", 0xB9CB0B, 0x00002D4 - .incbin "baserom.gba", 0xB9CDDF, 0x0003234 - .incbin "baserom.gba", 0xBA0013, 0x00000ED - .incbin "baserom.gba", 0xBA0100, 0x00003B8 + .incbin "baserom.gba", 0xB9BC20, 0x0004898 gUnk_08BA04B8:: @ 08BA04B8 - .incbin "baserom.gba", 0xBA04B8, 0x0000399 - .incbin "baserom.gba", 0xBA0851, 0x00000E4 - .incbin "baserom.gba", 0xBA0935, 0x00008ED - .incbin "baserom.gba", 0xBA1222, 0x0004E6A + .incbin "baserom.gba", 0xBA04B8, 0x0005BD4 gUnk_08BA608C:: @ 08BA608C .incbin "baserom.gba", 0xBA608C, 0x0001960 gUnk_08BA79EC:: @ 08BA79EC - .incbin "baserom.gba", 0xBA79EC, 0x0001E17 - .incbin "baserom.gba", 0xBA9803, 0x000029B - .incbin "baserom.gba", 0xBA9A9E, 0x000103B - .incbin "baserom.gba", 0xBAAAD9, 0x0000203 - .incbin "baserom.gba", 0xBAACDC, 0x0002057 - .incbin "baserom.gba", 0xBACD33, 0x00015D8 - .incbin "baserom.gba", 0xBAE30B, 0x0000E4D + .incbin "baserom.gba", 0xBA79EC, 0x000776C gUnk_08BAF158:: @ 08BAF158 - .incbin "baserom.gba", 0xBAF158, 0x0000FA8 - .incbin "baserom.gba", 0xBB0100, 0x0000030 - .incbin "baserom.gba", 0xBB0130, 0x000028B - .incbin "baserom.gba", 0xBB03BB, 0x0000313 - .incbin "baserom.gba", 0xBB06CE, 0x00001EC - .incbin "baserom.gba", 0xBB08BA, 0x0001776 + .incbin "baserom.gba", 0xBAF158, 0x0002ED8 gUnk_08BB2030:: @ 08BB2030 - .incbin "baserom.gba", 0xBB2030, 0x00006BA - .incbin "baserom.gba", 0xBB26EA, 0x0001E34 - .incbin "baserom.gba", 0xBB451E, 0x0001BD6 + .incbin "baserom.gba", 0xBB2030, 0x00040C4 gUnk_08BB60F4:: @ 08BB60F4 .incbin "baserom.gba", 0xBB60F4, 0x0001204 @@ -555,30 +269,13 @@ gUnk_08BB72F8:: @ 08BB72F8 .incbin "baserom.gba", 0xBB72F8, 0x0000FE8 gUnk_08BB82E0:: @ 08BB82E0 - .incbin "baserom.gba", 0xBB82E0, 0x0001531 - .incbin "baserom.gba", 0xBB9811, 0x0000197 - .incbin "baserom.gba", 0xBB99A8, 0x0000912 - .incbin "baserom.gba", 0xBBA2BA, 0x0000100 - .incbin "baserom.gba", 0xBBA3BA, 0x00006E7 - .incbin "baserom.gba", 0xBBAAA1, 0x000002B - .incbin "baserom.gba", 0xBBAACC, 0x0000978 - .incbin "baserom.gba", 0xBBB444, 0x00006DE - .incbin "baserom.gba", 0xBBBB22, 0x0000056 - .incbin "baserom.gba", 0xBBBB78, 0x0000043 - .incbin "baserom.gba", 0xBBBBBB, 0x0000032 - .incbin "baserom.gba", 0xBBBBED, 0x000077F + .incbin "baserom.gba", 0xBB82E0, 0x000408C gUnk_08BBC36C:: @ 08BBC36C - .incbin "baserom.gba", 0xBBC36C, 0x000094C - .incbin "baserom.gba", 0xBBCCB8, 0x00010F4 - .incbin "baserom.gba", 0xBBDDAC, 0x0001CD4 + .incbin "baserom.gba", 0xBBC36C, 0x0003714 gUnk_08BBFA80:: @ 08BBFA80 - .incbin "baserom.gba", 0xBBFA80, 0x000036F - .incbin "baserom.gba", 0xBBFDEF, 0x00005E1 - .incbin "baserom.gba", 0xBC03D0, 0x0000432 - .incbin "baserom.gba", 0xBC0802, 0x0000BFD - .incbin "baserom.gba", 0xBC13FF, 0x0001B49 + .incbin "baserom.gba", 0xBBFA80, 0x00034C8 gUnk_08BC2F48:: @ 08BC2F48 .incbin "baserom.gba", 0xBC2F48, 0x0001C48 @@ -590,134 +287,64 @@ gUnk_08BC6320:: @ 08BC6320 .incbin "baserom.gba", 0xBC6320, 0x00019B0 gUnk_08BC7CD0:: @ 08BC7CD0 - .incbin "baserom.gba", 0xBC7CD0, 0x00013F3 - .incbin "baserom.gba", 0xBC90C3, 0x0002D41 - .incbin "baserom.gba", 0xBCBE04, 0x00008A1 - .incbin "baserom.gba", 0xBCC6A5, 0x0000515 - .incbin "baserom.gba", 0xBCCBBA, 0x000009B - .incbin "baserom.gba", 0xBCCC55, 0x0001067 - .incbin "baserom.gba", 0xBCDCBC, 0x00000F0 - .incbin "baserom.gba", 0xBCDDAC, 0x0000E76 - .incbin "baserom.gba", 0xBCEC22, 0x00013E8 - .incbin "baserom.gba", 0xBD000A, 0x00008B2 - .incbin "baserom.gba", 0xBD08BC, 0x0005AE4 + .incbin "baserom.gba", 0xBC7CD0, 0x000E6D0 gUnk_08BD63A0:: @ 08BD63A0 - .incbin "baserom.gba", 0xBD63A0, 0x0001B68 - .incbin "baserom.gba", 0xBD7F08, 0x0003058 + .incbin "baserom.gba", 0xBD63A0, 0x0004BC0 gUnk_08BDAF60:: @ 08BDAF60 - .incbin "baserom.gba", 0xBDAF60, 0x000069A - .incbin "baserom.gba", 0xBDB5FA, 0x000265B - .incbin "baserom.gba", 0xBDDC55, 0x0000188 - .incbin "baserom.gba", 0xBDDDDD, 0x0000077 + .incbin "baserom.gba", 0xBDAF60, 0x0002EF4 gUnk_08BDDE54:: @ 08BDDE54 - .incbin "baserom.gba", 0xBDDE54, 0x00019B7 - .incbin "baserom.gba", 0xBDF80B, 0x0000809 - .incbin "baserom.gba", 0xBE0014, 0x00008A9 - .incbin "baserom.gba", 0xBE08BD, 0x00013BB + .incbin "baserom.gba", 0xBDDE54, 0x0003E24 gUnk_08BE1C78:: @ 08BE1C78 - .incbin "baserom.gba", 0xBE1C78, 0x0001C39 - .incbin "baserom.gba", 0xBE38B1, 0x000024F - .incbin "baserom.gba", 0xBE3B00, 0x0001D7A - .incbin "baserom.gba", 0xBE587A, 0x0000A32 + .incbin "baserom.gba", 0xBE1C78, 0x0004634 gUnk_08BE62AC:: @ 08BE62AC - .incbin "baserom.gba", 0xBE62AC, 0x0001E11 - .incbin "baserom.gba", 0xBE80BD, 0x0000AEF + .incbin "baserom.gba", 0xBE62AC, 0x0002900 gUnk_08BE8BAC:: @ 08BE8BAC - .incbin "baserom.gba", 0xBE8BAC, 0x0001F06 - .incbin "baserom.gba", 0xBEAAB2, 0x000071E + .incbin "baserom.gba", 0xBE8BAC, 0x0002624 gUnk_08BEB1D0:: @ 08BEB1D0 .incbin "baserom.gba", 0xBEB1D0, 0x0001188 gUnk_08BEC358:: @ 08BEC358 - .incbin "baserom.gba", 0xBEC358, 0x00012D5 - .incbin "baserom.gba", 0xBED62D, 0x00018C1 - .incbin "baserom.gba", 0xBEEEEE, 0x0000B59 - .incbin "baserom.gba", 0xBEFA47, 0x00005C2 - .incbin "baserom.gba", 0xBF0009, 0x000025B + .incbin "baserom.gba", 0xBEC358, 0x0003F0C gUnk_08BF0264:: @ 08BF0264 - .incbin "baserom.gba", 0xBF0264, 0x00000EC - .incbin "baserom.gba", 0xBF0350, 0x00000EF - .incbin "baserom.gba", 0xBF043F, 0x00000C1 - .incbin "baserom.gba", 0xBF0500, 0x0000300 - .incbin "baserom.gba", 0xBF0800, 0x0000007 - .incbin "baserom.gba", 0xBF0807, 0x00000B7 - .incbin "baserom.gba", 0xBF08BE, 0x000087F - .incbin "baserom.gba", 0xBF113D, 0x0000DC7 - .incbin "baserom.gba", 0xBF1F04, 0x0000007 - .incbin "baserom.gba", 0xBF1F0B, 0x00008F1 - .incbin "baserom.gba", 0xBF27FC, 0x00014B8 + .incbin "baserom.gba", 0xBF0264, 0x0003A50 gUnk_08BF3CB4:: @ 08BF3CB4 - .incbin "baserom.gba", 0xBF3CB4, 0x0000E22 - .incbin "baserom.gba", 0xBF4AD6, 0x0001014 - .incbin "baserom.gba", 0xBF5AEA, 0x00021DA + .incbin "baserom.gba", 0xBF3CB4, 0x0004010 gUnk_08BF7CC4:: @ 08BF7CC4 - .incbin "baserom.gba", 0xBF7CC4, 0x00023FA - .incbin "baserom.gba", 0xBFA0BE, 0x0000961 - .incbin "baserom.gba", 0xBFAA1F, 0x0000DD5 + .incbin "baserom.gba", 0xBF7CC4, 0x0003B30 gUnk_08BFB7F4:: @ 08BFB7F4 - .incbin "baserom.gba", 0xBFB7F4, 0x0000E51 - .incbin "baserom.gba", 0xBFC645, 0x000095A - .incbin "baserom.gba", 0xBFCF9F, 0x00006A0 - .incbin "baserom.gba", 0xBFD63F, 0x0000AC2 - .incbin "baserom.gba", 0xBFE101, 0x000000B - .incbin "baserom.gba", 0xBFE10C, 0x0000271 - .incbin "baserom.gba", 0xBFE37D, 0x000022B + .incbin "baserom.gba", 0xBFB7F4, 0x0002DB4 gUnk_08BFE5A8:: @ 08BFE5A8 - .incbin "baserom.gba", 0xBFE5A8, 0x0000661 - .incbin "baserom.gba", 0xBFEC09, 0x000131D - .incbin "baserom.gba", 0xBFFF26, 0x00000DA - .incbin "baserom.gba", 0xC00000, 0x0000008 - .incbin "baserom.gba", 0xC00008, 0x00000B7 - .incbin "baserom.gba", 0xC000BF, 0x000026C - .incbin "baserom.gba", 0xC0032B, 0x0000165 - .incbin "baserom.gba", 0xC00490, 0x0000370 - .incbin "baserom.gba", 0xC00800, 0x000010A - .incbin "baserom.gba", 0xC0090A, 0x000003D - .incbin "baserom.gba", 0xC00947, 0x0001781 + .incbin "baserom.gba", 0xBFE5A8, 0x0003B20 gUnk_08C020C8:: @ 08C020C8 - .incbin "baserom.gba", 0xC020C8, 0x00001A5 - .incbin "baserom.gba", 0xC0226D, 0x0003693 - .incbin "baserom.gba", 0xC05900, 0x000081F - .incbin "baserom.gba", 0xC0611F, 0x00003BD + .incbin "baserom.gba", 0xC020C8, 0x0004414 gUnk_08C064DC:: @ 08C064DC - .incbin "baserom.gba", 0xC064DC, 0x0001225 - .incbin "baserom.gba", 0xC07701, 0x0000715 - .incbin "baserom.gba", 0xC07E16, 0x00021E4 - .incbin "baserom.gba", 0xC09FFA, 0x000020E + .incbin "baserom.gba", 0xC064DC, 0x0003D2C gUnk_08C0A208:: @ 08C0A208 - .incbin "baserom.gba", 0xC0A208, 0x0000A16 - .incbin "baserom.gba", 0xC0AC1E, 0x000283A + .incbin "baserom.gba", 0xC0A208, 0x0003250 gUnk_08C0D458:: @ 08C0D458 - .incbin "baserom.gba", 0xC0D458, 0x0001A29 - .incbin "baserom.gba", 0xC0EE81, 0x00005FB + .incbin "baserom.gba", 0xC0D458, 0x0002024 gUnk_08C0F47C:: @ 08C0F47C - .incbin "baserom.gba", 0xC0F47C, 0x0000FE4 - .incbin "baserom.gba", 0xC10460, 0x0000460 - .incbin "baserom.gba", 0xC108C0, 0x00008F4 + .incbin "baserom.gba", 0xC0F47C, 0x0001D38 gUnk_08C111B4:: @ 08C111B4 - .incbin "baserom.gba", 0xC111B4, 0x000160D - .incbin "baserom.gba", 0xC127C1, 0x00018FE - .incbin "baserom.gba", 0xC140BF, 0x00002FE - .incbin "baserom.gba", 0xC143BD, 0x0000404 - .incbin "baserom.gba", 0xC147C1, 0x0000C4F + .incbin "baserom.gba", 0xC111B4, 0x000425C gUnk_08C15410:: @ 08C15410 .incbin "baserom.gba", 0xC15410, 0x0004768 @@ -726,149 +353,91 @@ gUnk_08C19B78:: @ 08C19B78 .incbin "baserom.gba", 0xC19B78, 0x0002958 gUnk_08C1C4D0:: @ 08C1C4D0 - .incbin "baserom.gba", 0xC1C4D0, 0x000050F - .incbin "baserom.gba", 0xC1C9DF, 0x0002DE1 + .incbin "baserom.gba", 0xC1C4D0, 0x00032F0 gUnk_08C1F7C0:: @ 08C1F7C0 - .incbin "baserom.gba", 0xC1F7C0, 0x0003F40 - .incbin "baserom.gba", 0xC23700, 0x0000ADE - .incbin "baserom.gba", 0xC241DE, 0x00008DE + .incbin "baserom.gba", 0xC1F7C0, 0x00052FC gUnk_08C24ABC:: @ 08C24ABC - .incbin "baserom.gba", 0xC24ABC, 0x0001647 - .incbin "baserom.gba", 0xC26103, 0x0002869 + .incbin "baserom.gba", 0xC24ABC, 0x0003EB0 gUnk_08C2896C:: @ 08C2896C - .incbin "baserom.gba", 0xC2896C, 0x0000C27 - .incbin "baserom.gba", 0xC29593, 0x0001036 - .incbin "baserom.gba", 0xC2A5C9, 0x00003D7 - .incbin "baserom.gba", 0xC2A9A0, 0x00001C0 + .incbin "baserom.gba", 0xC2896C, 0x00021F4 gUnk_08C2AB60:: @ 08C2AB60 - .incbin "baserom.gba", 0xC2AB60, 0x000107B - .incbin "baserom.gba", 0xC2BBDB, 0x0000DE7 - .incbin "baserom.gba", 0xC2C9C2, 0x0000D12 + .incbin "baserom.gba", 0xC2AB60, 0x0002B74 gUnk_08C2D6D4:: @ 08C2D6D4 - .incbin "baserom.gba", 0xC2D6D4, 0x0001D46 - .incbin "baserom.gba", 0xC2F41A, 0x00003EE + .incbin "baserom.gba", 0xC2D6D4, 0x0002134 gUnk_08C2F808:: @ 08C2F808 - .incbin "baserom.gba", 0xC2F808, 0x0000808 - .incbin "baserom.gba", 0xC30010, 0x00001BB - .incbin "baserom.gba", 0xC301CB, 0x00005B4 - .incbin "baserom.gba", 0xC3077F, 0x000037D + .incbin "baserom.gba", 0xC2F808, 0x00012F4 gUnk_08C30AFC:: @ 08C30AFC - .incbin "baserom.gba", 0xC30AFC, 0x0001204 - .incbin "baserom.gba", 0xC31D00, 0x0000BE0 + .incbin "baserom.gba", 0xC30AFC, 0x0001DE4 gUnk_08C328E0:: @ 08C328E0 .incbin "baserom.gba", 0xC328E0, 0x0005FCC gUnk_08C388AC:: @ 08C388AC - .incbin "baserom.gba", 0xC388AC, 0x00008DB - .incbin "baserom.gba", 0xC39187, 0x0000A0F - .incbin "baserom.gba", 0xC39B96, 0x000055E + .incbin "baserom.gba", 0xC388AC, 0x0001848 gUnk_08C3A0F4:: @ 08C3A0F4 - .incbin "baserom.gba", 0xC3A0F4, 0x0000DE5 - .incbin "baserom.gba", 0xC3AED9, 0x0000901 - .incbin "baserom.gba", 0xC3B7DA, 0x00007E9 - .incbin "baserom.gba", 0xC3BFC3, 0x0001FE1 + .incbin "baserom.gba", 0xC3A0F4, 0x0003EB0 gUnk_08C3DFA4:: @ 08C3DFA4 .incbin "baserom.gba", 0xC3DFA4, 0x0000A04 gUnk_08C3E9A8:: @ 08C3E9A8 - .incbin "baserom.gba", 0xC3E9A8, 0x00009A8 - .incbin "baserom.gba", 0xC3F350, 0x00007B8 - .incbin "baserom.gba", 0xC3FB08, 0x000060F - .incbin "baserom.gba", 0xC40117, 0x0000509 - .incbin "baserom.gba", 0xC40620, 0x00002A0 - .incbin "baserom.gba", 0xC408C0, 0x0000234 - .incbin "baserom.gba", 0xC40AF4, 0x0000711 - .incbin "baserom.gba", 0xC41205, 0x00007CF + .incbin "baserom.gba", 0xC3E9A8, 0x000302C gUnk_08C419D4:: @ 08C419D4 - .incbin "baserom.gba", 0xC419D4, 0x0000958 - .incbin "baserom.gba", 0xC4232C, 0x0000C17 - .incbin "baserom.gba", 0xC42F43, 0x0000FC1 - .incbin "baserom.gba", 0xC43F04, 0x00011D8 + .incbin "baserom.gba", 0xC419D4, 0x0003708 gUnk_08C450DC:: @ 08C450DC - .incbin "baserom.gba", 0xC450DC, 0x000209C - .incbin "baserom.gba", 0xC47178, 0x00015FC + .incbin "baserom.gba", 0xC450DC, 0x0003698 gUnk_08C48774:: @ 08C48774 - .incbin "baserom.gba", 0xC48774, 0x0003754 - .incbin "baserom.gba", 0xC4BEC8, 0x0001484 + .incbin "baserom.gba", 0xC48774, 0x0004BD8 gUnk_08C4D34C:: @ 08C4D34C .incbin "baserom.gba", 0xC4D34C, 0x0000A68 gUnk_08C4DDB4:: @ 08C4DDB4 - .incbin "baserom.gba", 0xC4DDB4, 0x0000B5F - .incbin "baserom.gba", 0xC4E913, 0x0000871 + .incbin "baserom.gba", 0xC4DDB4, 0x00013D0 gUnk_08C4F184:: @ 08C4F184 - .incbin "baserom.gba", 0xC4F184, 0x0000E85 - .incbin "baserom.gba", 0xC50009, 0x0000375 - .incbin "baserom.gba", 0xC5037E, 0x0000981 - .incbin "baserom.gba", 0xC50CFF, 0x0000615 + .incbin "baserom.gba", 0xC4F184, 0x0002190 gUnk_08C51314:: @ 08C51314 - .incbin "baserom.gba", 0xC51314, 0x000316D - .incbin "baserom.gba", 0xC54481, 0x0002D9B + .incbin "baserom.gba", 0xC51314, 0x0005F08 gUnk_08C5721C:: @ 08C5721C - .incbin "baserom.gba", 0xC5721C, 0x00018A9 - .incbin "baserom.gba", 0xC58AC5, 0x00014C5 - .incbin "baserom.gba", 0xC59F8A, 0x00015AE + .incbin "baserom.gba", 0xC5721C, 0x000431C gUnk_08C5B538:: @ 08C5B538 - .incbin "baserom.gba", 0xC5B538, 0x00009A4 - .incbin "baserom.gba", 0xC5BEDC, 0x00006BF - .incbin "baserom.gba", 0xC5C59B, 0x0001E29 - .incbin "baserom.gba", 0xC5E3C4, 0x0001C3D - .incbin "baserom.gba", 0xC60001, 0x0000024 - .incbin "baserom.gba", 0xC60025, 0x00002D7 + .incbin "baserom.gba", 0xC5B538, 0x0004DC4 gUnk_08C602FC:: @ 08C602FC - .incbin "baserom.gba", 0xC602FC, 0x00010CA - .incbin "baserom.gba", 0xC613C6, 0x000072A + .incbin "baserom.gba", 0xC602FC, 0x00017F4 gUnk_08C61AF0:: @ 08C61AF0 - .incbin "baserom.gba", 0xC61AF0, 0x0000835 - .incbin "baserom.gba", 0xC62325, 0x00010DB - .incbin "baserom.gba", 0xC63400, 0x0000174 + .incbin "baserom.gba", 0xC61AF0, 0x0001A84 gUnk_08C63574:: @ 08C63574 .incbin "baserom.gba", 0xC63574, 0x00013E8 gUnk_08C6495C:: @ 08C6495C - .incbin "baserom.gba", 0xC6495C, 0x000251B - .incbin "baserom.gba", 0xC66E77, 0x0000291 - .incbin "baserom.gba", 0xC67108, 0x00021FB - .incbin "baserom.gba", 0xC69303, 0x0000E8D - .incbin "baserom.gba", 0xC6A190, 0x000084B - .incbin "baserom.gba", 0xC6A9DB, 0x0002046 - .incbin "baserom.gba", 0xC6CA21, 0x000030F - .incbin "baserom.gba", 0xC6CD30, 0x000018C + .incbin "baserom.gba", 0xC6495C, 0x0008560 gUnk_08C6CEBC:: @ 08C6CEBC .incbin "baserom.gba", 0xC6CEBC, 0x0001740 gUnk_08C6E5FC:: @ 08C6E5FC - .incbin "baserom.gba", 0xC6E5FC, 0x0001654 - .incbin "baserom.gba", 0xC6FC50, 0x0000078 + .incbin "baserom.gba", 0xC6E5FC, 0x00016CC gUnk_08C6FCC8:: @ 08C6FCC8 - .incbin "baserom.gba", 0xC6FCC8, 0x0000344 - .incbin "baserom.gba", 0xC7000C, 0x00004B5 - .incbin "baserom.gba", 0xC704C1, 0x000054E - .incbin "baserom.gba", 0xC70A0F, 0x0000926 - .incbin "baserom.gba", 0xC71335, 0x000153B + .incbin "baserom.gba", 0xC6FCC8, 0x0002BA8 gUnk_08C72870:: @ 08C72870 .incbin "baserom.gba", 0xC72870, 0x0001C0C @@ -877,31 +446,10 @@ gUnk_08C7447C:: @ 08C7447C .incbin "baserom.gba", 0xC7447C, 0x000052C gUnk_08C749A8:: @ 08C749A8 - .incbin "baserom.gba", 0xC749A8, 0x000091F - .incbin "baserom.gba", 0xC752C7, 0x000233C - .incbin "baserom.gba", 0xC77603, 0x0001083 - .incbin "baserom.gba", 0xC78686, 0x0002117 - .incbin "baserom.gba", 0xC7A79D, 0x0000F2D - .incbin "baserom.gba", 0xC7B6CA, 0x0000110 - .incbin "baserom.gba", 0xC7B7DA, 0x00007D1 - .incbin "baserom.gba", 0xC7BFAB, 0x0000860 - .incbin "baserom.gba", 0xC7C80B, 0x000009D - .incbin "baserom.gba", 0xC7C8A8, 0x0002461 - .incbin "baserom.gba", 0xC7ED09, 0x0001303 - .incbin "baserom.gba", 0xC8000C, 0x0000192 - .incbin "baserom.gba", 0xC8019E, 0x00004B2 + .incbin "baserom.gba", 0xC749A8, 0x000BCA8 gUnk_08C80650:: @ 08C80650 - .incbin "baserom.gba", 0xC80650, 0x00007F8 - .incbin "baserom.gba", 0xC80E48, 0x00002EA - .incbin "baserom.gba", 0xC81132, 0x00000F3 - .incbin "baserom.gba", 0xC81225, 0x000BFF8 - .incbin "baserom.gba", 0xC8D21D, 0x0000D0C - .incbin "baserom.gba", 0xC8DF29, 0x000242B - .incbin "baserom.gba", 0xC90354, 0x00003AC - .incbin "baserom.gba", 0xC90700, 0x00001C1 - .incbin "baserom.gba", 0xC908C1, 0x0000A3F - .incbin "baserom.gba", 0xC91300, 0x0000C68 + .incbin "baserom.gba", 0xC80650, 0x0011918 gUnk_08C91F68:: @ 08C91F68 .incbin "baserom.gba", 0xC91F68, 0x00018E8 @@ -910,27 +458,16 @@ gUnk_08C93850:: @ 08C93850 .incbin "baserom.gba", 0xC93850, 0x0003888 gUnk_08C970D8:: @ 08C970D8 - .incbin "baserom.gba", 0xC970D8, 0x0000E7D - .incbin "baserom.gba", 0xC97F55, 0x000048F + .incbin "baserom.gba", 0xC970D8, 0x000130C gUnk_08C983E4:: @ 08C983E4 - .incbin "baserom.gba", 0xC983E4, 0x0003510 - .incbin "baserom.gba", 0xC9B8F4, 0x0001CD1 - .incbin "baserom.gba", 0xC9D5C5, 0x0000E04 - .incbin "baserom.gba", 0xC9E3C9, 0x0001D47 - .incbin "baserom.gba", 0xCA0110, 0x00001F0 - .incbin "baserom.gba", 0xCA0300, 0x0000326 - .incbin "baserom.gba", 0xCA0626, 0x00001A2 - .incbin "baserom.gba", 0xCA07C8, 0x000044C + .incbin "baserom.gba", 0xC983E4, 0x0008830 gUnk_08CA0C14:: @ 08CA0C14 - .incbin "baserom.gba", 0xCA0C14, 0x00004ED - .incbin "baserom.gba", 0xCA1101, 0x0001A1F + .incbin "baserom.gba", 0xCA0C14, 0x0001F0C gUnk_08CA2B20:: @ 08CA2B20 - .incbin "baserom.gba", 0xCA2B20, 0x0000919 - .incbin "baserom.gba", 0xCA3439, 0x0000494 - .incbin "baserom.gba", 0xCA38CD, 0x00051AF + .incbin "baserom.gba", 0xCA2B20, 0x0005F5C gUnk_08CA8A7C:: @ 08CA8A7C .incbin "baserom.gba", 0xCA8A7C, 0x00019E4 @@ -939,67 +476,40 @@ gUnk_08CAA460:: @ 08CAA460 .incbin "baserom.gba", 0xCAA460, 0x00015F4 gUnk_08CABA54:: @ 08CABA54 - .incbin "baserom.gba", 0xCABA54, 0x0001471 - .incbin "baserom.gba", 0xCACEC5, 0x000103F + .incbin "baserom.gba", 0xCABA54, 0x00024B0 gUnk_08CADF04:: @ 08CADF04 - .incbin "baserom.gba", 0xCADF04, 0x0000E26 - .incbin "baserom.gba", 0xCAED2A, 0x00012D7 - .incbin "baserom.gba", 0xCB0001, 0x000064B + .incbin "baserom.gba", 0xCADF04, 0x0002748 gUnk_08CB064C:: @ 08CB064C - .incbin "baserom.gba", 0xCB064C, 0x00012B4 - .incbin "baserom.gba", 0xCB1900, 0x000000F - .incbin "baserom.gba", 0xCB190F, 0x00014FD + .incbin "baserom.gba", 0xCB064C, 0x00027C0 gUnk_08CB2E0C:: @ 08CB2E0C - .incbin "baserom.gba", 0xCB2E0C, 0x0000849 - .incbin "baserom.gba", 0xCB3655, 0x0000892 - .incbin "baserom.gba", 0xCB3EE7, 0x0000AB9 + .incbin "baserom.gba", 0xCB2E0C, 0x0001B94 gUnk_08CB49A0:: @ 08CB49A0 - .incbin "baserom.gba", 0xCB49A0, 0x0000F73 - .incbin "baserom.gba", 0xCB5913, 0x00004CB - .incbin "baserom.gba", 0xCB5DDE, 0x0001DEB - .incbin "baserom.gba", 0xCB7BC9, 0x00000AB + .incbin "baserom.gba", 0xCB49A0, 0x00032D4 gUnk_08CB7C74:: @ 08CB7C74 .incbin "baserom.gba", 0xCB7C74, 0x0001EEC gUnk_08CB9B60:: @ 08CB9B60 - .incbin "baserom.gba", 0xCB9B60, 0x0001A5A - .incbin "baserom.gba", 0xCBB5BA, 0x000057D - .incbin "baserom.gba", 0xCBBB37, 0x0000196 - .incbin "baserom.gba", 0xCBBCCD, 0x0000405 - .incbin "baserom.gba", 0xCBC0D2, 0x000001A + .incbin "baserom.gba", 0xCB9B60, 0x000258C gUnk_08CBC0EC:: @ 08CBC0EC - .incbin "baserom.gba", 0xCBC0EC, 0x0000DE9 - .incbin "baserom.gba", 0xCBCED5, 0x0000616 - .incbin "baserom.gba", 0xCBD4EB, 0x00001D9 + .incbin "baserom.gba", 0xCBC0EC, 0x00015D8 gUnk_08CBD6C4:: @ 08CBD6C4 - .incbin "baserom.gba", 0xCBD6C4, 0x000073B - .incbin "baserom.gba", 0xCBDDFF, 0x0000516 - .incbin "baserom.gba", 0xCBE315, 0x000067F + .incbin "baserom.gba", 0xCBD6C4, 0x00012D0 gUnk_08CBE994:: @ 08CBE994 - .incbin "baserom.gba", 0xCBE994, 0x0001576 - .incbin "baserom.gba", 0xCBFF0A, 0x00000F7 - .incbin "baserom.gba", 0xCC0001, 0x0000016 - .incbin "baserom.gba", 0xCC0017, 0x00001B1 - .incbin "baserom.gba", 0xCC01C8, 0x0000080 - .incbin "baserom.gba", 0xCC0248, 0x0000080 - .incbin "baserom.gba", 0xCC02C8, 0x000023B - .incbin "baserom.gba", 0xCC0503, 0x0001022 - .incbin "baserom.gba", 0xCC1525, 0x00015D7 + .incbin "baserom.gba", 0xCBE994, 0x0004168 gUnk_08CC2AFC:: @ 08CC2AFC .incbin "baserom.gba", 0xCC2AFC, 0x0000BD4 gUnk_08CC36D0:: @ 08CC36D0 - .incbin "baserom.gba", 0xCC36D0, 0x0000868 - .incbin "baserom.gba", 0xCC3F38, 0x000026C + .incbin "baserom.gba", 0xCC36D0, 0x0000AD4 gUnk_08CC41A4:: @ 08CC41A4 .incbin "baserom.gba", 0xCC41A4, 0x0001AA8 @@ -1008,205 +518,109 @@ gUnk_08CC5C4C:: @ 08CC5C4C .incbin "baserom.gba", 0xCC5C4C, 0x0000058 gUnk_08CC5CA4:: @ 08CC5CA4 - .incbin "baserom.gba", 0xCC5CA4, 0x00016C9 - .incbin "baserom.gba", 0xCC736D, 0x00000E7 + .incbin "baserom.gba", 0xCC5CA4, 0x00017B0 gUnk_08CC7454:: @ 08CC7454 - .incbin "baserom.gba", 0xCC7454, 0x0000875 - .incbin "baserom.gba", 0xCC7CC9, 0x0000522 - .incbin "baserom.gba", 0xCC81EB, 0x0001875 + .incbin "baserom.gba", 0xCC7454, 0x000260C gUnk_08CC9A60:: @ 08CC9A60 - .incbin "baserom.gba", 0xCC9A60, 0x00005E1 - .incbin "baserom.gba", 0xCCA041, 0x000037A - .incbin "baserom.gba", 0xCCA3BB, 0x00003E5 - .incbin "baserom.gba", 0xCCA7A0, 0x000022F - .incbin "baserom.gba", 0xCCA9CF, 0x0001575 + .incbin "baserom.gba", 0xCC9A60, 0x00024E4 gUnk_08CCBF44:: @ 08CCBF44 - .incbin "baserom.gba", 0xCCBF44, 0x0000272 - .incbin "baserom.gba", 0xCCC1B6, 0x000005B - .incbin "baserom.gba", 0xCCC211, 0x00009AA - .incbin "baserom.gba", 0xCCCBBB, 0x0000111 - .incbin "baserom.gba", 0xCCCCCC, 0x0000005 - .incbin "baserom.gba", 0xCCCCD1, 0x0000309 - .incbin "baserom.gba", 0xCCCFDA, 0x0000311 - .incbin "baserom.gba", 0xCCD2EB, 0x00000E0 - .incbin "baserom.gba", 0xCCD3CB, 0x0000069 - .incbin "baserom.gba", 0xCCD434, 0x0000698 + .incbin "baserom.gba", 0xCCBF44, 0x0001B88 gUnk_08CCDACC:: @ 08CCDACC - .incbin "baserom.gba", 0xCCDACC, 0x00003C4 - .incbin "baserom.gba", 0xCCDE90, 0x0000058 - .incbin "baserom.gba", 0xCCDEE8, 0x00001FD - .incbin "baserom.gba", 0xCCE0E5, 0x0000D9B - .incbin "baserom.gba", 0xCCEE80, 0x0000F90 + .incbin "baserom.gba", 0xCCDACC, 0x0002344 gUnk_08CCFE10:: @ 08CCFE10 - .incbin "baserom.gba", 0xCCFE10, 0x00001F1 - .incbin "baserom.gba", 0xCD0001, 0x000039E - .incbin "baserom.gba", 0xCD039F, 0x0000461 - .incbin "baserom.gba", 0xCD0800, 0x000016C - .incbin "baserom.gba", 0xCD096C, 0x0000B2C + .incbin "baserom.gba", 0xCCFE10, 0x0001688 gUnk_08CD1498:: @ 08CD1498 - .incbin "baserom.gba", 0xCD1498, 0x0000B78 - .incbin "baserom.gba", 0xCD2010, 0x00003F3 - .incbin "baserom.gba", 0xCD2403, 0x0000024 - .incbin "baserom.gba", 0xCD2427, 0x0000685 + .incbin "baserom.gba", 0xCD1498, 0x0001614 gUnk_08CD2AAC:: @ 08CD2AAC - .incbin "baserom.gba", 0xCD2AAC, 0x0000D54 - .incbin "baserom.gba", 0xCD3800, 0x0000608 + .incbin "baserom.gba", 0xCD2AAC, 0x000135C gUnk_08CD3E08:: @ 08CD3E08 - .incbin "baserom.gba", 0xCD3E08, 0x0000100 - .incbin "baserom.gba", 0xCD3F08, 0x0002810 + .incbin "baserom.gba", 0xCD3E08, 0x0002910 gUnk_08CD6718:: @ 08CD6718 .incbin "baserom.gba", 0xCD6718, 0x0000ED4 gUnk_08CD75EC:: @ 08CD75EC - .incbin "baserom.gba", 0xCD75EC, 0x0003AC4 - .incbin "baserom.gba", 0xCDB0B0, 0x0000115 - .incbin "baserom.gba", 0xCDB1C5, 0x00001DE - .incbin "baserom.gba", 0xCDB3A3, 0x000082A - .incbin "baserom.gba", 0xCDBBCD, 0x000041E - .incbin "baserom.gba", 0xCDBFEB, 0x00000B9 + .incbin "baserom.gba", 0xCD75EC, 0x0004AB8 gUnk_08CDC0A4:: @ 08CDC0A4 - .incbin "baserom.gba", 0xCDC0A4, 0x0000CF5 - .incbin "baserom.gba", 0xCDCD99, 0x0001350 - .incbin "baserom.gba", 0xCDE0E9, 0x0000628 - .incbin "baserom.gba", 0xCDE711, 0x000016F - .incbin "baserom.gba", 0xCDE880, 0x0000FA4 - .incbin "baserom.gba", 0xCDF824, 0x00013E8 + .incbin "baserom.gba", 0xCDC0A4, 0x0004B68 gUnk_08CE0C0C:: @ 08CE0C0C - .incbin "baserom.gba", 0xCE0C0C, 0x000050F - .incbin "baserom.gba", 0xCE111B, 0x0001219 + .incbin "baserom.gba", 0xCE0C0C, 0x0001728 gUnk_08CE2334:: @ 08CE2334 - .incbin "baserom.gba", 0xCE2334, 0x00033FC - .incbin "baserom.gba", 0xCE5730, 0x000123C + .incbin "baserom.gba", 0xCE2334, 0x0004638 gUnk_08CE696C:: @ 08CE696C - .incbin "baserom.gba", 0xCE696C, 0x0002743 - .incbin "baserom.gba", 0xCE90AF, 0x00014F5 + .incbin "baserom.gba", 0xCE696C, 0x0003C38 gUnk_08CEA5A4:: @ 08CEA5A4 - .incbin "baserom.gba", 0xCEA5A4, 0x0000A08 - .incbin "baserom.gba", 0xCEAFAC, 0x0001458 + .incbin "baserom.gba", 0xCEA5A4, 0x0001E60 gUnk_08CEC404:: @ 08CEC404 - .incbin "baserom.gba", 0xCEC404, 0x0001631 - .incbin "baserom.gba", 0xCEDA35, 0x00008FE - .incbin "baserom.gba", 0xCEE333, 0x0000BB6 - .incbin "baserom.gba", 0xCEEEE9, 0x000105B - .incbin "baserom.gba", 0xCEFF44, 0x000048D - .incbin "baserom.gba", 0xCF03D1, 0x00000FD - .incbin "baserom.gba", 0xCF04CE, 0x0000100 - .incbin "baserom.gba", 0xCF05CE, 0x00003FC - .incbin "baserom.gba", 0xCF09CA, 0x000020E - .incbin "baserom.gba", 0xCF0BD8, 0x0000774 + .incbin "baserom.gba", 0xCEC404, 0x0004F48 gUnk_08CF134C:: @ 08CF134C .incbin "baserom.gba", 0xCF134C, 0x0004F68 gUnk_08CF62B4:: @ 08CF62B4 - .incbin "baserom.gba", 0xCF62B4, 0x0002953 - .incbin "baserom.gba", 0xCF8C07, 0x0000A31 - .incbin "baserom.gba", 0xCF9638, 0x0000A9C + .incbin "baserom.gba", 0xCF62B4, 0x0003E20 gUnk_08CFA0D4:: @ 08CFA0D4 - .incbin "baserom.gba", 0xCFA0D4, 0x0000FDD - .incbin "baserom.gba", 0xCFB0B1, 0x0000301 - .incbin "baserom.gba", 0xCFB3B2, 0x0000427 - .incbin "baserom.gba", 0xCFB7D9, 0x0000F2B - .incbin "baserom.gba", 0xCFC704, 0x0000328 - .incbin "baserom.gba", 0xCFCA2C, 0x00006CA - .incbin "baserom.gba", 0xCFD0F6, 0x000033E + .incbin "baserom.gba", 0xCFA0D4, 0x0003360 gUnk_08CFD434:: @ 08CFD434 - .incbin "baserom.gba", 0xCFD434, 0x00005DE - .incbin "baserom.gba", 0xCFDA12, 0x00006F6 - .incbin "baserom.gba", 0xCFE108, 0x0001B5D - .incbin "baserom.gba", 0xCFFC65, 0x00004EF + .incbin "baserom.gba", 0xCFD434, 0x0002D20 gUnk_08D00154:: @ 08D00154 - .incbin "baserom.gba", 0xD00154, 0x0000738 - .incbin "baserom.gba", 0xD0088C, 0x0000794 - .incbin "baserom.gba", 0xD01020, 0x000013B - .incbin "baserom.gba", 0xD0115B, 0x00032D4 - .incbin "baserom.gba", 0xD0442F, 0x0002541 - .incbin "baserom.gba", 0xD06970, 0x00012AC + .incbin "baserom.gba", 0xD00154, 0x0007AC8 gUnk_08D07C1C:: @ 08D07C1C .incbin "baserom.gba", 0xD07C1C, 0x0002B98 gUnk_08D0A7B4:: @ 08D0A7B4 - .incbin "baserom.gba", 0xD0A7B4, 0x0002758 - .incbin "baserom.gba", 0xD0CF0C, 0x00001C4 - .incbin "baserom.gba", 0xD0D0D0, 0x0000718 - .incbin "baserom.gba", 0xD0D7E8, 0x0000F90 + .incbin "baserom.gba", 0xD0A7B4, 0x0003FC4 gUnk_08D0E778:: @ 08D0E778 - .incbin "baserom.gba", 0xD0E778, 0x0000480 - .incbin "baserom.gba", 0xD0EBF8, 0x0000114 - .incbin "baserom.gba", 0xD0ED0C, 0x00013A4 + .incbin "baserom.gba", 0xD0E778, 0x0001938 gUnk_08D100B0:: @ 08D100B0 - .incbin "baserom.gba", 0xD100B0, 0x0000120 - .incbin "baserom.gba", 0xD101D0, 0x0000130 - .incbin "baserom.gba", 0xD10300, 0x0000008 - .incbin "baserom.gba", 0xD10308, 0x000003B - .incbin "baserom.gba", 0xD10343, 0x000018D - .incbin "baserom.gba", 0xD104D0, 0x00005EC - .incbin "baserom.gba", 0xD10ABC, 0x0000921 - .incbin "baserom.gba", 0xD113DD, 0x0000340 - .incbin "baserom.gba", 0xD1171D, 0x000099E - .incbin "baserom.gba", 0xD120BB, 0x0000179 - .incbin "baserom.gba", 0xD12234, 0x0000468 + .incbin "baserom.gba", 0xD100B0, 0x00025EC gUnk_08D1269C:: @ 08D1269C - .incbin "baserom.gba", 0xD1269C, 0x0002674 - .incbin "baserom.gba", 0xD14D10, 0x0000848 + .incbin "baserom.gba", 0xD1269C, 0x0002EBC gUnk_08D15558:: @ 08D15558 .incbin "baserom.gba", 0xD15558, 0x0000FE8 gUnk_08D16540:: @ 08D16540 - .incbin "baserom.gba", 0xD16540, 0x0001288 - .incbin "baserom.gba", 0xD177C8, 0x00025B9 - .incbin "baserom.gba", 0xD19D81, 0x000050F - .incbin "baserom.gba", 0xD1A290, 0x0000A34 + .incbin "baserom.gba", 0xD16540, 0x0004784 gUnk_08D1ACC4:: @ 08D1ACC4 - .incbin "baserom.gba", 0xD1ACC4, 0x0000607 - .incbin "baserom.gba", 0xD1B2CB, 0x0000B09 - .incbin "baserom.gba", 0xD1BDD4, 0x0002E88 + .incbin "baserom.gba", 0xD1ACC4, 0x0003F98 gUnk_08D1EC5C:: @ 08D1EC5C - .incbin "baserom.gba", 0xD1EC5C, 0x00005B6 - .incbin "baserom.gba", 0xD1F212, 0x0000645 - .incbin "baserom.gba", 0xD1F857, 0x00005DB - .incbin "baserom.gba", 0xD1FE32, 0x00001DC - .incbin "baserom.gba", 0xD2000E, 0x000084E + .incbin "baserom.gba", 0xD1EC5C, 0x0001C00 gUnk_08D2085C:: @ 08D2085C - .incbin "baserom.gba", 0xD2085C, 0x0001190 - .incbin "baserom.gba", 0xD219EC, 0x0000278 + .incbin "baserom.gba", 0xD2085C, 0x0001408 gUnk_08D21C64:: @ 08D21C64 - .incbin "baserom.gba", 0xD21C64, 0x00010CE - .incbin "baserom.gba", 0xD22D32, 0x0001196 + .incbin "baserom.gba", 0xD21C64, 0x0002264 gUnk_08D23EC8:: @ 08D23EC8 .incbin "baserom.gba", 0xD23EC8, 0x0000C6C gUnk_08D24B34:: @ 08D24B34 - .incbin "baserom.gba", 0xD24B34, 0x0000C9E - .incbin "baserom.gba", 0xD257D2, 0x00015FE + .incbin "baserom.gba", 0xD24B34, 0x000229C gUnk_08D26DD0:: @ 08D26DD0 .incbin "baserom.gba", 0xD26DD0, 0x00016E8 @@ -1215,101 +629,55 @@ gUnk_08D284B8:: @ 08D284B8 .incbin "baserom.gba", 0xD284B8, 0x0000D44 gUnk_08D291FC:: @ 08D291FC - .incbin "baserom.gba", 0xD291FC, 0x000078E - .incbin "baserom.gba", 0xD2998A, 0x0000D09 - .incbin "baserom.gba", 0xD2A693, 0x0000305 - .incbin "baserom.gba", 0xD2A998, 0x0000270 + .incbin "baserom.gba", 0xD291FC, 0x0001A0C gUnk_08D2AC08:: @ 08D2AC08 - .incbin "baserom.gba", 0xD2AC08, 0x00019B0 - .incbin "baserom.gba", 0xD2C5B8, 0x000062F - .incbin "baserom.gba", 0xD2CBE7, 0x00006EC - .incbin "baserom.gba", 0xD2D2D3, 0x0000072 - .incbin "baserom.gba", 0xD2D345, 0x00002D8 - .incbin "baserom.gba", 0xD2D61D, 0x00008C9 - .incbin "baserom.gba", 0xD2DEE6, 0x00001F6 + .incbin "baserom.gba", 0xD2AC08, 0x00034D4 gUnk_08D2E0DC:: @ 08D2E0DC - .incbin "baserom.gba", 0xD2E0DC, 0x0000C33 - .incbin "baserom.gba", 0xD2ED0F, 0x00001F4 - .incbin "baserom.gba", 0xD2EF03, 0x00004F3 - .incbin "baserom.gba", 0xD2F3F6, 0x000050A - .incbin "baserom.gba", 0xD2F900, 0x00002EC + .incbin "baserom.gba", 0xD2E0DC, 0x0001B10 gUnk_08D2FBEC:: @ 08D2FBEC - .incbin "baserom.gba", 0xD2FBEC, 0x000041E - .incbin "baserom.gba", 0xD3000A, 0x0000006 - .incbin "baserom.gba", 0xD30010, 0x00001C2 - .incbin "baserom.gba", 0xD301D2, 0x00000A0 - .incbin "baserom.gba", 0xD30272, 0x0000161 - .incbin "baserom.gba", 0xD303D3, 0x0000183 - .incbin "baserom.gba", 0xD30556, 0x000037C - .incbin "baserom.gba", 0xD308D2, 0x0000798 - .incbin "baserom.gba", 0xD3106A, 0x0003866 + .incbin "baserom.gba", 0xD2FBEC, 0x0004CE4 gUnk_08D348D0:: @ 08D348D0 - .incbin "baserom.gba", 0xD348D0, 0x0000A19 - .incbin "baserom.gba", 0xD352E9, 0x0001D9B + .incbin "baserom.gba", 0xD348D0, 0x00027B4 gUnk_08D37084:: @ 08D37084 .incbin "baserom.gba", 0xD37084, 0x000219C gUnk_08D39220:: @ 08D39220 - .incbin "baserom.gba", 0xD39220, 0x0000962 - .incbin "baserom.gba", 0xD39B82, 0x00003FF - .incbin "baserom.gba", 0xD39F81, 0x0000200 - .incbin "baserom.gba", 0xD3A181, 0x0001213 + .incbin "baserom.gba", 0xD39220, 0x0002174 gUnk_08D3B394:: @ 08D3B394 - .incbin "baserom.gba", 0xD3B394, 0x0000503 - .incbin "baserom.gba", 0xD3B897, 0x000209A - .incbin "baserom.gba", 0xD3D931, 0x00026D9 - .incbin "baserom.gba", 0xD4000A, 0x000001E + .incbin "baserom.gba", 0xD3B394, 0x0004C94 gUnk_08D40028:: @ 08D40028 - .incbin "baserom.gba", 0xD40028, 0x00004D8 - .incbin "baserom.gba", 0xD40500, 0x0001850 + .incbin "baserom.gba", 0xD40028, 0x0001D28 gUnk_08D41D50:: @ 08D41D50 - .incbin "baserom.gba", 0xD41D50, 0x0000B80 - .incbin "baserom.gba", 0xD428D0, 0x0000283 - .incbin "baserom.gba", 0xD42B53, 0x0001421 + .incbin "baserom.gba", 0xD41D50, 0x0002224 gUnk_08D43F74:: @ 08D43F74 .incbin "baserom.gba", 0xD43F74, 0x0003C74 gUnk_08D47BE8:: @ 08D47BE8 - .incbin "baserom.gba", 0xD47BE8, 0x0000BED - .incbin "baserom.gba", 0xD487D5, 0x00010AC - .incbin "baserom.gba", 0xD49881, 0x00005CB - .incbin "baserom.gba", 0xD49E4C, 0x00000E8 + .incbin "baserom.gba", 0xD47BE8, 0x000234C gUnk_08D49F34:: @ 08D49F34 - .incbin "baserom.gba", 0xD49F34, 0x000054F - .incbin "baserom.gba", 0xD4A483, 0x0000451 - .incbin "baserom.gba", 0xD4A8D4, 0x00012E7 - .incbin "baserom.gba", 0xD4BBBB, 0x0000419 + .incbin "baserom.gba", 0xD49F34, 0x00020A0 gUnk_08D4BFD4:: @ 08D4BFD4 .incbin "baserom.gba", 0xD4BFD4, 0x00021A4 gUnk_08D4E178:: @ 08D4E178 - .incbin "baserom.gba", 0xD4E178, 0x0000176 - .incbin "baserom.gba", 0xD4E2EE, 0x0000B09 - .incbin "baserom.gba", 0xD4EDF7, 0x00008FB - .incbin "baserom.gba", 0xD4F6F2, 0x0000E1E - .incbin "baserom.gba", 0xD50510, 0x00002E1 - .incbin "baserom.gba", 0xD507F1, 0x0000B2F - .incbin "baserom.gba", 0xD51320, 0x00000E1 - .incbin "baserom.gba", 0xD51401, 0x0000653 + .incbin "baserom.gba", 0xD4E178, 0x00038DC gUnk_08D51A54:: @ 08D51A54 .incbin "baserom.gba", 0xD51A54, 0x0001608 gUnk_08D5305C:: @ 08D5305C - .incbin "baserom.gba", 0xD5305C, 0x00002ED - .incbin "baserom.gba", 0xD53349, 0x0000B7F - .incbin "baserom.gba", 0xD53EC8, 0x0000BD8 + .incbin "baserom.gba", 0xD5305C, 0x0001A44 gUnk_08D54AA0:: @ 08D54AA0 .incbin "baserom.gba", 0xD54AA0, 0x0002CB8 @@ -1318,35 +686,19 @@ gUnk_08D57758:: @ 08D57758 .incbin "baserom.gba", 0xD57758, 0x00018B8 gUnk_08D59010:: @ 08D59010 - .incbin "baserom.gba", 0xD59010, 0x000178A - .incbin "baserom.gba", 0xD5A79A, 0x00000E9 - .incbin "baserom.gba", 0xD5A883, 0x0000336 - .incbin "baserom.gba", 0xD5ABB9, 0x0000F0C - .incbin "baserom.gba", 0xD5BAC5, 0x00000DE - .incbin "baserom.gba", 0xD5BBA3, 0x0000C32 - .incbin "baserom.gba", 0xD5C7D5, 0x0000B33 + .incbin "baserom.gba", 0xD59010, 0x00042F8 gUnk_08D5D308:: @ 08D5D308 - .incbin "baserom.gba", 0xD5D308, 0x00004DB - .incbin "baserom.gba", 0xD5D7E3, 0x000174B - .incbin "baserom.gba", 0xD5EF2E, 0x00000B6 - .incbin "baserom.gba", 0xD5EFE4, 0x0001384 + .incbin "baserom.gba", 0xD5D308, 0x0003060 gUnk_08D60368:: @ 08D60368 - .incbin "baserom.gba", 0xD60368, 0x0000008 - .incbin "baserom.gba", 0xD60370, 0x000005C - .incbin "baserom.gba", 0xD603CC, 0x0000444 - .incbin "baserom.gba", 0xD60810, 0x0000D28 + .incbin "baserom.gba", 0xD60368, 0x00011D0 gUnk_08D61538:: @ 08D61538 - .incbin "baserom.gba", 0xD61538, 0x0001CC0 - .incbin "baserom.gba", 0xD631F8, 0x000016E - .incbin "baserom.gba", 0xD63366, 0x0000096 + .incbin "baserom.gba", 0xD61538, 0x0001EC4 gUnk_08D633FC:: @ 08D633FC - .incbin "baserom.gba", 0xD633FC, 0x0000708 - .incbin "baserom.gba", 0xD63B04, 0x0000404 - .incbin "baserom.gba", 0xD63F08, 0x0001D14 + .incbin "baserom.gba", 0xD633FC, 0x0002820 gUnk_08D65C1C:: @ 08D65C1C .incbin "baserom.gba", 0xD65C1C, 0x0002380 @@ -1355,117 +707,70 @@ gUnk_08D67F9C:: @ 08D67F9C .incbin "baserom.gba", 0xD67F9C, 0x00012B4 gUnk_08D69250:: @ 08D69250 - .incbin "baserom.gba", 0xD69250, 0x0000E33 - .incbin "baserom.gba", 0xD6A083, 0x0000838 - .incbin "baserom.gba", 0xD6A8BB, 0x0000D89 + .incbin "baserom.gba", 0xD69250, 0x00023F4 gUnk_08D6B644:: @ 08D6B644 - .incbin "baserom.gba", 0xD6B644, 0x00016C8 - .incbin "baserom.gba", 0xD6CD0C, 0x00003AE - .incbin "baserom.gba", 0xD6D0BA, 0x0000216 - .incbin "baserom.gba", 0xD6D2D0, 0x0000898 + .incbin "baserom.gba", 0xD6B644, 0x0002524 gUnk_08D6DB68:: @ 08D6DB68 - .incbin "baserom.gba", 0xD6DB68, 0x0000A7F - .incbin "baserom.gba", 0xD6E5E7, 0x0000991 + .incbin "baserom.gba", 0xD6DB68, 0x0001410 gUnk_08D6EF78:: @ 08D6EF78 - .incbin "baserom.gba", 0xD6EF78, 0x000095C - .incbin "baserom.gba", 0xD6F8D4, 0x000072D - .incbin "baserom.gba", 0xD70001, 0x000012B + .incbin "baserom.gba", 0xD6EF78, 0x00011B4 gUnk_08D7012C:: @ 08D7012C - .incbin "baserom.gba", 0xD7012C, 0x00000C4 - .incbin "baserom.gba", 0xD701F0, 0x0000610 - .incbin "baserom.gba", 0xD70800, 0x0000100 - .incbin "baserom.gba", 0xD70900, 0x0001188 + .incbin "baserom.gba", 0xD7012C, 0x000195C gUnk_08D71A88:: @ 08D71A88 - .incbin "baserom.gba", 0xD71A88, 0x000186F - .incbin "baserom.gba", 0xD732F7, 0x0000471 + .incbin "baserom.gba", 0xD71A88, 0x0001CE0 gUnk_08D73768:: @ 08D73768 - .incbin "baserom.gba", 0xD73768, 0x00007A0 - .incbin "baserom.gba", 0xD73F08, 0x0000622 - .incbin "baserom.gba", 0xD7452A, 0x0000B06 + .incbin "baserom.gba", 0xD73768, 0x00018C8 gUnk_08D75030:: @ 08D75030 .incbin "baserom.gba", 0xD75030, 0x0000F68 gUnk_08D75F98:: @ 08D75F98 - .incbin "baserom.gba", 0xD75F98, 0x0001674 - .incbin "baserom.gba", 0xD7760C, 0x00000C4 + .incbin "baserom.gba", 0xD75F98, 0x0001738 gUnk_08D776D0:: @ 08D776D0 - .incbin "baserom.gba", 0xD776D0, 0x0000903 - .incbin "baserom.gba", 0xD77FD3, 0x0000C2F - .incbin "baserom.gba", 0xD78C02, 0x0000132 + .incbin "baserom.gba", 0xD776D0, 0x0001664 gUnk_08D78D34:: @ 08D78D34 - .incbin "baserom.gba", 0xD78D34, 0x000049F - .incbin "baserom.gba", 0xD791D3, 0x0000104 - .incbin "baserom.gba", 0xD792D7, 0x00001C6 - .incbin "baserom.gba", 0xD7949D, 0x0000764 - .incbin "baserom.gba", 0xD79C01, 0x000088F + .incbin "baserom.gba", 0xD78D34, 0x000175C gUnk_08D7A490:: @ 08D7A490 .incbin "baserom.gba", 0xD7A490, 0x0000D44 gUnk_08D7B1D4:: @ 08D7B1D4 - .incbin "baserom.gba", 0xD7B1D4, 0x00001CC - .incbin "baserom.gba", 0xD7B3A0, 0x0001428 + .incbin "baserom.gba", 0xD7B1D4, 0x00015F4 gUnk_08D7C7C8:: @ 08D7C7C8 .incbin "baserom.gba", 0xD7C7C8, 0x0001C7C gUnk_08D7E444:: @ 08D7E444 - .incbin "baserom.gba", 0xD7E444, 0x00016EC - .incbin "baserom.gba", 0xD7FB30, 0x0000320 + .incbin "baserom.gba", 0xD7E444, 0x0001A0C gUnk_08D7FE50:: @ 08D7FE50 - .incbin "baserom.gba", 0xD7FE50, 0x0000167 - .incbin "baserom.gba", 0xD7FFB7, 0x0000139 - .incbin "baserom.gba", 0xD800F0, 0x00002F3 - .incbin "baserom.gba", 0xD803E3, 0x00002F4 - .incbin "baserom.gba", 0xD806D7, 0x0000929 - .incbin "baserom.gba", 0xD81000, 0x0000900 - .incbin "baserom.gba", 0xD81900, 0x0001144 + .incbin "baserom.gba", 0xD7FE50, 0x0002BF4 gUnk_08D82A44:: @ 08D82A44 - .incbin "baserom.gba", 0xD82A44, 0x0000880 - .incbin "baserom.gba", 0xD832C4, 0x00024D4 + .incbin "baserom.gba", 0xD82A44, 0x0002D54 gUnk_08D85798:: @ 08D85798 .incbin "baserom.gba", 0xD85798, 0x00019BC gUnk_08D87154:: @ 08D87154 - .incbin "baserom.gba", 0xD87154, 0x00021BF - .incbin "baserom.gba", 0xD89313, 0x0000F71 + .incbin "baserom.gba", 0xD87154, 0x0003130 gUnk_08D8A284:: @ 08D8A284 - .incbin "baserom.gba", 0xD8A284, 0x0000912 - .incbin "baserom.gba", 0xD8AB96, 0x000032A - .incbin "baserom.gba", 0xD8AEC0, 0x000172C - .incbin "baserom.gba", 0xD8C5EC, 0x00008F0 - .incbin "baserom.gba", 0xD8CEDC, 0x0000010 - .incbin "baserom.gba", 0xD8CEEC, 0x000010B - .incbin "baserom.gba", 0xD8CFF7, 0x0000448 - .incbin "baserom.gba", 0xD8D43F, 0x00003B9 - .incbin "baserom.gba", 0xD8D7F8, 0x00002B0 + .incbin "baserom.gba", 0xD8A284, 0x0003824 gUnk_08D8DAA8:: @ 08D8DAA8 - .incbin "baserom.gba", 0xD8DAA8, 0x0000E29 - .incbin "baserom.gba", 0xD8E8D1, 0x0000920 - .incbin "baserom.gba", 0xD8F1F1, 0x0000E10 - .incbin "baserom.gba", 0xD90001, 0x0000725 - .incbin "baserom.gba", 0xD90726, 0x00001B2 - .incbin "baserom.gba", 0xD908D8, 0x0000583 - .incbin "baserom.gba", 0xD90E5B, 0x00001A5 - .incbin "baserom.gba", 0xD91000, 0x00002E8 + .incbin "baserom.gba", 0xD8DAA8, 0x0003840 gUnk_08D912E8:: @ 08D912E8 - .incbin "baserom.gba", 0xD912E8, 0x000052C - .incbin "baserom.gba", 0xD91814, 0x0003038 + .incbin "baserom.gba", 0xD912E8, 0x0003564 gUnk_08D9484C:: @ 08D9484C .incbin "baserom.gba", 0xD9484C, 0x0001DAC @@ -1477,23 +782,10 @@ gUnk_08D987E0:: @ 08D987E0 .incbin "baserom.gba", 0xD987E0, 0x0002090 gUnk_08D9A870:: @ 08D9A870 - .incbin "baserom.gba", 0xD9A870, 0x0000949 - .incbin "baserom.gba", 0xD9B1B9, 0x0000BEE - .incbin "baserom.gba", 0xD9BDA7, 0x0000C2D - .incbin "baserom.gba", 0xD9C9D4, 0x0000060 + .incbin "baserom.gba", 0xD9A870, 0x00021C4 gUnk_08D9CA34:: @ 08D9CA34 - .incbin "baserom.gba", 0xD9CA34, 0x0000AB3 - .incbin "baserom.gba", 0xD9D4E7, 0x000031B - .incbin "baserom.gba", 0xD9D802, 0x0000318 - .incbin "baserom.gba", 0xD9DB1A, 0x00002C3 - .incbin "baserom.gba", 0xD9DDDD, 0x00001F1 - .incbin "baserom.gba", 0xD9DFCE, 0x0001625 - .incbin "baserom.gba", 0xD9F5F3, 0x0000AE6 - .incbin "baserom.gba", 0xDA00D9, 0x0000155 - .incbin "baserom.gba", 0xDA022E, 0x00000D2 - .incbin "baserom.gba", 0xDA0300, 0x00005D9 - .incbin "baserom.gba", 0xDA08D9, 0x000019F + .incbin "baserom.gba", 0xD9CA34, 0x0004044 gUnk_08DA0A78:: @ 08DA0A78 .incbin "baserom.gba", 0xDA0A78, 0x0003B0C @@ -1502,46 +794,16 @@ gUnk_08DA4584:: @ 08DA4584 .incbin "baserom.gba", 0xDA4584, 0x00061C0 gUnk_08DAA744:: @ 08DAA744 - .incbin "baserom.gba", 0xDAA744, 0x000004B - .incbin "baserom.gba", 0xDAA78F, 0x0000502 - .incbin "baserom.gba", 0xDAAC91, 0x0000218 - .incbin "baserom.gba", 0xDAAEA9, 0x0000916 - .incbin "baserom.gba", 0xDAB7BF, 0x0000E18 - .incbin "baserom.gba", 0xDAC5D7, 0x000000B - .incbin "baserom.gba", 0xDAC5E2, 0x00001C1 - .incbin "baserom.gba", 0xDAC7A3, 0x0000951 - .incbin "baserom.gba", 0xDAD0F4, 0x000154F - .incbin "baserom.gba", 0xDAE643, 0x00000B9 + .incbin "baserom.gba", 0xDAA744, 0x0003FB8 gUnk_08DAE6FC:: @ 08DAE6FC - .incbin "baserom.gba", 0xDAE6FC, 0x000043B - .incbin "baserom.gba", 0xDAEB37, 0x00000CA - .incbin "baserom.gba", 0xDAEC01, 0x00001DB - .incbin "baserom.gba", 0xDAEDDC, 0x0001447 - .incbin "baserom.gba", 0xDB0223, 0x0000EE3 - .incbin "baserom.gba", 0xDB1106, 0x000002F - .incbin "baserom.gba", 0xDB1135, 0x00012C5 - .incbin "baserom.gba", 0xDB23FA, 0x00014AE + .incbin "baserom.gba", 0xDAE6FC, 0x00051AC gUnk_08DB38A8:: @ 08DB38A8 - .incbin "baserom.gba", 0xDB38A8, 0x0003F13 - .incbin "baserom.gba", 0xDB77BB, 0x0000691 + .incbin "baserom.gba", 0xDB38A8, 0x00045A4 gUnk_08DB7E4C:: @ 08DB7E4C - .incbin "baserom.gba", 0xDB7E4C, 0x0002D5A - .incbin "baserom.gba", 0xDBABA6, 0x00002F9 - .incbin "baserom.gba", 0xDBAE9F, 0x0000707 - .incbin "baserom.gba", 0xDBB5A6, 0x000010A - .incbin "baserom.gba", 0xDBB6B0, 0x0000302 - .incbin "baserom.gba", 0xDBB9B2, 0x000070B - .incbin "baserom.gba", 0xDBC0BD, 0x0000946 - .incbin "baserom.gba", 0xDBCA03, 0x00000EC - .incbin "baserom.gba", 0xDBCAEF, 0x00005F7 - .incbin "baserom.gba", 0xDBD0E6, 0x0000013 - .incbin "baserom.gba", 0xDBD0F9, 0x0000002 - .incbin "baserom.gba", 0xDBD0FB, 0x00003A1 - .incbin "baserom.gba", 0xDBD49C, 0x0000B63 - .incbin "baserom.gba", 0xDBDFFF, 0x000034D + .incbin "baserom.gba", 0xDB7E4C, 0x0006500 gUnk_08DBE34C:: @ 08DBE34C .incbin "baserom.gba", 0xDBE34C, 0x0000270 @@ -1550,31 +812,13 @@ gUnk_08DBE5BC:: @ 08DBE5BC .incbin "baserom.gba", 0xDBE5BC, 0x0001064 gUnk_08DBF620:: @ 08DBF620 - .incbin "baserom.gba", 0xDBF620, 0x00006E0 - .incbin "baserom.gba", 0xDBFD00, 0x000030E - .incbin "baserom.gba", 0xDC000E, 0x0000259 - .incbin "baserom.gba", 0xDC0267, 0x00002B9 - .incbin "baserom.gba", 0xDC0520, 0x000037C - .incbin "baserom.gba", 0xDC089C, 0x000008F - .incbin "baserom.gba", 0xDC092B, 0x00006BD - .incbin "baserom.gba", 0xDC0FE8, 0x0000244 - .incbin "baserom.gba", 0xDC122C, 0x000050C + .incbin "baserom.gba", 0xDBF620, 0x0002118 gUnk_08DC1738:: @ 08DC1738 - .incbin "baserom.gba", 0xDC1738, 0x00002C2 - .incbin "baserom.gba", 0xDC19FA, 0x000150E - .incbin "baserom.gba", 0xDC2F08, 0x00011C4 - .incbin "baserom.gba", 0xDC40CC, 0x0000D80 + .incbin "baserom.gba", 0xDC1738, 0x0003714 gUnk_08DC4E4C:: @ 08DC4E4C .incbin "baserom.gba", 0xDC4E4C, 0x0003370 gUnk_08DC81BC:: @ 08DC81BC - .incbin "baserom.gba", 0xDC81BC, 0x00008CF - .incbin "baserom.gba", 0xDC8A8B, 0x0000FF5 - .incbin "baserom.gba", 0xDC9A80, 0x0000F83 - .incbin "baserom.gba", 0xDCAA03, 0x0000D99 - .incbin "baserom.gba", 0xDCB79C, 0x0000410 - .incbin "baserom.gba", 0xDCBBAC, 0x000061D - .incbin "baserom.gba", 0xDCC1C9, 0x000022C - .incbin "baserom.gba", 0xDCC3F5, 0x0000087 + .incbin "baserom.gba", 0xDC81BC, 0x00042C0 diff --git a/data/sounds.s b/data/sounds.s index 92ca6a5d..2982af34 100644 --- a/data/sounds.s +++ b/data/sounds.s @@ -55,8 +55,7 @@ bgmVaatiMotif_track1:: @ 08DCC728 bgmVaatiMotif_track2:: @ 08DCC764 .incbin "baserom.gba", 0xDCC764, 0x000003C bgmVaatiMotif_track3:: @ 08DCC7A0 - .incbin "baserom.gba", 0xDCC7A0, 0x000000B - .incbin "baserom.gba", 0xDCC7AB, 0x0000031 + .incbin "baserom.gba", 0xDCC7A0, 0x000003C bgmVaatiMotif_track4:: @ 08DCC7DC .incbin "baserom.gba", 0xDCC7DC, 0x000003C bgmVaatiMotif_track5:: @ 08DCC818 @@ -77,8 +76,7 @@ bgmTitleScreen_track4:: @ 08DCC952 bgmTitleScreen_track5:: @ 08DCC98D .incbin "baserom.gba", 0xDCC98D, 0x0000007 gUnk_08DCC994:: @ 08DCC994 - .incbin "baserom.gba", 0xDCC994, 0x0000005 - .incbin "baserom.gba", 0xDCC999, 0x0000009 + .incbin "baserom.gba", 0xDCC994, 0x000000E .4byte gUnk_08DCC994 .incbin "baserom.gba", 0xDCC9A6, 0x0000009 bgmTitleScreen_track6:: @ 08DCC9AF @@ -118,8 +116,7 @@ gUnk_08DCCC95:: @ 08DCCC95 bgmElementGet_track6:: @ 08DCCCB1 .incbin "baserom.gba", 0xDCCCB1, 0x0000014 bgmElementGet_track7:: @ 08DCCCC5 - .incbin "baserom.gba", 0xDCCCC5, 0x0000007 - .incbin "baserom.gba", 0xDCCCCC, 0x000000B + .incbin "baserom.gba", 0xDCCCC5, 0x0000012 gUnk_08DCCCD7:: @ 08DCCCD7 .incbin "baserom.gba", 0xDCCCD7, 0x0000013 .4byte gUnk_08DCCCD7 @@ -378,8 +375,7 @@ gUnk_08DCD2AA:: @ 08DCD2AA .4byte gUnk_08DCD265 .incbin "baserom.gba", 0xDCD2E9, 0x0000001 bgmFileSelect_track4:: @ 08DCD2EA - .incbin "baserom.gba", 0xDCD2EA, 0x0000002 - .incbin "baserom.gba", 0xDCD2EC, 0x0000005 + .incbin "baserom.gba", 0xDCD2EA, 0x0000007 gUnk_08DCD2F1:: @ 08DCD2F1 .incbin "baserom.gba", 0xDCD2F1, 0x000005D gUnk_08DCD34E:: @ 08DCD34E @@ -597,8 +593,7 @@ gUnk_08DCDB0F:: @ 08DCDB0F gUnk_08DCDB6F:: @ 08DCDB6F .incbin "baserom.gba", 0xDCDB6F, 0x0000037 .4byte gUnk_08DCDB6F - .incbin "baserom.gba", 0xDCDBAA, 0x0000010 - .incbin "baserom.gba", 0xDCDBBA, 0x000000F + .incbin "baserom.gba", 0xDCDBAA, 0x000001F gUnk_08DCDBC9:: @ 08DCDBC9 .incbin "baserom.gba", 0xDCDBC9, 0x0000037 .4byte gUnk_08DCDBC9 @@ -692,8 +687,7 @@ gUnk_08DCE0A2:: @ 08DCE0A2 .4byte gUnk_08DCE0A2 .incbin "baserom.gba", 0xDCE0B3, 0x0000009 .4byte gUnk_08DCE0A2 - .incbin "baserom.gba", 0xDCE0C0, 0x0000020 - .incbin "baserom.gba", 0xDCE0E0, 0x0000032 + .incbin "baserom.gba", 0xDCE0C0, 0x0000052 gUnk_08DCE112:: @ 08DCE112 .incbin "baserom.gba", 0xDCE112, 0x000000B gUnk_08DCE11D:: @ 08DCE11D @@ -985,8 +979,7 @@ gUnk_08DCEB31:: @ 08DCEB31 .4byte gUnk_08DCEB31 .incbin "baserom.gba", 0xDCEB84, 0x0000001 .4byte gUnk_08DCEA1A - .incbin "baserom.gba", 0xDCEB89, 0x0000075 - .incbin "baserom.gba", 0xDCEBFE, 0x0000010 + .incbin "baserom.gba", 0xDCEB89, 0x0000085 .4byte gUnk_08DCEA1A .incbin "baserom.gba", 0xDCEC12, 0x0000001 .4byte gUnk_08DCEA06 @@ -1381,8 +1374,7 @@ gUnk_08DCFE7F:: @ 08DCFE7F .4byte gUnk_08DCFE7F .incbin "baserom.gba", 0xDCFF0C, 0x0000001 bgmVaatiTheme_track2:: @ 08DCFF0D - .incbin "baserom.gba", 0xDCFF0D, 0x0000023 - .incbin "baserom.gba", 0xDCFF30, 0x0000010 + .incbin "baserom.gba", 0xDCFF0D, 0x0000033 gUnk_08DCFF40:: @ 08DCFF40 .incbin "baserom.gba", 0xDCFF40, 0x0000013 gUnk_08DCFF53:: @ 08DCFF53 @@ -1434,8 +1426,7 @@ gUnk_08DD0097:: @ 08DD0097 bgmVaatiTheme_track5:: @ 08DD00D5 .incbin "baserom.gba", 0xDD00D5, 0x0000008 gUnk_08DD00DD:: @ 08DD00DD - .incbin "baserom.gba", 0xDD00DD, 0x0000023 - .incbin "baserom.gba", 0xDD0100, 0x000004F + .incbin "baserom.gba", 0xDD00DD, 0x0000072 .4byte gUnk_08DD00DD .incbin "baserom.gba", 0xDD0153, 0x0000001 bgmVaatiTheme_track6:: @ 08DD0154 @@ -1454,13 +1445,11 @@ bgmVaatiTheme:: @ 08DD0244 bgmEzloTheme_track0:: @ 08DD0268 .incbin "baserom.gba", 0xDD0268, 0x000000B gUnk_08DD0273:: @ 08DD0273 - .incbin "baserom.gba", 0xDD0273, 0x0000069 - .incbin "baserom.gba", 0xDD02DC, 0x000001E + .incbin "baserom.gba", 0xDD0273, 0x0000087 .4byte gUnk_08DD0273 .incbin "baserom.gba", 0xDD02FE, 0x0000001 bgmEzloTheme_track1:: @ 08DD02FF - .incbin "baserom.gba", 0xDD02FF, 0x0000001 - .incbin "baserom.gba", 0xDD0300, 0x0000006 + .incbin "baserom.gba", 0xDD02FF, 0x0000007 gUnk_08DD0306:: @ 08DD0306 .incbin "baserom.gba", 0xDD0306, 0x000001E gUnk_08DD0324:: @ 08DD0324 @@ -1560,8 +1549,7 @@ bgmStory_track4:: @ 08DD08C3 gUnk_08DD08DE:: @ 08DD08DE .incbin "baserom.gba", 0xDD08DE, 0x0000017 gUnk_08DD08F5:: @ 08DD08F5 - .incbin "baserom.gba", 0xDD08F5, 0x000000B - .incbin "baserom.gba", 0xDD0900, 0x0000025 + .incbin "baserom.gba", 0xDD08F5, 0x0000030 .4byte gUnk_08DD08F5 .incbin "baserom.gba", 0xDD0929, 0x0000001 .4byte gUnk_08DD08DE @@ -1598,8 +1586,7 @@ bgmFestivalApproach_track0:: @ 08DD0ABC gUnk_08DD0AC7:: @ 08DD0AC7 .incbin "baserom.gba", 0xDD0AC7, 0x0000038 gUnk_08DD0AFF:: @ 08DD0AFF - .incbin "baserom.gba", 0xDD0AFF, 0x0000001 - .incbin "baserom.gba", 0xDD0B00, 0x0000036 + .incbin "baserom.gba", 0xDD0AFF, 0x0000037 gUnk_08DD0B36:: @ 08DD0B36 .incbin "baserom.gba", 0xDD0B36, 0x0000039 gUnk_08DD0B6F:: @ 08DD0B6F @@ -1935,8 +1922,7 @@ bgmHouse:: @ 08DD1990 bgmCuccoMinigame_track0:: @ 08DD19B8 .incbin "baserom.gba", 0xDD19B8, 0x000000B gUnk_08DD19C3:: @ 08DD19C3 - .incbin "baserom.gba", 0xDD19C3, 0x0000040 - .incbin "baserom.gba", 0xDD1A03, 0x0000054 + .incbin "baserom.gba", 0xDD19C3, 0x0000094 .4byte gUnk_08DD19C3 .incbin "baserom.gba", 0xDD1A5B, 0x0000001 bgmCuccoMinigame_track1:: @ 08DD1A5C @@ -1997,8 +1983,7 @@ gUnk_08DD1CBA:: @ 08DD1CBA gUnk_08DD1CC7:: @ 08DD1CC7 .incbin "baserom.gba", 0xDD1CC7, 0x000001F .4byte gUnk_08DD1CC7 - .incbin "baserom.gba", 0xDD1CEA, 0x000003C - .incbin "baserom.gba", 0xDD1D26, 0x0000011 + .incbin "baserom.gba", 0xDD1CEA, 0x000004D .4byte gUnk_08DD1CBA .incbin "baserom.gba", 0xDD1D3B, 0x0000001 bgmSyrupTheme_track2:: @ 08DD1D3C @@ -2055,8 +2040,7 @@ gUnk_08DD1F6E:: @ 08DD1F6E gUnk_08DD1F87:: @ 08DD1F87 .incbin "baserom.gba", 0xDD1F87, 0x0000033 .4byte gUnk_08DD1F87 - .incbin "baserom.gba", 0xDD1FBE, 0x0000042 - .incbin "baserom.gba", 0xDD2000, 0x0000001 + .incbin "baserom.gba", 0xDD1FBE, 0x0000043 .4byte gUnk_08DD1F6E .incbin "baserom.gba", 0xDD2005, 0x0000001 bgmDungeon_track3:: @ 08DD2006 @@ -2168,8 +2152,7 @@ gUnk_08DD2832:: @ 08DD2832 gUnk_08DD2841:: @ 08DD2841 .incbin "baserom.gba", 0xDD2841, 0x00000C2 .4byte gUnk_08DD2841 - .incbin "baserom.gba", 0xDD2907, 0x000000F - .incbin "baserom.gba", 0xDD2916, 0x000001A + .incbin "baserom.gba", 0xDD2907, 0x0000029 gUnk_08DD2930:: @ 08DD2930 .incbin "baserom.gba", 0xDD2930, 0x0000027 .4byte gUnk_08DD2930 @@ -3596,8 +3579,7 @@ gUnk_08DD63CA:: @ 08DD63CA gUnk_08DD63DA:: @ 08DD63DA .incbin "baserom.gba", 0xDD63DA, 0x000000C gUnk_08DD63E6:: @ 08DD63E6 - .incbin "baserom.gba", 0xDD63E6, 0x0000019 - .incbin "baserom.gba", 0xDD63FF, 0x0000001 + .incbin "baserom.gba", 0xDD63E6, 0x000001A .4byte gUnk_08DD63AA .incbin "baserom.gba", 0xDD6404, 0x0000001 .4byte gUnk_08DD63B6 @@ -4216,8 +4198,7 @@ gUnk_08DD7714:: @ 08DD7714 gUnk_08DD772A:: @ 08DD772A .incbin "baserom.gba", 0xDD772A, 0x0000016 gUnk_08DD7740:: @ 08DD7740 - .incbin "baserom.gba", 0xDD7740, 0x0000026 - .incbin "baserom.gba", 0xDD7766, 0x0000009 + .incbin "baserom.gba", 0xDD7740, 0x000002F .4byte gUnk_08DD76AD .incbin "baserom.gba", 0xDD7773, 0x0000001 .4byte gUnk_08DD76CB @@ -4477,8 +4458,7 @@ gUnk_08DD7FBA:: @ 08DD7FBA .4byte gUnk_08DD7FAA .incbin "baserom.gba", 0xDD7FCB, 0x000003A gUnk_08DD8005:: @ 08DD8005 - .incbin "baserom.gba", 0xDD8005, 0x000002B - .incbin "baserom.gba", 0xDD8030, 0x0000020 + .incbin "baserom.gba", 0xDD8005, 0x000004B .4byte gUnk_08DD8005 .incbin "baserom.gba", 0xDD8054, 0x0000053 .4byte gUnk_08DD7FAA @@ -4504,8 +4484,7 @@ gUnk_08DD8101:: @ 08DD8101 gUnk_08DD8121:: @ 08DD8121 .incbin "baserom.gba", 0xDD8121, 0x00000EF .4byte gUnk_08DD8121 - .incbin "baserom.gba", 0xDD8214, 0x0000008 - .incbin "baserom.gba", 0xDD821C, 0x0000006 + .incbin "baserom.gba", 0xDD8214, 0x000000E gUnk_08DD8222:: @ 08DD8222 .incbin "baserom.gba", 0xDD8222, 0x0000013 .4byte gUnk_08DD8222 @@ -4731,8 +4710,7 @@ bgmPalaceOfWinds_track7:: @ 08DD8D7E gUnk_08DD8DA2:: @ 08DD8DA2 .incbin "baserom.gba", 0xDD8DA2, 0x0000024 gUnk_08DD8DC6:: @ 08DD8DC6 - .incbin "baserom.gba", 0xDD8DC6, 0x0000012 - .incbin "baserom.gba", 0xDD8DD8, 0x0000015 + .incbin "baserom.gba", 0xDD8DC6, 0x0000027 .4byte gUnk_08DD8DC6 .incbin "baserom.gba", 0xDD8DF1, 0x0000001 .4byte gUnk_08DD8DC6 @@ -5176,8 +5154,7 @@ gUnk_08DDA0A1:: @ 08DDA0A1 bgmBossTheme_track3:: @ 08DDA0B9 .incbin "baserom.gba", 0xDDA0B9, 0x000001A gUnk_08DDA0D3:: @ 08DDA0D3 - .incbin "baserom.gba", 0xDDA0D3, 0x0000009 - .incbin "baserom.gba", 0xDDA0DC, 0x0000004 + .incbin "baserom.gba", 0xDDA0D3, 0x000000D gUnk_08DDA0E0:: @ 08DDA0E0 .incbin "baserom.gba", 0xDDA0E0, 0x000000F .4byte gUnk_08DDA0E0 @@ -5849,8 +5826,7 @@ gUnk_08DDB67A:: @ 08DDB67A .4byte gUnk_08DDB67A .incbin "baserom.gba", 0xDDB698, 0x0000001 .4byte gUnk_08DDB67A - .incbin "baserom.gba", 0xDDB69D, 0x000005C - .incbin "baserom.gba", 0xDDB6F9, 0x000001E + .incbin "baserom.gba", 0xDDB69D, 0x000007A .4byte gUnk_08DDB65D .incbin "baserom.gba", 0xDDB71B, 0x0000001 bgmVaatiWrath_track1:: @ 08DDB71C @@ -5876,8 +5852,7 @@ gUnk_08DDB8B6:: @ 08DDB8B6 bgmVaatiWrath_track3:: @ 08DDBA54 .incbin "baserom.gba", 0xDDBA54, 0x0000024 gUnk_08DDBA78:: @ 08DDBA78 - .incbin "baserom.gba", 0xDDBA78, 0x0000025 - .incbin "baserom.gba", 0xDDBA9D, 0x000001C + .incbin "baserom.gba", 0xDDBA78, 0x0000041 gUnk_08DDBAB9:: @ 08DDBAB9 .incbin "baserom.gba", 0xDDBAB9, 0x0000021 .4byte gUnk_08DDBAB9 @@ -5893,8 +5868,7 @@ bgmVaatiWrath_track4:: @ 08DDBB43 gUnk_08DDBB59:: @ 08DDBB59 .incbin "baserom.gba", 0xDDBB59, 0x0000027 gUnk_08DDBB80:: @ 08DDBB80 - .incbin "baserom.gba", 0xDDBB80, 0x000002A - .incbin "baserom.gba", 0xDDBBAA, 0x0000004 + .incbin "baserom.gba", 0xDDBB80, 0x000002E .4byte gUnk_08DDBB80 .incbin "baserom.gba", 0xDDBBB2, 0x0000001 .4byte gUnk_08DDBB80 @@ -6323,8 +6297,7 @@ gUnk_08DDCB6B:: @ 08DDCB6B .4byte gUnk_08DDCB6B .incbin "baserom.gba", 0xDDCBA6, 0x000001F gUnk_08DDCBC5:: @ 08DDCBC5 - .incbin "baserom.gba", 0xDDCBC5, 0x0000006 - .incbin "baserom.gba", 0xDDCBCB, 0x0000031 + .incbin "baserom.gba", 0xDDCBC5, 0x0000037 .4byte gUnk_08DDCBC5 .incbin "baserom.gba", 0xDDCC00, 0x000001C .4byte gUnk_08DDCBC5 @@ -6395,9 +6368,7 @@ gUnk_08DDCEA2:: @ 08DDCEA2 .4byte gUnk_08DDCEA2 .incbin "baserom.gba", 0xDDCEBF, 0x0000001 .4byte gUnk_08DDCE99 - .incbin "baserom.gba", 0xDDCEC4, 0x0000003 - .incbin "baserom.gba", 0xDDCEC7, 0x000001E - .incbin "baserom.gba", 0xDDCEE5, 0x000003B + .incbin "baserom.gba", 0xDDCEC4, 0x000005C .4byte gUnk_08DDCE91 .incbin "baserom.gba", 0xDDCF24, 0x0000004 bgmMinishCap:: @ 08DDCF28 @@ -6608,8 +6579,7 @@ bgmPicoriFestival_track0:: @ 08DDD534 gUnk_08DDD53C:: @ 08DDD53C .incbin "baserom.gba", 0xDDD53C, 0x0000017 gUnk_08DDD553:: @ 08DDD553 - .incbin "baserom.gba", 0xDDD553, 0x0000024 - .incbin "baserom.gba", 0xDDD577, 0x0000008 + .incbin "baserom.gba", 0xDDD553, 0x000002C gUnk_08DDD57F:: @ 08DDD57F .incbin "baserom.gba", 0xDDD57F, 0x0000010 gUnk_08DDD58F:: @ 08DDD58F @@ -7085,8 +7055,7 @@ gUnk_08DDE862:: @ 08DDE862 bgmWindRuins_track1:: @ 08DDE8CE .incbin "baserom.gba", 0xDDE8CE, 0x000000B gUnk_08DDE8D9:: @ 08DDE8D9 - .incbin "baserom.gba", 0xDDE8D9, 0x0000002 - .incbin "baserom.gba", 0xDDE8DB, 0x0000004 + .incbin "baserom.gba", 0xDDE8D9, 0x0000006 gUnk_08DDE8DF:: @ 08DDE8DF .incbin "baserom.gba", 0xDDE8DF, 0x0000008 .4byte gUnk_08DDE8DF @@ -7126,8 +7095,7 @@ gUnk_08DDE8DF:: @ 08DDE8DF bgmWindRuins_track2:: @ 08DDE95A .incbin "baserom.gba", 0xDDE95A, 0x000000D gUnk_08DDE967:: @ 08DDE967 - .incbin "baserom.gba", 0xDDE967, 0x0000019 - .incbin "baserom.gba", 0xDDE980, 0x0000013 + .incbin "baserom.gba", 0xDDE967, 0x000002C .4byte gUnk_08DDE967 .incbin "baserom.gba", 0xDDE997, 0x0000001 bgmWindRuins_track3:: @ 08DDE998 @@ -7254,8 +7222,7 @@ sfxTextboxOpen:: @ 08DDEEBC sfxTextboxClose_track0:: @ 08DDEECC .incbin "baserom.gba", 0xDDEECC, 0x000002A sfxTextboxClose_track1:: @ 08DDEEF6 - .incbin "baserom.gba", 0xDDEEF6, 0x0000009 - .incbin "baserom.gba", 0xDDEEFF, 0x0000021 + .incbin "baserom.gba", 0xDDEEF6, 0x000002A sfxTextboxClose:: @ 08DDEF20 sound_header 2 0 0x30 0 gUnk_08A0FF80 sfxTextboxClose_track0 sfxTextboxClose_track1 @@ -7653,8 +7620,7 @@ sfxMinish3:: @ 08DDFAEC sound_header 1 0 0x48 0 gUnk_08A103AC sfxMinish3_track0 sfxMinish4_track0:: @ 08DDFAF8 - .incbin "baserom.gba", 0xDDFAF8, 0x0000005 - .incbin "baserom.gba", 0xDDFAFD, 0x000000B + .incbin "baserom.gba", 0xDDFAF8, 0x0000010 sfxMinish4:: @ 08DDFB08 sound_header 1 0 0x48 0 gUnk_08A103B8 sfxMinish4_track0 @@ -7923,8 +7889,7 @@ sfxWind1:: @ 08DE00EC sound_header 1 0 0x30 0 gUnk_08A10634 sfxWind1_track0 sfxWind2_track0:: @ 08DE00F8 - .incbin "baserom.gba", 0xDE00F8, 0x0000010 - .incbin "baserom.gba", 0xDE0108, 0x0000030 + .incbin "baserom.gba", 0xDE00F8, 0x0000040 sfxWind2:: @ 08DE0138 sound_header 1 0 0x30 0 gUnk_08A10640 sfxWind2_track0 @@ -8094,9 +8059,7 @@ sfx104:: @ 08DE08FC gUnk_08DE0908:: @ 08DE0908 .incbin "baserom.gba", 0xDE0908, 0x0000010 gUnk_08DE0918:: @ 08DE0918 - .incbin "baserom.gba", 0xDE0918, 0x00000A8 - .incbin "baserom.gba", 0xDE09C0, 0x0000743 - .incbin "baserom.gba", 0xDE1103, 0x0000282 + .incbin "baserom.gba", 0xDE0918, 0x0000A6D gUnk_08DE1385:: @ 08DE1385 .incbin "baserom.gba", 0xDE1385, 0x0000185 gUnk_08DE150A:: @ 08DE150A @@ -8280,8 +8243,7 @@ sfxChargingUp:: @ 08DE26E4 sound_header 1 0 0x40 0 gUnk_08A10A9C sfxChargingUp_track0 sfxStairs_track0:: @ 08DE26F0 - .incbin "baserom.gba", 0xDE26F0, 0x0000004 - .incbin "baserom.gba", 0xDE26F4, 0x0000024 + .incbin "baserom.gba", 0xDE26F0, 0x0000028 sfxStairs:: @ 08DE2718 sound_header 1 0 0x40 0 gUnk_08A10AA8 sfxStairs_track0 @@ -8313,8 +8275,7 @@ sfx126:: @ 08DE287C sound_header 2 0 0x40 0 gUnk_08A10AF0 sfx126_track0 sfx126_track1 sfxBossHit_track0:: @ 08DE288C - .incbin "baserom.gba", 0xDE288C, 0x000004B - .incbin "baserom.gba", 0xDE28D7, 0x000002B + .incbin "baserom.gba", 0xDE288C, 0x0000076 sfxBossHit_track1:: @ 08DE2902 .incbin "baserom.gba", 0xDE2902, 0x0000042 sfxBossHit:: @ 08DE2944 @@ -8323,8 +8284,7 @@ sfxBossHit:: @ 08DE2944 sfxBossDie_track0:: @ 08DE2954 .incbin "baserom.gba", 0xDE2954, 0x000008A sfxBossDie_track1:: @ 08DE29DE - .incbin "baserom.gba", 0xDE29DE, 0x0000074 - .incbin "baserom.gba", 0xDE2A52, 0x0000016 + .incbin "baserom.gba", 0xDE29DE, 0x000008A sfxBossDie:: @ 08DE2A68 sound_header 2 0 0x70 0 gUnk_08A10B20 sfxBossDie_track0 sfxBossDie_track1 diff --git a/data/sprite_table.s b/data/sprite_table.s index bcf906d5..80be4f5e 100644 --- a/data/sprite_table.s +++ b/data/sprite_table.s @@ -13,13 +13,13 @@ gUnk_089FB780:: @ 089FB780 .endif @ More sprites in demo .ifdef DEMO_USA - .incbin "baserom_demo.gba", 0x9FD0F4, 0xC0 + .incbin "baserom_demo.gba", 0x9FD0F4, 0x00000C0 gUnk_089FD1B4:: - .incbin "baserom_demo.gba", 0x9FD1B4, 0x140 + .incbin "baserom_demo.gba", 0x9FD1B4, 0x0000140 gUnk_089FD2F4:: - .incbin "baserom_demo.gba", 0x9FD2F4, 0x845D + .incbin "baserom_demo.gba", 0x9FD2F4, 0x000845D gUnk_08A05751:: - .incbin "baserom_demo.gba", 0xA05751, 0x116e + .incbin "baserom_demo.gba", 0xA05751, 0x000116E gUnk_08A068BF:: - .incbin "baserom_demo.gba", 0xA068BF, 0x81 + .incbin "baserom_demo.gba", 0xA068BF, 0x0000081 .endif diff --git a/data/strings.s b/data/strings.s index 9f501e06..27dc11e2 100644 --- a/data/strings.s +++ b/data/strings.s @@ -12,7 +12,7 @@ translation:: @ 089B1D90 .incbin "baserom_demo_jp.gba", 0x9B1A28, 0x002BD90 .else .ifdef JP - .incbin "baserom_jp.gba", 0x9B1A30, 0x2BCC0 + .incbin "baserom_jp.gba", 0x9B1A30, 0x002BCC0 .else .ifdef EU .incbin "translations/English.bin"