From c83c3e60d373b29efef0688f622d061c6cde6a1b Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Fri, 5 Mar 2021 23:39:40 +0100 Subject: [PATCH] Split scripts at more useful places --- asm/macros/scripts.inc | 675 ++++ data/scripts.s | 3201 +++++++++++------ data/scripts/ezlo_angry.inc | 22 +- data/scripts/gUnk_08008B5C.inc | 121 +- data/scripts/gUnk_08008B90.inc | 17 - data/scripts/gUnk_08008BC0.inc | 35 - data/scripts/gUnk_08008C4E.inc | 12 - data/scripts/gUnk_08008C64.inc | 4 - data/scripts/gUnk_08008C6D.inc | 18 - data/scripts/gUnk_08008C7E.inc | 60 - data/scripts/gUnk_08008CB9.inc | 152 - data/scripts/gUnk_08008D8C.inc | 117 +- data/scripts/gUnk_08008DC0.inc | 19 - data/scripts/gUnk_08008E08.inc | 2 - data/scripts/gUnk_08008E0A.inc | 51 - data/scripts/gUnk_08008F0C.inc | 6 - data/scripts/gUnk_08008F16.inc | 6 - data/scripts/gUnk_08008F26.inc | 34 - data/scripts/gUnk_08008F74.inc | 19 + data/scripts/gUnk_08008F90.inc | 25 - data/scripts/gUnk_08008FC0.inc | 25 +- data/scripts/gUnk_08008FD1.inc | 44 - data/scripts/gUnk_08008FFC.inc | 13 + data/scripts/gUnk_08009008.inc | 7 - data/scripts/gUnk_0800901F.inc | 30 - data/scripts/gUnk_0800903C.inc | 208 ++ data/scripts/gUnk_08009080.inc | 27 - data/scripts/gUnk_080090DB.inc | 190 - data/scripts/gUnk_08009198.inc | 27 - data/scripts/gUnk_08009207.inc | 110 - data/scripts/gUnk_08009274.inc | 17 - data/scripts/gUnk_080092A8.inc | 17 - data/scripts/gUnk_080092D4.inc | 9 - data/scripts/gUnk_080092F0.inc | 9 - data/scripts/gUnk_08009308.inc | 7 - data/scripts/gUnk_08009320.inc | 2 +- data/scripts/gUnk_08009348.inc | 14 +- data/scripts/gUnk_08009393.inc | 35 - data/scripts/gUnk_0800939A.inc | 51 + data/scripts/gUnk_080093D7.inc | 25 - data/scripts/gUnk_08009407.inc | 128 - data/scripts/gUnk_08009464.inc | 28 + data/scripts/gUnk_08009486.inc | 10 - data/scripts/gUnk_080094A4.inc | 12 - data/scripts/gUnk_080094CC.inc | 16 +- data/scripts/gUnk_080094D7.inc | 38 - data/scripts/gUnk_080094FC.inc | 72 +- data/scripts/gUnk_08009503.inc | 6 - data/scripts/gUnk_08009508.inc | 16 - data/scripts/gUnk_08009538.inc | 19 - data/scripts/gUnk_08009574.inc | 23 - data/scripts/gUnk_080095CC.inc | 40 - data/scripts/gUnk_080095F2.inc | 73 + data/scripts/gUnk_0800962C.inc | 32 - data/scripts/gUnk_08009698.inc | 26 - data/scripts/gUnk_08009704.inc | 15 +- data/scripts/gUnk_08009706.inc | 30 - data/scripts/gUnk_08009740.inc | 31 +- data/scripts/gUnk_08009778.inc | 6 - data/scripts/gUnk_08009786.inc | 12 - data/scripts/gUnk_080097A1.inc | 80 - data/scripts/gUnk_080097F0.inc | 6 +- data/scripts/gUnk_08009838.inc | 52 +- data/scripts/gUnk_0800987C.inc | 20 + data/scripts/gUnk_080098D4.inc | 6 +- data/scripts/gUnk_08009918.inc | 9 +- data/scripts/gUnk_08009940.inc | 5 - data/scripts/gUnk_08009950.inc | 4 +- data/scripts/gUnk_080099DC.inc | 16 +- data/scripts/gUnk_08009A04.inc | 4 - data/scripts/gUnk_08009A07.inc | 38 - data/scripts/gUnk_08009A2C.inc | 5 - data/scripts/gUnk_08009A34.inc | 20 +- data/scripts/gUnk_08009A50.inc | 12 - data/scripts/gUnk_08009A77.inc | 6 - data/scripts/gUnk_08009A81.inc | 4 - data/scripts/gUnk_08009A84.inc | 14 +- data/scripts/gUnk_08009ABB.inc | 62 - data/scripts/gUnk_08009AF8.inc | 2 +- data/scripts/gUnk_08009B30.inc | 10 +- data/scripts/gUnk_08009B63.inc | 22 - data/scripts/gUnk_08009B78.inc | 21 +- data/scripts/gUnk_08009C68.inc | 46 +- data/scripts/gUnk_08009C7F.inc | 32 - data/scripts/gUnk_08009C9E.inc | 50 - .../{gUnk_08009D00.inc => gUnk_08009CFC.inc} | 4 +- data/scripts/gUnk_08009D6C.inc | 15 +- data/scripts/gUnk_08009D77.inc | 58 - data/scripts/gUnk_08009DB0.inc | 36 +- data/scripts/gUnk_08009DEC.inc | 20 - data/scripts/gUnk_08009E38.inc | 17 - .../{gUnk_0800DB0E.inc => gUnk_08009E4E.inc} | 2 +- data/scripts/gUnk_08009E58.inc | 6 +- .../{gUnk_08009318.inc => gUnk_08009E80.inc} | 2 +- data/scripts/gUnk_08009E88.inc | 15 +- data/scripts/gUnk_08009E9E.inc | 12 - data/scripts/gUnk_08009EA9.inc | 8 - data/scripts/gUnk_08009EB7.inc | 22 - data/scripts/gUnk_08009EF0.inc | 5 +- data/scripts/gUnk_08009F07.inc | 14 - data/scripts/gUnk_08009F14.inc | 124 +- data/scripts/gUnk_08009F39.inc | 58 - data/scripts/gUnk_08009F72.inc | 74 - data/scripts/gUnk_0800A064.inc | 10 - data/scripts/gUnk_0800A081.inc | 52 - data/scripts/gUnk_0800A0B4.inc | 4 +- data/scripts/gUnk_0800A0FC.inc | 33 + data/scripts/gUnk_0800A10A.inc | 6 - data/scripts/gUnk_0800A10F.inc | 22 - data/scripts/gUnk_0800A124.inc | 5 - data/scripts/gUnk_0800A134.inc | 65 - data/scripts/gUnk_0800A160.inc | 29 + data/scripts/gUnk_0800A1B4.inc | 7 +- data/scripts/gUnk_0800A1D8.inc | 82 +- data/scripts/gUnk_0800A224.inc | 13 - data/scripts/gUnk_0800A260.inc | 113 - data/scripts/gUnk_0800A310.inc | 53 + data/scripts/gUnk_0800A340.inc | 22 - data/scripts/gUnk_0800A3A3.inc | 4 - data/scripts/gUnk_0800A3A9.inc | 2 - data/scripts/gUnk_0800A3AA.inc | 24 - data/scripts/gUnk_0800A3D8.inc | 46 +- data/scripts/gUnk_0800A500.inc | 17 +- data/scripts/gUnk_0800A590.inc | 45 +- data/scripts/gUnk_0800A5A6.inc | 92 - data/scripts/gUnk_0800A638.inc | 15 + data/scripts/gUnk_0800A65C.inc | 8 +- data/scripts/gUnk_0800A67E.inc | 2 - data/scripts/gUnk_0800A680.inc | 7 +- data/scripts/gUnk_0800A6A4.inc | 17 +- data/scripts/gUnk_0800A6AB.inc | 42 - data/scripts/gUnk_0800A6D4.inc | 11 +- data/scripts/gUnk_0800A704.inc | 11 +- data/scripts/gUnk_0800A734.inc | 17 +- data/scripts/gUnk_0800A74A.inc | 7 - data/scripts/gUnk_0800A764.inc | 11 +- data/scripts/gUnk_0800A7E4.inc | 98 +- data/scripts/gUnk_0800A7E8.inc | 24 - data/scripts/gUnk_0800A816.inc | 6 - data/scripts/gUnk_0800A820.inc | 17 - data/scripts/gUnk_0800A85C.inc | 17 - data/scripts/gUnk_0800A898.inc | 17 - data/scripts/gUnk_0800A8D4.inc | 15 - data/scripts/gUnk_0800A908.inc | 4 - data/scripts/gUnk_0800A910.inc | 19 - data/scripts/gUnk_0800A964.inc | 2 +- data/scripts/gUnk_0800A988.inc | 2 +- data/scripts/gUnk_0800A9AC.inc | 2 +- data/scripts/gUnk_0800A9D0.inc | 2 +- data/scripts/gUnk_0800A9F4.inc | 27 +- data/scripts/gUnk_0800AA03.inc | 70 - data/scripts/gUnk_0800AA48.inc | 2 +- data/scripts/gUnk_0800AA6C.inc | 2 +- data/scripts/gUnk_0800AA90.inc | 2 +- data/scripts/gUnk_0800AAB4.inc | 2 +- data/scripts/gUnk_0800AAD8.inc | 11 +- data/scripts/gUnk_0800AB08.inc | 42 +- data/scripts/gUnk_0800AB23.inc | 23 - data/scripts/gUnk_0800AB4F.inc | 162 - data/scripts/gUnk_0800AB6E.inc | 92 + data/scripts/gUnk_0800ABF0.inc | 27 - data/scripts/gUnk_0800AC24.inc | 74 - data/scripts/gUnk_0800AC6D.inc | 37 - data/scripts/gUnk_0800ACB5.inc | 8 - data/scripts/gUnk_0800ACBC.inc | 135 +- data/scripts/gUnk_0800ACE0.inc | 25 - data/scripts/gUnk_0800AD74.inc | 15 - data/scripts/gUnk_0800ADA7.inc | 14 - data/scripts/gUnk_0800ADB4.inc | 121 - data/scripts/gUnk_0800AEDC.inc | 2 +- data/scripts/gUnk_0800AF18.inc | 7 +- data/scripts/gUnk_0800AF44.inc | 4 +- data/scripts/gUnk_0800AF68.inc | 8 +- data/scripts/gUnk_0800AF7E.inc | 8 - data/scripts/gUnk_0800AF8C.inc | 9 +- data/scripts/gUnk_0800AFA7.inc | 10 - data/scripts/gUnk_0800AFB0.inc | 6 +- data/scripts/gUnk_0800AFE8.inc | 4 +- data/scripts/gUnk_0800B00C.inc | 14 +- data/scripts/gUnk_0800B0AC.inc | 8 + data/scripts/gUnk_0800B0B0.inc | 9 - data/scripts/gUnk_0800B0D0.inc | 217 +- data/scripts/gUnk_0800B177.inc | 6 - data/scripts/gUnk_0800B17C.inc | 19 - data/scripts/gUnk_0800B1C0.inc | 2 +- data/scripts/gUnk_0800B200.inc | 4 +- data/scripts/gUnk_0800B254.inc | 41 +- data/scripts/gUnk_0800B284.inc | 16 - data/scripts/gUnk_0800B2B4.inc | 25 - data/scripts/gUnk_0800B308.inc | 34 +- data/scripts/gUnk_0800B322.inc | 5 - data/scripts/gUnk_0800B329.inc | 32 - data/scripts/gUnk_0800B348.inc | 7 - data/scripts/gUnk_0800B35C.inc | 6 - data/scripts/gUnk_0800B374.inc | 14 - data/scripts/gUnk_0800B3A4.inc | 66 +- data/scripts/gUnk_0800B40F.inc | 14 - data/scripts/gUnk_0800B41C.inc | 36 - data/scripts/gUnk_0800B4AC.inc | 20 +- data/scripts/gUnk_0800B508.inc | 4 - data/scripts/gUnk_0800B50F.inc | 62 - data/scripts/gUnk_0800B574.inc | 2 +- data/scripts/gUnk_0800B5C4.inc | 2 +- data/scripts/gUnk_0800B5EC.inc | 59 +- data/scripts/gUnk_0800B614.inc | 47 - data/scripts/gUnk_0800B6C8.inc | 95 +- data/scripts/gUnk_0800B708.inc | 8 - data/scripts/gUnk_0800B71F.inc | 18 - data/scripts/gUnk_0800B730.inc | 38 - data/scripts/gUnk_0800B7C4.inc | 95 - data/scripts/gUnk_0800B7FC.inc | 21 + data/scripts/gUnk_0800B828.inc | 128 + data/scripts/gUnk_0800B84F.inc | 10 - data/scripts/gUnk_0800B861.inc | 40 - data/scripts/gUnk_0800B888.inc | 9 - data/scripts/gUnk_0800B8A0.inc | 10 - data/scripts/gUnk_0800B8B8.inc | 12 - data/scripts/gUnk_0800B8E4.inc | 11 - data/scripts/gUnk_0800B906.inc | 7 - data/scripts/gUnk_0800B91C.inc | 26 - data/scripts/gUnk_0800B964.inc | 21 - data/scripts/gUnk_0800B9B4.inc | 125 +- data/scripts/gUnk_0800BA3C.inc | 19 - data/scripts/gUnk_0800BA78.inc | 22 - data/scripts/gUnk_0800BACC.inc | 4 +- data/scripts/gUnk_0800BB00.inc | 14 +- data/scripts/gUnk_0800BB08.inc | 6 - data/scripts/gUnk_0800BB1A.inc | 7 - data/scripts/gUnk_0800BB30.inc | 4 +- data/scripts/gUnk_0800BB64.inc | 13 +- data/scripts/gUnk_0800BB74.inc | 25 - data/scripts/gUnk_0800BBA4.inc | 6 +- data/scripts/gUnk_0800BBDB.inc | 2 - data/scripts/gUnk_0800BBDC.inc | 2 +- data/scripts/gUnk_0800BC08.inc | 14 +- data/scripts/gUnk_0800BC22.inc | 24 - data/scripts/gUnk_0800BC50.inc | 31 +- data/scripts/gUnk_0800BCAE.inc | 10 - data/scripts/gUnk_0800BCB7.inc | 8 - data/scripts/gUnk_0800BCBE.inc | 10 - data/scripts/gUnk_0800BCE8.inc | 31 +- data/scripts/gUnk_0800BD08.inc | 26 - data/scripts/gUnk_0800BD70.inc | 3 - data/scripts/gUnk_0800BD78.inc | 43 +- data/scripts/gUnk_0800BDAC.inc | 13 - data/scripts/gUnk_0800BDC4.inc | 45 - data/scripts/gUnk_0800BE1C.inc | 32 +- data/scripts/gUnk_0800BE54.inc | 31 - data/scripts/gUnk_0800BECC.inc | 20 +- data/scripts/gUnk_0800BF14.inc | 9 - data/scripts/gUnk_0800BF38.inc | 49 +- data/scripts/gUnk_0800BF4A.inc | 12 - data/scripts/gUnk_0800BF70.inc | 23 - data/scripts/gUnk_0800BFBF.inc | 18 - data/scripts/gUnk_0800BFE1.inc | 2 - data/scripts/gUnk_0800BFE3.inc | 34 - data/scripts/gUnk_0800C004.inc | 50 +- data/scripts/gUnk_0800C007.inc | 30 - data/scripts/gUnk_0800C024.inc | 24 - data/scripts/gUnk_0800C07B.inc | 54 - data/scripts/gUnk_0800C0B0.inc | 45 +- data/scripts/gUnk_0800C0C7.inc | 7 - data/scripts/gUnk_0800C0D3.inc | 22 - data/scripts/gUnk_0800C0E8.inc | 14 - data/scripts/gUnk_0800C113.inc | 27 - data/scripts/gUnk_0800C147.inc | 26 - data/scripts/gUnk_0800C160.inc | 11 +- data/scripts/gUnk_0800C1D8.inc | 43 +- data/scripts/gUnk_0800C204.inc | 4 - data/scripts/gUnk_0800C207.inc | 2 - data/scripts/gUnk_0800C208.inc | 5 - data/scripts/gUnk_0800C210.inc | 24 - data/scripts/gUnk_0800C263.inc | 66 - data/scripts/gUnk_0800C2A4.inc | 50 +- data/scripts/gUnk_0800C2A7.inc | 40 - data/scripts/gUnk_0800C2CE.inc | 66 - data/scripts/gUnk_0800C350.inc | 14 +- data/scripts/gUnk_0800C370.inc | 13 + data/scripts/gUnk_0800C396.inc | 28 - data/scripts/gUnk_0800C3B0.inc | 7 + data/scripts/gUnk_0800C3CC.inc | 25 +- data/scripts/gUnk_0800C408.inc | 5 - data/scripts/gUnk_0800C410.inc | 20 +- data/scripts/gUnk_0800C45C.inc | 2 +- data/scripts/gUnk_0800C4D0.inc | 14 +- data/scripts/gUnk_0800C4DB.inc | 50 - data/scripts/gUnk_0800C50C.inc | 17 +- data/scripts/gUnk_0800C521.inc | 48 - data/scripts/gUnk_0800C550.inc | 253 +- data/scripts/gUnk_0800C556.inc | 23 - data/scripts/gUnk_0800C584.inc | 9 - data/scripts/gUnk_0800C59A.inc | 15 - data/scripts/gUnk_0800C5C8.inc | 18 - data/scripts/gUnk_0800C5FC.inc | 3 - data/scripts/gUnk_0800C600.inc | 8 - data/scripts/gUnk_0800C607.inc | 46 - data/scripts/gUnk_0800C634.inc | 38 - data/scripts/gUnk_0800C6C6.inc | 48 - data/scripts/gUnk_0800C774.inc | 5 - data/scripts/gUnk_0800C779.inc | 144 - data/scripts/gUnk_0800C808.inc | 90 - data/scripts/gUnk_0800C861.inc | 80 - data/scripts/gUnk_0800C8B0.inc | 22 - data/scripts/gUnk_0800C8DA.inc | 6 - data/scripts/gUnk_0800C8F0.inc | 2 +- data/scripts/gUnk_0800C91C.inc | 76 +- data/scripts/gUnk_0800C931.inc | 26 - data/scripts/gUnk_0800C963.inc | 166 - data/scripts/gUnk_0800CA08.inc | 30 - data/scripts/gUnk_0800CA8C.inc | 6 +- data/scripts/gUnk_0800CAAA.inc | 10 - data/scripts/gUnk_0800CABC.inc | 22 +- data/scripts/gUnk_0800CB07.inc | 78 - data/scripts/gUnk_0800CB54.inc | 14 +- data/scripts/gUnk_0800CBA3.inc | 50 - data/scripts/gUnk_0800CBD4.inc | 24 +- data/scripts/gUnk_0800CC08.inc | 6 - data/scripts/gUnk_0800CC0D.inc | 54 - data/scripts/gUnk_0800CC42.inc | 22 - data/scripts/gUnk_0800CC6C.inc | 15 +- data/scripts/gUnk_0800CCCD.inc | 9 - data/scripts/gUnk_0800CCDD.inc | 40 - data/scripts/gUnk_0800CD04.inc | 27 +- data/scripts/gUnk_0800CD08.inc | 96 - data/scripts/gUnk_0800CD67.inc | 22 - data/scripts/gUnk_0800CD7C.inc | 258 +- data/scripts/gUnk_0800CE07.inc | 254 -- data/scripts/gUnk_0800CF04.inc | 8 - data/scripts/gUnk_0800CF16.inc | 16 - data/scripts/gUnk_0800CF4B.inc | 6 - data/scripts/gUnk_0800CF50.inc | 18 - data/scripts/gUnk_0800CF7B.inc | 14 - data/scripts/gUnk_0800CF88.inc | 5 - data/scripts/gUnk_0800CF95.inc | 11 - data/scripts/gUnk_0800CFA9.inc | 4 - data/scripts/gUnk_0800CFAC.inc | 31 - data/scripts/gUnk_0800D011.inc | 40 - data/scripts/gUnk_0800D05F.inc | 112 - data/scripts/gUnk_0800D0CE.inc | 20 - data/scripts/gUnk_0800D127.inc | 106 - data/scripts/gUnk_0800D190.inc | 10 - data/scripts/gUnk_0800D1B4.inc | 8 +- data/scripts/gUnk_0800D1C4.inc | 9 - data/scripts/gUnk_0800D1D4.inc | 7 - data/scripts/gUnk_0800D1E0.inc | 24 +- data/scripts/gUnk_0800D207.inc | 18 - data/scripts/gUnk_0800D218.inc | 9 - data/scripts/gUnk_0800D242.inc | 4 + data/scripts/gUnk_0800D24C.inc | 4 + data/scripts/gUnk_0800D278.inc | 91 +- data/scripts/gUnk_0800D2CE.inc | 15 - data/scripts/gUnk_0800D306.inc | 2 - data/scripts/gUnk_0800D308.inc | 7 - data/scripts/gUnk_0800D30F.inc | 66 - data/scripts/gUnk_0800D350.inc | 40 - data/scripts/gUnk_0800D414.inc | 164 +- data/scripts/gUnk_0800D44C.inc | 116 - data/scripts/gUnk_0800D4BF.inc | 30 - data/scripts/gUnk_0800D4DC.inc | 87 - data/scripts/gUnk_0800D59C.inc | 42 - data/scripts/gUnk_0800D5E5.inc | 40 - data/scripts/gUnk_0800D60C.inc | 9 - data/scripts/gUnk_0800D62B.inc | 138 - data/scripts/gUnk_0800D698.inc | 9 + data/scripts/gUnk_0800D6B4.inc | 9 +- data/scripts/gUnk_0800D6BA.inc | 7 - data/scripts/gUnk_0800D6F0.inc | 6 +- data/scripts/gUnk_0800D702.inc | 2 - data/scripts/gUnk_0800D703.inc | 14 - data/scripts/gUnk_0800D710.inc | 22 +- data/scripts/gUnk_0800D725.inc | 4 - data/scripts/gUnk_0800D728.inc | 17 - data/scripts/gUnk_0800D76C.inc | 41 +- data/scripts/gUnk_0800D7CF.inc | 14 - data/scripts/gUnk_0800D7DC.inc | 44 - data/scripts/gUnk_0800D84C.inc | 13 + data/scripts/gUnk_0800D874.inc | 28 +- data/scripts/gUnk_0800D8E4.inc | 11 - data/scripts/gUnk_0800D906.inc | 31 - .../{gUnk_0800D3EC.inc => gUnk_0800D92C.inc} | 9 +- data/scripts/gUnk_0800D954.inc | 38 +- data/scripts/gUnk_0800D97D.inc | 3 - data/scripts/gUnk_0800D981.inc | 73 - .../{gUnk_0800AD54.inc => gUnk_0800DA00.inc} | 10 +- data/scripts/gUnk_0800DA11.inc | 24 - data/scripts/gUnk_0800DA28.inc | 7 +- data/scripts/gUnk_0800DA4C.inc | 2 - data/scripts/gUnk_0800DA4D.inc | 20 - data/scripts/gUnk_0800DA60.inc | 39 +- data/scripts/gUnk_0800DB18.inc | 2 +- data/scripts/gUnk_0800DB28.inc | 14 +- data/scripts/gUnk_0800DB4A.inc | 12 - data/scripts/gUnk_0800DB78.inc | 56 +- data/scripts/gUnk_0800DB88.inc | 69 - data/scripts/gUnk_0800DC10.inc | 10 - data/scripts/gUnk_0800DC19.inc | 61 - data/scripts/gUnk_0800DC4C.inc | 31 + data/scripts/gUnk_0800DC91.inc | 28 - data/scripts/gUnk_0800DCAC.inc | 68 +- data/scripts/gUnk_0800DCDC.inc | 10 - data/scripts/gUnk_0800DD04.inc | 7 - data/scripts/gUnk_0800DD10.inc | 10 - data/scripts/gUnk_0800DD19.inc | 10 - data/scripts/gUnk_0800DD22.inc | 27 - data/scripts/gUnk_0800DD8D.inc | 30 - data/scripts/gUnk_0800DDAA.inc | 22 - data/scripts/gUnk_0800DDD0.inc | 17 + data/scripts/gUnk_0800DDE8.inc | 7 - data/scripts/gUnk_0800DDFC.inc | 3 - data/scripts/gUnk_0800DE00.inc | 40 +- data/scripts/gUnk_0800DE2C.inc | 10 + data/scripts/gUnk_0800DE50.inc | 14 + data/scripts/gUnk_0800DE78.inc | 6 +- data/scripts/gUnk_0800DEB0.inc | 2 +- data/scripts/gUnk_0800DED4.inc | 17 +- data/scripts/gUnk_0800DEF6.inc | 9 - data/scripts/gUnk_0800DF07.inc | 30 - data/scripts/gUnk_0800DF24.inc | 21 +- data/scripts/gUnk_0800DFB4.inc | 12 +- data/scripts/gUnk_0800DFD0.inc | 5 - data/scripts/gUnk_0800DFD7.inc | 8 - data/scripts/gUnk_0800DFDE.inc | 3 - data/scripts/gUnk_0800DFE4.inc | 25 +- data/scripts/gUnk_0800E050.inc | 24 +- data/scripts/gUnk_0800E094.inc | 11 + data/scripts/gUnk_0800E0BC.inc | 381 +- data/scripts/gUnk_0800E0F6.inc | 38 - data/scripts/gUnk_0800E140.inc | 8 - data/scripts/gUnk_0800E153.inc | 2 - data/scripts/gUnk_0800E154.inc | 31 - data/scripts/gUnk_0800E1C5.inc | 60 - data/scripts/gUnk_0800E200.inc | 64 - data/scripts/gUnk_0800E300.inc | 5 - data/scripts/gUnk_0800E305.inc | 2 - data/scripts/gUnk_0800E307.inc | 6 - data/scripts/gUnk_0800E30C.inc | 10 - data/scripts/gUnk_0800E329.inc | 40 - data/scripts/gUnk_0800E350.inc | 47 - data/scripts/gUnk_0800E3EE.inc | 6 - data/scripts/gUnk_0800E3F9.inc | 2 - data/scripts/gUnk_0800E3FA.inc | 2 - data/scripts/gUnk_0800E3FC.inc | 3 - data/scripts/gUnk_0800E400.inc | 5 - data/scripts/gUnk_0800E408.inc | 3 - data/scripts/gUnk_0800E40B.inc | 4 - data/scripts/gUnk_0800E411.inc | 32 - data/scripts/gUnk_0800E430.inc | 3 - data/scripts/gUnk_0800E434.inc | 17 - data/scripts/gUnk_0800E46C.inc | 11 - data/scripts/gUnk_0800E489.inc | 9 - data/scripts/gUnk_0800E499.inc | 12 - data/scripts/gUnk_0800E4A4.inc | 19 - data/scripts/gUnk_0800E4E3.inc | 34 - data/scripts/gUnk_0800E504.inc | 17 +- data/scripts/gUnk_0800E50C.inc | 15 - data/scripts/gUnk_0800E544.inc | 4 +- data/scripts/gUnk_0800E58C.inc | 2 +- data/scripts/gUnk_0800E5C4.inc | 21 - data/scripts/gUnk_0800E5D6.inc | 13 + data/scripts/gUnk_0800E600.inc | 10 +- data/scripts/gUnk_0800E60E.inc | 16 - data/scripts/gUnk_0800E62C.inc | 6 +- data/scripts/gUnk_0800E658.inc | 6 +- data/scripts/gUnk_0800E684.inc | 6 +- data/scripts/gUnk_0800E6B0.inc | 167 +- data/scripts/gUnk_0800E6E8.inc | 12 - data/scripts/gUnk_0800E707.inc | 4 - data/scripts/gUnk_0800E70A.inc | 15 - data/scripts/gUnk_0800E734.inc | 15 - data/scripts/gUnk_0800E760.inc | 33 - data/scripts/gUnk_0800E7D9.inc | 28 - data/scripts/gUnk_0800E7F4.inc | 4 - data/scripts/gUnk_0800E7FA.inc | 39 - data/scripts/gUnk_0800E823.inc | 2 - data/scripts/gUnk_0800E824.inc | 133 - data/scripts/gUnk_0800E8A4.inc | 19 + data/scripts/gUnk_0800E8D6.inc | 19 + data/scripts/gUnk_0800E8DB.inc | 70 - data/scripts/gUnk_0800E908.inc | 75 + data/scripts/gUnk_0800E920.inc | 20 - data/scripts/gUnk_0800E964.inc | 31 - data/scripts/gUnk_0800E9D6.inc | 11 - data/scripts/gUnk_0800EA1C.inc | 2 +- data/scripts/gUnk_0800EA54.inc | 358 +- data/scripts/gUnk_0800EAA4.inc | 21 - data/scripts/gUnk_0800EAEB.inc | 14 - data/scripts/gUnk_0800EAF8.inc | 17 - data/scripts/gUnk_0800EB2C.inc | 17 - data/scripts/gUnk_0800EB64.inc | 26 - data/scripts/gUnk_0800EBC0.inc | 9 - data/scripts/gUnk_0800EBDC.inc | 3 - data/scripts/gUnk_0800EBE0.inc | 9 - data/scripts/gUnk_0800EBF0.inc | 9 - data/scripts/gUnk_0800EC08.inc | 5 - data/scripts/gUnk_0800EC14.inc | 19 - data/scripts/gUnk_0800EC54.inc | 5 - data/scripts/gUnk_0800EC61.inc | 44 - data/scripts/gUnk_0800EC8C.inc | 26 - data/scripts/gUnk_0800ECF1.inc | 20 - data/scripts/gUnk_0800ED04.inc | 5 - data/scripts/gUnk_0800ED0C.inc | 2 - data/scripts/gUnk_0800ED0D.inc | 80 - data/scripts/gUnk_0800ED5C.inc | 17 - data/scripts/gUnk_0800ED90.inc | 22 - data/scripts/gUnk_0800EDD9.inc | 8 - data/scripts/gUnk_0800EDE0.inc | 42 - data/scripts/gUnk_0800EE09.inc | 72 - data/scripts/gUnk_0800EE50.inc | 19 - data/scripts/gUnk_0800EE8C.inc | 21 - data/scripts/gUnk_0800EEE0.inc | 30 - data/scripts/gUnk_0800EEFD.inc | 6 - data/scripts/gUnk_0800EF07.inc | 12 - data/scripts/gUnk_0800EF12.inc | 24 - data/scripts/gUnk_0800EF40.inc | 6 +- data/scripts/gUnk_0800EF93.inc | 46 - data/scripts/gUnk_0800EF9C.inc | 11 + data/scripts/gUnk_0800EFC0.inc | 126 +- data/scripts/gUnk_0800EFE0.inc | 3 - data/scripts/gUnk_0800EFE4.inc | 87 - data/scripts/gUnk_0800F090.inc | 3 - data/scripts/gUnk_0800F094.inc | 34 - data/scripts/gUnk_0800F0D6.inc | 7 - data/scripts/gUnk_0800F0E2.inc | 6 - data/scripts/gUnk_0800F0F2.inc | 2 - data/scripts/gUnk_0800F0F3.inc | 2 - data/scripts/gUnk_0800F0F4.inc | 45 - data/scripts/gUnk_0800F14C.inc | 2 +- data/scripts/gUnk_0800F184.inc | 128 +- data/scripts/gUnk_0800F1DE.inc | 4 - data/scripts/gUnk_0800F1E1.inc | 3 - data/scripts/gUnk_0800F1E5.inc | 2 - data/scripts/gUnk_0800F1E7.inc | 4 - data/scripts/gUnk_0800F1ED.inc | 8 - data/scripts/gUnk_0800F1FB.inc | 2 - data/scripts/gUnk_0800F1FD.inc | 4 - data/scripts/gUnk_0800F203.inc | 3 - data/scripts/gUnk_0800F207.inc | 10 - data/scripts/gUnk_0800F210.inc | 53 - data/scripts/gUnk_0800F2EB.inc | 6 - data/scripts/gUnk_0800F2F0.inc | 2 - data/scripts/gUnk_0800F2F2.inc | 8 - data/scripts/gUnk_0800F303.inc | 154 - data/scripts/gUnk_0800F33C.inc | 7 + data/scripts/gUnk_0800F354.inc | 7 + data/scripts/gUnk_0800F36C.inc | 7 + data/scripts/gUnk_0800F384.inc | 7 + data/scripts/gUnk_0800F39C.inc | 30 +- data/scripts/gUnk_0800F3DB.inc | 6 - data/scripts/gUnk_0800F3E5.inc | 2 - data/scripts/gUnk_0800F3E6.inc | 2 - data/scripts/gUnk_0800F3E8.inc | 4 - data/scripts/gUnk_0800F3EB.inc | 2 - data/scripts/gUnk_0800F3ED.inc | 5 - data/scripts/gUnk_0800F3F5.inc | 3 - data/scripts/gUnk_0800F3F9.inc | 8 - data/scripts/gUnk_0800F400.inc | 5 - data/scripts/gUnk_0800F408.inc | 2 - data/scripts/gUnk_0800F409.inc | 8 - data/scripts/gUnk_0800F410.inc | 12 - data/scripts/gUnk_0800F426.inc | 6 - data/scripts/gUnk_0800F430.inc | 2 +- data/scripts/gUnk_0800F4C4.inc | 33 +- data/scripts/gUnk_0800F4EA.inc | 2 - data/scripts/gUnk_0800F4EB.inc | 3 - data/scripts/gUnk_0800F4EF.inc | 2 - data/scripts/gUnk_0800F4F0.inc | 2 - data/scripts/gUnk_0800F4F1.inc | 2 - data/scripts/gUnk_0800F4F3.inc | 3 - data/scripts/gUnk_0800F4F7.inc | 2 - data/scripts/gUnk_0800F4F9.inc | 5 - data/scripts/gUnk_0800F501.inc | 14 - data/scripts/gUnk_0800F50E.inc | 22 - data/scripts/gUnk_0800F554.inc | 154 +- data/scripts/gUnk_0800F584.inc | 7 - data/scripts/gUnk_0800F58F.inc | 34 - data/scripts/gUnk_0800F5B0.inc | 18 - data/scripts/gUnk_0800F5E9.inc | 4 - data/scripts/gUnk_0800F5EC.inc | 2 - data/scripts/gUnk_0800F5ED.inc | 2 - data/scripts/gUnk_0800F5EE.inc | 2 - data/scripts/gUnk_0800F5EF.inc | 2 - data/scripts/gUnk_0800F5F0.inc | 2 - data/scripts/gUnk_0800F5F2.inc | 2 - data/scripts/gUnk_0800F5F4.inc | 5 - data/scripts/gUnk_0800F5FC.inc | 4 - data/scripts/gUnk_0800F5FF.inc | 8 - data/scripts/gUnk_0800F606.inc | 2 - data/scripts/gUnk_0800F607.inc | 2 - data/scripts/gUnk_0800F608.inc | 2 - data/scripts/gUnk_0800F60A.inc | 10 - data/scripts/gUnk_0800F628.inc | 15 - data/scripts/gUnk_0800F650.inc | 19 - data/scripts/gUnk_0800F688.inc | 8 - data/scripts/gUnk_0800F6A0.inc | 12 - data/scripts/gUnk_0800F6C8.inc | 7 - data/scripts/gUnk_0800F6E0.inc | 5 - data/scripts/gUnk_0800F6E9.inc | 4 - data/scripts/gUnk_0800F6EC.inc | 2 - data/scripts/gUnk_0800F6ED.inc | 2 - data/scripts/gUnk_0800F6EE.inc | 2 - data/scripts/gUnk_0800F6EF.inc | 2 - data/scripts/gUnk_0800F6F0.inc | 2 - data/scripts/gUnk_0800F6F1.inc | 2 - data/scripts/gUnk_0800F6F2.inc | 2 - data/scripts/gUnk_0800F6F3.inc | 2 - data/scripts/gUnk_0800F6F4.inc | 3 - data/scripts/gUnk_0800F6F9.inc | 6 - data/scripts/gUnk_0800F6FE.inc | 3 - data/scripts/gUnk_0800F702.inc | 3 - data/scripts/gUnk_0800F706.inc | 9 - data/scripts/gUnk_0800F71E.inc | 3 - data/scripts/gUnk_0800F724.inc | 234 +- data/scripts/gUnk_0800F734.inc | 4 - data/scripts/gUnk_0800F73C.inc | 37 - data/scripts/gUnk_0800F7E6.inc | 6 - data/scripts/gUnk_0800F7EB.inc | 4 - data/scripts/gUnk_0800F7EE.inc | 2 - data/scripts/gUnk_0800F7EF.inc | 2 - data/scripts/gUnk_0800F7F0.inc | 3 - data/scripts/gUnk_0800F7F4.inc | 2 - data/scripts/gUnk_0800F7F5.inc | 2 - data/scripts/gUnk_0800F7F7.inc | 6 - data/scripts/gUnk_0800F7FC.inc | 2 - data/scripts/gUnk_0800F7FD.inc | 2 - data/scripts/gUnk_0800F7FF.inc | 2 - data/scripts/gUnk_0800F800.inc | 6 - data/scripts/gUnk_0800F805.inc | 4 - data/scripts/gUnk_0800F808.inc | 232 -- data/scripts/gUnk_0800F8EF.inc | 2 - data/scripts/gUnk_0800F8F0.inc | 2 - data/scripts/gUnk_0800F8F1.inc | 2 - data/scripts/gUnk_0800F8F2.inc | 2 - data/scripts/gUnk_0800F8F3.inc | 2 - data/scripts/gUnk_0800F8F4.inc | 2 - data/scripts/gUnk_0800F8F5.inc | 4 - data/scripts/gUnk_0800F8F8.inc | 2 - data/scripts/gUnk_0800F8F9.inc | 8 - data/scripts/gUnk_0800F900.inc | 2 - data/scripts/gUnk_0800F902.inc | 10 - data/scripts/gUnk_0800F916.inc | 49 - data/scripts/gUnk_0800F9F0.inc | 2 - data/scripts/gUnk_0800F9F2.inc | 2 - data/scripts/gUnk_0800F9F3.inc | 2 - data/scripts/gUnk_0800F9F4.inc | 2 - data/scripts/gUnk_0800F9F6.inc | 2 - data/scripts/gUnk_0800F9F7.inc | 2 - data/scripts/gUnk_0800F9F8.inc | 6 - data/scripts/gUnk_0800FA02.inc | 3 - data/scripts/gUnk_0800FA07.inc | 2 - data/scripts/gUnk_0800FA08.inc | 2 - data/scripts/gUnk_0800FA09.inc | 3 - data/scripts/gUnk_0800FA0D.inc | 108 - data/scripts/gUnk_0800FA54.inc | 10 + data/scripts/gUnk_0800FA78.inc | 20 +- .../{gUnk_0801635C.inc => gUnk_0800FA9C.inc} | 9 +- data/scripts/gUnk_0800FAC0.inc | 2 +- data/scripts/gUnk_0800FAE4.inc | 27 +- data/scripts/gUnk_0800FAF3.inc | 2 - data/scripts/gUnk_0800FAF5.inc | 2 - data/scripts/gUnk_0800FAF6.inc | 2 - data/scripts/gUnk_0800FAF7.inc | 2 - data/scripts/gUnk_0800FAF8.inc | 6 - data/scripts/gUnk_0800FAFD.inc | 2 - data/scripts/gUnk_0800FAFE.inc | 2 - data/scripts/gUnk_0800FAFF.inc | 2 - data/scripts/gUnk_0800FB00.inc | 2 - data/scripts/gUnk_0800FB01.inc | 2 - data/scripts/gUnk_0800FB02.inc | 2 - data/scripts/gUnk_0800FB04.inc | 3 - data/scripts/gUnk_0800FB08.inc | 2 - data/scripts/gUnk_0800FB0A.inc | 40 - data/scripts/gUnk_0800FB2C.inc | 7 + data/scripts/gUnk_0800FB31.inc | 20 - data/scripts/gUnk_0800FB44.inc | 79 +- data/scripts/gUnk_0800FBBB.inc | 54 - data/scripts/gUnk_0800FBF0.inc | 4 - data/scripts/gUnk_0800FBF3.inc | 2 - data/scripts/gUnk_0800FBF5.inc | 2 - data/scripts/gUnk_0800FBF6.inc | 2 - data/scripts/gUnk_0800FBF8.inc | 2 - data/scripts/gUnk_0800FBF9.inc | 2 - data/scripts/gUnk_0800FBFA.inc | 2 - data/scripts/gUnk_0800FBFB.inc | 2 - data/scripts/gUnk_0800FBFC.inc | 4 - data/scripts/gUnk_0800FBFF.inc | 2 - data/scripts/gUnk_0800FC00.inc | 2 - data/scripts/gUnk_0800FC01.inc | 3 - data/scripts/gUnk_0800FC05.inc | 2 - data/scripts/gUnk_0800FC06.inc | 2 - data/scripts/gUnk_0800FC08.inc | 2 - data/scripts/gUnk_0800FC09.inc | 6 - data/scripts/gUnk_0800FC0E.inc | 12 - data/scripts/gUnk_0800FC24.inc | 44 - data/scripts/gUnk_0800FCEA.inc | 3 - data/scripts/gUnk_0800FCEE.inc | 3 - data/scripts/gUnk_0800FCF2.inc | 2 - data/scripts/gUnk_0800FCF3.inc | 2 - data/scripts/gUnk_0800FCF5.inc | 2 - data/scripts/gUnk_0800FCF7.inc | 2 - data/scripts/gUnk_0800FCF8.inc | 2 - data/scripts/gUnk_0800FCFA.inc | 2 - data/scripts/gUnk_0800FCFB.inc | 2 - data/scripts/gUnk_0800FCFC.inc | 2 - data/scripts/gUnk_0800FCFE.inc | 2 - data/scripts/gUnk_0800FCFF.inc | 2 - data/scripts/gUnk_0800FD00.inc | 2 - data/scripts/gUnk_0800FD01.inc | 4 - data/scripts/gUnk_0800FD04.inc | 2 - data/scripts/gUnk_0800FD05.inc | 8 - data/scripts/gUnk_0800FD0C.inc | 39 +- data/scripts/gUnk_0800FD16.inc | 12 - data/scripts/gUnk_0800FD21.inc | 96 - data/scripts/gUnk_0800FD80.inc | 9 - data/scripts/gUnk_0800FDA0.inc | 101 +- data/scripts/gUnk_0800FDCC.inc | 12 - data/scripts/gUnk_0800FDF2.inc | 2 - data/scripts/gUnk_0800FDF3.inc | 8 - data/scripts/gUnk_0800FDFA.inc | 2 - data/scripts/gUnk_0800FDFC.inc | 2 - data/scripts/gUnk_0800FDFE.inc | 2 - data/scripts/gUnk_0800FDFF.inc | 2 - data/scripts/gUnk_0800FE00.inc | 2 - data/scripts/gUnk_0800FE01.inc | 2 - data/scripts/gUnk_0800FE02.inc | 2 - data/scripts/gUnk_0800FE04.inc | 2 - data/scripts/gUnk_0800FE06.inc | 2 - data/scripts/gUnk_0800FE07.inc | 2 - data/scripts/gUnk_0800FE08.inc | 2 - data/scripts/gUnk_0800FE09.inc | 56 - data/scripts/gUnk_0800FE40.inc | 3 - data/scripts/gUnk_0800FE44.inc | 11 - data/scripts/gUnk_0800FE64.inc | 12 - data/scripts/gUnk_0800FE88.inc | 14 - data/scripts/gUnk_0800FEBC.inc | 16 - data/scripts/gUnk_0800FEF0.inc | 2 - data/scripts/gUnk_0800FEF2.inc | 8 - data/scripts/gUnk_0800FEF9.inc | 4 - data/scripts/gUnk_0800FEFC.inc | 2 - data/scripts/gUnk_0800FEFE.inc | 4 - data/scripts/gUnk_0800FF01.inc | 2 - data/scripts/gUnk_0800FF03.inc | 2 - data/scripts/gUnk_0800FF04.inc | 2 - data/scripts/gUnk_0800FF05.inc | 2 - data/scripts/gUnk_0800FF06.inc | 2 - data/scripts/gUnk_0800FF08.inc | 6 - data/scripts/gUnk_0800FF18.inc | 31 +- data/scripts/gUnk_0800FF2A.inc | 38 - data/scripts/gUnk_0800FF74.inc | 121 +- data/scripts/gUnk_0800FFB0.inc | 4 - data/scripts/gUnk_0800FFBB.inc | 28 - data/scripts/gUnk_0800FFD6.inc | 13 - data/scripts/gUnk_0800FFEE.inc | 4 - data/scripts/gUnk_0800FFF6.inc | 4 - data/scripts/gUnk_0800FFFC.inc | 2 - data/scripts/gUnk_0800FFFD.inc | 2 - data/scripts/gUnk_0800FFFF.inc | 2 - data/scripts/gUnk_08010000.inc | 2 - data/scripts/gUnk_08010001.inc | 2 - data/scripts/gUnk_08010002.inc | 2 - data/scripts/gUnk_08010003.inc | 2 - data/scripts/gUnk_08010005.inc | 2 - data/scripts/gUnk_08010007.inc | 2 - data/scripts/gUnk_08010008.inc | 2 - data/scripts/gUnk_08010009.inc | 2 - data/scripts/gUnk_0801000A.inc | 2 - data/scripts/gUnk_0801000C.inc | 2 - data/scripts/gUnk_0801000D.inc | 2 - data/scripts/gUnk_0801000E.inc | 2 - data/scripts/gUnk_0801000F.inc | 10 - data/scripts/gUnk_08010018.inc | 4 - data/scripts/gUnk_0801001B.inc | 2 - data/scripts/gUnk_0801001D.inc | 4 - data/scripts/gUnk_08010023.inc | 34 - data/scripts/gUnk_08010044.inc | 27 - data/scripts/gUnk_08010098.inc | 2 - data/scripts/gUnk_08010099.inc | 21 - data/scripts/gUnk_080100C1.inc | 8 - data/scripts/gUnk_080100C8.inc | 128 +- data/scripts/gUnk_080100F5.inc | 8 - data/scripts/gUnk_080100FC.inc | 2 - data/scripts/gUnk_080100FE.inc | 2 - data/scripts/gUnk_080100FF.inc | 2 - data/scripts/gUnk_08010100.inc | 2 - data/scripts/gUnk_08010102.inc | 2 - data/scripts/gUnk_08010103.inc | 2 - data/scripts/gUnk_08010105.inc | 2 - data/scripts/gUnk_08010106.inc | 3 - data/scripts/gUnk_0801010A.inc | 4 - data/scripts/gUnk_08010111.inc | 16 - data/scripts/gUnk_08010120.inc | 7 - data/scripts/gUnk_08010130.inc | 11 - data/scripts/gUnk_08010148.inc | 47 - data/scripts/gUnk_080101FA.inc | 4 - data/scripts/gUnk_080101FD.inc | 2 - data/scripts/gUnk_080101FF.inc | 2 - data/scripts/gUnk_08010200.inc | 4 - data/scripts/gUnk_08010203.inc | 3 - data/scripts/gUnk_08010207.inc | 2 - data/scripts/gUnk_08010208.inc | 3 - data/scripts/gUnk_0801020C.inc | 11 - data/scripts/gUnk_08010220.inc | 12 - data/scripts/gUnk_08010236.inc | 24 - data/scripts/gUnk_08010264.inc | 545 ++- data/scripts/gUnk_08010294.inc | 24 - data/scripts/gUnk_080102E0.inc | 10 - data/scripts/gUnk_080102FB.inc | 2 - data/scripts/gUnk_080102FD.inc | 2 - data/scripts/gUnk_080102FE.inc | 6 - data/scripts/gUnk_08010303.inc | 2 - data/scripts/gUnk_08010304.inc | 2 - data/scripts/gUnk_08010305.inc | 6 - data/scripts/gUnk_0801030A.inc | 2 - data/scripts/gUnk_0801030C.inc | 8 - data/scripts/gUnk_08010320.inc | 72 - data/scripts/gUnk_080103B0.inc | 10 - data/scripts/gUnk_080103D0.inc | 11 - data/scripts/gUnk_080103F8.inc | 4 - data/scripts/gUnk_080103FD.inc | 4 - data/scripts/gUnk_08010400.inc | 3 - data/scripts/gUnk_08010406.inc | 2 - data/scripts/gUnk_08010407.inc | 4 - data/scripts/gUnk_0801040A.inc | 16 - data/scripts/gUnk_08010428.inc | 13 - data/scripts/gUnk_08010454.inc | 15 - data/scripts/gUnk_08010480.inc | 17 - data/scripts/gUnk_080104A0.inc | 20 - data/scripts/gUnk_080104EC.inc | 10 - data/scripts/gUnk_080104FF.inc | 2 - data/scripts/gUnk_08010501.inc | 2 - data/scripts/gUnk_08010502.inc | 2 - data/scripts/gUnk_08010503.inc | 8 - data/scripts/gUnk_0801050A.inc | 2 - data/scripts/gUnk_0801050B.inc | 28 - data/scripts/gUnk_08010526.inc | 122 - data/scripts/gUnk_0801059F.inc | 22 - data/scripts/gUnk_080105C9.inc | 26 - data/scripts/gUnk_080105FB.inc | 3 - data/scripts/gUnk_080105FF.inc | 2 - data/scripts/gUnk_08010600.inc | 5 - data/scripts/gUnk_0801060A.inc | 3 - data/scripts/gUnk_0801060D.inc | 6 - data/scripts/gUnk_08010617.inc | 6 - data/scripts/gUnk_0801061C.inc | 14 - data/scripts/gUnk_08010644.inc | 5 - data/scripts/gUnk_08010650.inc | 17 - data/scripts/gUnk_08010674.inc | 25 - data/scripts/gUnk_080106AC.inc | 36 - data/scripts/gUnk_08010700.inc | 2 - data/scripts/gUnk_08010701.inc | 3 - data/scripts/gUnk_08010705.inc | 10 - data/scripts/gUnk_0801070E.inc | 12 - data/scripts/gUnk_08010734.inc | 31 - data/scripts/gUnk_08010794.inc | 19 - data/scripts/gUnk_080107D0.inc | 18 - data/scripts/gUnk_0801080A.inc | 2 - data/scripts/gUnk_0801080B.inc | 6 - data/scripts/gUnk_08010815.inc | 4 - data/scripts/gUnk_0801081B.inc | 182 - data/scripts/gUnk_080108D0.inc | 12 - data/scripts/gUnk_080108FF.inc | 14 - data/scripts/gUnk_0801090C.inc | 3 - data/scripts/gUnk_0801090F.inc | 5 - data/scripts/gUnk_08010917.inc | 78 - data/scripts/gUnk_08010964.inc | 30 +- data/scripts/gUnk_080109A0.inc | 22 - data/scripts/gUnk_080109F0.inc | 11 +- data/scripts/gUnk_080109F6.inc | 9 - data/scripts/gUnk_08010A14.inc | 10 +- data/scripts/gUnk_08010A1F.inc | 26 - data/scripts/gUnk_08010A38.inc | 2 +- data/scripts/gUnk_08010A5C.inc | 8 +- data/scripts/gUnk_08010A98.inc | 75 +- data/scripts/gUnk_08010AE4.inc | 12 - data/scripts/gUnk_08010B04.inc | 27 - data/scripts/gUnk_08010B68.inc | 4 +- data/scripts/gUnk_08010BB4.inc | 164 +- data/scripts/gUnk_08010BEC.inc | 8 - data/scripts/gUnk_08010BF9.inc | 6 - data/scripts/gUnk_08010BFE.inc | 15 - data/scripts/gUnk_08010C1A.inc | 53 - data/scripts/gUnk_08010D03.inc | 254 -- data/scripts/gUnk_08010E00.inc | 14 - data/scripts/gUnk_08010E0D.inc | 244 -- data/scripts/gUnk_08010E5A.inc | 101 + data/scripts/gUnk_08010F00.inc | 256 -- data/scripts/gUnk_08010F84.inc | 83 + data/scripts/gUnk_08010FFF.inc | 2 - data/scripts/gUnk_08011000.inc | 2 - data/scripts/gUnk_08011001.inc | 16 - data/scripts/gUnk_0801101F.inc | 86 - data/scripts/gUnk_08011074.inc | 6 +- data/scripts/gUnk_08011083.inc | 90 - data/scripts/gUnk_08011098.inc | 9 + data/scripts/gUnk_080110BC.inc | 12 + data/scripts/gUnk_080110DC.inc | 7 - data/scripts/gUnk_080110E8.inc | 8 +- data/scripts/gUnk_08011128.inc | 2 +- data/scripts/gUnk_080111CC.inc | 48 +- data/scripts/gUnk_08011208.inc | 22 - data/scripts/gUnk_0801121D.inc | 168 - data/scripts/gUnk_080112C4.inc | 52 +- data/scripts/gUnk_0801130F.inc | 26 - data/scripts/gUnk_08011328.inc | 119 - data/scripts/gUnk_080113AA.inc | 34 + data/scripts/gUnk_08011403.inc | 462 --- data/scripts/gUnk_08011442.inc | 43 + data/scripts/gUnk_08011508.inc | 44 + data/scripts/gUnk_08011640.inc | 4 +- data/scripts/gUnk_080116A8.inc | 37 +- data/scripts/gUnk_08011809.inc | 52 - data/scripts/gUnk_0801183C.inc | 38 +- data/scripts/gUnk_08011890.inc | 16 + data/scripts/gUnk_080118D4.inc | 8 +- data/scripts/gUnk_08011930.inc | 2 +- data/scripts/gUnk_0801194C.inc | 188 + data/scripts/gUnk_08011958.inc | 5 - data/scripts/gUnk_08011964.inc | 22 - data/scripts/gUnk_080119B0.inc | 11 - data/scripts/gUnk_080119D8.inc | 5 - data/scripts/gUnk_080119E4.inc | 5 - data/scripts/gUnk_080119F0.inc | 9 - data/scripts/gUnk_08011A04.inc | 21 - data/scripts/gUnk_08011A2C.inc | 17 - data/scripts/gUnk_08011A64.inc | 47 - data/scripts/gUnk_08011AE4.inc | 9 - data/scripts/gUnk_08011B04.inc | 15 - data/scripts/gUnk_08011B20.inc | 9 +- data/scripts/gUnk_08011B40.inc | 54 +- data/scripts/gUnk_08011BE4.inc | 11 - data/scripts/gUnk_08011C04.inc | 22 - data/scripts/gUnk_08011C50.inc | 7 +- data/scripts/gUnk_08011C7C.inc | 471 ++- data/scripts/gUnk_08011D28.inc | 56 - data/scripts/gUnk_08011DD4.inc | 17 - data/scripts/gUnk_08011E04.inc | 63 - data/scripts/gUnk_08011E80.inc | 45 - data/scripts/gUnk_08011F0C.inc | 45 - data/scripts/gUnk_08011F98.inc | 45 - data/scripts/gUnk_08012024.inc | 34 - data/scripts/gUnk_08012091.inc | 32 - data/scripts/gUnk_080120B0.inc | 21 - data/scripts/gUnk_080120ED.inc | 8 - data/scripts/gUnk_080120FB.inc | 66 - data/scripts/gUnk_0801213C.inc | 42 - data/scripts/gUnk_080121C8.inc | 19 - data/scripts/gUnk_08012200.inc | 19 - data/scripts/gUnk_08012238.inc | 19 - data/scripts/gUnk_08012270.inc | 57 - data/scripts/gUnk_0801232C.inc | 56 +- data/scripts/gUnk_08012360.inc | 50 - data/scripts/gUnk_08012410.inc | 2 +- data/scripts/gUnk_08012430.inc | 145 +- data/scripts/gUnk_08012480.inc | 132 - data/scripts/gUnk_080126FC.inc | 293 ++ data/scripts/gUnk_08012AB0.inc | 121 +- data/scripts/gUnk_08012AF0.inc | 11 + data/scripts/gUnk_08012B18.inc | 4 + data/scripts/gUnk_08012B24.inc | 16 + data/scripts/gUnk_08012B50.inc | 16 + data/scripts/gUnk_08012B7C.inc | 16 + data/scripts/gUnk_08012BF8.inc | 16 +- data/scripts/gUnk_08012C0C.inc | 31 - data/scripts/gUnk_08012C48.inc | 24 - data/scripts/gUnk_08012C68.inc | 34 + data/scripts/gUnk_08012C98.inc | 19 - data/scripts/gUnk_08012CD8.inc | 4 +- data/scripts/gUnk_08012D18.inc | 6 +- data/scripts/gUnk_08012D70.inc | 10 +- data/scripts/gUnk_08012DA1.inc | 16 - data/scripts/gUnk_08012DB0.inc | 2 +- data/scripts/gUnk_08012DD8.inc | 20 - data/scripts/gUnk_08012DF8.inc | 12 + data/scripts/gUnk_08012E88.inc | 75 +- data/scripts/gUnk_08012EC0.inc | 19 - data/scripts/gUnk_08012F0C.inc | 155 - data/scripts/gUnk_08012F86.inc | 114 + data/scripts/gUnk_08013001.inc | 2 - data/scripts/gUnk_08013003.inc | 5 - data/scripts/gUnk_0801300B.inc | 50 - data/scripts/gUnk_0801303C.inc | 27 - data/scripts/gUnk_08013070.inc | 9 - data/scripts/gUnk_08013081.inc | 16 - data/scripts/gUnk_08013090.inc | 36 - data/scripts/gUnk_08013114.inc | 38 +- data/scripts/gUnk_08013188.inc | 16 - .../{gUnk_080131AC.inc => gUnk_0801319A.inc} | 41 +- data/scripts/gUnk_080132E4.inc | 20 +- data/scripts/gUnk_0801330C.inc | 11 + data/scripts/gUnk_08013330.inc | 2 +- data/scripts/gUnk_0801334C.inc | 2 +- data/scripts/gUnk_08013378.inc | 12 +- data/scripts/gUnk_080133C4.inc | 4 +- data/scripts/gUnk_080133F8.inc | 49 +- data/scripts/gUnk_08013494.inc | 18 + data/scripts/gUnk_080134DC.inc | 146 +- data/scripts/gUnk_08013650.inc | 28 + data/scripts/gUnk_080136B4.inc | 10 + data/scripts/gUnk_080136D8.inc | 31 +- data/scripts/gUnk_08013720.inc | 133 +- data/scripts/gUnk_080137DA.inc | 110 - data/scripts/gUnk_080138B4.inc | 181 +- data/scripts/gUnk_08013AA6.inc | 33 + data/scripts/gUnk_08013B18.inc | 29 +- data/scripts/gUnk_08013B70.inc | 12 - data/scripts/gUnk_08013BA8.inc | 20 +- data/scripts/gUnk_08013BE8.inc | 16 +- data/scripts/gUnk_08013CA4.inc | 140 +- data/scripts/gUnk_08013D04.inc | 25 + data/scripts/gUnk_08013D44.inc | 25 + data/scripts/gUnk_08013D84.inc | 25 + data/scripts/gUnk_08013DC4.inc | 25 + data/scripts/gUnk_08013E04.inc | 18 - data/scripts/gUnk_08013E28.inc | 11 + data/scripts/gUnk_08013E94.inc | 2 +- data/scripts/gUnk_08013EB0.inc | 2 +- data/scripts/gUnk_08013ECC.inc | 2 +- data/scripts/gUnk_08013EE8.inc | 2 +- data/scripts/gUnk_08013F04.inc | 2 +- data/scripts/gUnk_08013F34.inc | 2 +- data/scripts/gUnk_08013F64.inc | 2 +- data/scripts/gUnk_08013F94.inc | 6 +- data/scripts/gUnk_08013FE8.inc | 13 +- data/scripts/gUnk_08014054.inc | 2 +- data/scripts/gUnk_08014074.inc | 2 +- data/scripts/gUnk_08014094.inc | 20 +- data/scripts/gUnk_080140B8.inc | 10 + data/scripts/gUnk_080140DC.inc | 11 +- data/scripts/gUnk_080140F8.inc | 8 - data/scripts/gUnk_08014118.inc | 4 +- data/scripts/gUnk_08014154.inc | 38 +- data/scripts/gUnk_08014198.inc | 17 + data/scripts/gUnk_080141DC.inc | 11 +- data/scripts/gUnk_08014210.inc | 35 +- .../{gUnk_080142B0.inc => gUnk_08014248.inc} | 52 +- data/scripts/gUnk_08014274.inc | 18 - data/scripts/gUnk_08014384.inc | 2 +- data/scripts/gUnk_080143C0.inc | 32 +- data/scripts/gUnk_08014402.inc | 40 - data/scripts/gUnk_08014450.inc | 67 +- data/scripts/gUnk_0801450C.inc | 25 +- data/scripts/gUnk_08014548.inc | 30 - data/scripts/gUnk_08014588.inc | 10 + data/scripts/gUnk_080145A0.inc | 9 - data/scripts/gUnk_080145B0.inc | 5 +- data/scripts/gUnk_080145E8.inc | 147 +- data/scripts/gUnk_08014628.inc | 131 - data/scripts/gUnk_08014804.inc | 44 +- data/scripts/gUnk_080148F0.inc | 28 - data/scripts/gUnk_08014958.inc | 24 +- data/scripts/gUnk_08014994.inc | 18 - data/scripts/gUnk_080149CC.inc | 86 +- data/scripts/gUnk_08014A28.inc | 15 - data/scripts/gUnk_08014A54.inc | 15 - data/scripts/gUnk_08014A80.inc | 21 - data/scripts/gUnk_08014AC4.inc | 41 - data/scripts/gUnk_08014B34.inc | 75 +- data/scripts/gUnk_08014C2C.inc | 31 - data/scripts/gUnk_08014C94.inc | 24 - data/scripts/gUnk_08014CDC.inc | 36 +- data/scripts/gUnk_08014DCC.inc | 8 +- data/scripts/gUnk_08014E14.inc | 295 +- data/scripts/gUnk_08014E50.inc | 32 - data/scripts/gUnk_08014ECC.inc | 16 - data/scripts/gUnk_08014EF8.inc | 19 - data/scripts/gUnk_08014F30.inc | 40 - data/scripts/gUnk_08014FBC.inc | 17 - data/scripts/gUnk_08015001.inc | 68 - data/scripts/gUnk_08015087.inc | 53 - data/scripts/gUnk_080150EF.inc | 326 -- data/scripts/gUnk_08015234.inc | 6 +- data/scripts/gUnk_080152B4.inc | 92 +- data/scripts/gUnk_080152DC.inc | 11 + data/scripts/gUnk_08015304.inc | 14 + .../{gUnk_0800E9F4.inc => gUnk_08015338.inc} | 8 +- data/scripts/gUnk_08015360.inc | 10 + data/scripts/gUnk_08015384.inc | 4 + data/scripts/gUnk_08015390.inc | 11 +- data/scripts/gUnk_080153EC.inc | 57 +- data/scripts/gUnk_0801548E.inc | 42 + data/scripts/gUnk_0801550C.inc | 71 +- data/scripts/gUnk_080155F4.inc | 10 + data/scripts/gUnk_08015618.inc | 20 +- data/scripts/gUnk_08015684.inc | 46 +- data/scripts/gUnk_080156A0.inc | 91 - data/scripts/gUnk_08015754.inc | 6 +- data/scripts/gUnk_080157AC.inc | 39 +- data/scripts/gUnk_080158F8.inc | 18 +- data/scripts/gUnk_08015918.inc | 8 + data/scripts/gUnk_08015938.inc | 2 +- data/scripts/gUnk_08015958.inc | 56 +- data/scripts/gUnk_08015A7C.inc | 10 + data/scripts/gUnk_08015AA0.inc | 10 + data/scripts/gUnk_08015AC4.inc | 2 +- data/scripts/gUnk_08015B34.inc | 18 +- data/scripts/gUnk_08015B84.inc | 2 +- data/scripts/gUnk_08015BA8.inc | 2 +- data/scripts/gUnk_08015BE8.inc | 58 +- data/scripts/gUnk_08015C7C.inc | 32 + data/scripts/gUnk_08015E58.inc | 8 +- data/scripts/gUnk_08015F3C.inc | 18 - data/scripts/gUnk_08015F80.inc | 11 + data/scripts/gUnk_08015FA4.inc | 2 +- data/scripts/gUnk_08015FC0.inc | 18 +- data/scripts/gUnk_08016004.inc | 12 + data/scripts/gUnk_08016021.inc | 16 - data/scripts/gUnk_08016030.inc | 14 + data/scripts/gUnk_08016062.inc | 4 + data/scripts/gUnk_0801606C.inc | 5 - data/scripts/gUnk_0801609E.inc | 4 + data/scripts/gUnk_080160A8.inc | 186 +- data/scripts/gUnk_080160EA.inc | 42 - data/scripts/gUnk_0801613C.inc | 39 - data/scripts/gUnk_08016190.inc | 41 - data/scripts/gUnk_080161E8.inc | 91 - data/scripts/gUnk_0801637C.inc | 69 + data/scripts/gUnk_0801637D.inc | 8 - data/scripts/gUnk_08016384.inc | 64 - data/scripts/gUnk_08016408.inc | 242 -- data/scripts/gUnk_08016482.inc | 86 + data/scripts/gUnk_080165A4.inc | 254 ++ data/scripts/gUnk_080165F8.inc | 9 - data/scripts/gUnk_0801660C.inc | 12 - data/scripts/gUnk_08016628.inc | 12 - data/scripts/gUnk_08016644.inc | 12 - data/scripts/gUnk_0801666C.inc | 15 - data/scripts/gUnk_080166B8.inc | 16 - data/scripts/gUnk_080166FC.inc | 38 - data/scripts/gUnk_08016798.inc | 40 - data/scripts/gUnk_08016844.inc | 38 - data/scripts/gUnk_080168E0.inc | 10 - data/scripts/gUnk_080168F4.inc | 55 - tools/script_disassembler/incbin_parser.py | 90 +- .../script_disassembler.py | 181 +- 1133 files changed, 15199 insertions(+), 21247 deletions(-) create mode 100644 asm/macros/scripts.inc delete mode 100644 data/scripts/gUnk_08008B90.inc delete mode 100644 data/scripts/gUnk_08008BC0.inc delete mode 100644 data/scripts/gUnk_08008C4E.inc delete mode 100644 data/scripts/gUnk_08008C64.inc delete mode 100644 data/scripts/gUnk_08008C6D.inc delete mode 100644 data/scripts/gUnk_08008C7E.inc delete mode 100644 data/scripts/gUnk_08008CB9.inc delete mode 100644 data/scripts/gUnk_08008DC0.inc delete mode 100644 data/scripts/gUnk_08008E08.inc delete mode 100644 data/scripts/gUnk_08008E0A.inc delete mode 100644 data/scripts/gUnk_08008F0C.inc delete mode 100644 data/scripts/gUnk_08008F16.inc delete mode 100644 data/scripts/gUnk_08008F26.inc create mode 100644 data/scripts/gUnk_08008F74.inc delete mode 100644 data/scripts/gUnk_08008F90.inc delete mode 100644 data/scripts/gUnk_08008FD1.inc delete mode 100644 data/scripts/gUnk_08009008.inc delete mode 100644 data/scripts/gUnk_0800901F.inc delete mode 100644 data/scripts/gUnk_08009080.inc delete mode 100644 data/scripts/gUnk_080090DB.inc delete mode 100644 data/scripts/gUnk_08009198.inc delete mode 100644 data/scripts/gUnk_08009207.inc delete mode 100644 data/scripts/gUnk_08009274.inc delete mode 100644 data/scripts/gUnk_080092A8.inc delete mode 100644 data/scripts/gUnk_080092D4.inc delete mode 100644 data/scripts/gUnk_080092F0.inc delete mode 100644 data/scripts/gUnk_08009308.inc delete mode 100644 data/scripts/gUnk_08009393.inc create mode 100644 data/scripts/gUnk_0800939A.inc delete mode 100644 data/scripts/gUnk_080093D7.inc delete mode 100644 data/scripts/gUnk_08009407.inc create mode 100644 data/scripts/gUnk_08009464.inc delete mode 100644 data/scripts/gUnk_08009486.inc delete mode 100644 data/scripts/gUnk_080094A4.inc delete mode 100644 data/scripts/gUnk_080094D7.inc delete mode 100644 data/scripts/gUnk_08009503.inc delete mode 100644 data/scripts/gUnk_08009508.inc delete mode 100644 data/scripts/gUnk_08009538.inc delete mode 100644 data/scripts/gUnk_08009574.inc delete mode 100644 data/scripts/gUnk_080095CC.inc create mode 100644 data/scripts/gUnk_080095F2.inc delete mode 100644 data/scripts/gUnk_0800962C.inc delete mode 100644 data/scripts/gUnk_08009698.inc delete mode 100644 data/scripts/gUnk_08009706.inc delete mode 100644 data/scripts/gUnk_08009778.inc delete mode 100644 data/scripts/gUnk_08009786.inc delete mode 100644 data/scripts/gUnk_080097A1.inc create mode 100644 data/scripts/gUnk_0800987C.inc delete mode 100644 data/scripts/gUnk_08009940.inc delete mode 100644 data/scripts/gUnk_08009A04.inc delete mode 100644 data/scripts/gUnk_08009A07.inc delete mode 100644 data/scripts/gUnk_08009A2C.inc delete mode 100644 data/scripts/gUnk_08009A50.inc delete mode 100644 data/scripts/gUnk_08009A77.inc delete mode 100644 data/scripts/gUnk_08009A81.inc delete mode 100644 data/scripts/gUnk_08009ABB.inc delete mode 100644 data/scripts/gUnk_08009B63.inc delete mode 100644 data/scripts/gUnk_08009C7F.inc delete mode 100644 data/scripts/gUnk_08009C9E.inc rename data/scripts/{gUnk_08009D00.inc => gUnk_08009CFC.inc} (89%) delete mode 100644 data/scripts/gUnk_08009D77.inc delete mode 100644 data/scripts/gUnk_08009DEC.inc delete mode 100644 data/scripts/gUnk_08009E38.inc rename data/scripts/{gUnk_0800DB0E.inc => gUnk_08009E4E.inc} (66%) rename data/scripts/{gUnk_08009318.inc => gUnk_08009E80.inc} (64%) delete mode 100644 data/scripts/gUnk_08009E9E.inc delete mode 100644 data/scripts/gUnk_08009EA9.inc delete mode 100644 data/scripts/gUnk_08009EB7.inc delete mode 100644 data/scripts/gUnk_08009F07.inc delete mode 100644 data/scripts/gUnk_08009F39.inc delete mode 100644 data/scripts/gUnk_08009F72.inc delete mode 100644 data/scripts/gUnk_0800A064.inc delete mode 100644 data/scripts/gUnk_0800A081.inc delete mode 100644 data/scripts/gUnk_0800A10A.inc delete mode 100644 data/scripts/gUnk_0800A10F.inc delete mode 100644 data/scripts/gUnk_0800A124.inc delete mode 100644 data/scripts/gUnk_0800A134.inc create mode 100644 data/scripts/gUnk_0800A160.inc delete mode 100644 data/scripts/gUnk_0800A224.inc delete mode 100644 data/scripts/gUnk_0800A260.inc create mode 100644 data/scripts/gUnk_0800A310.inc delete mode 100644 data/scripts/gUnk_0800A340.inc delete mode 100644 data/scripts/gUnk_0800A3A3.inc delete mode 100644 data/scripts/gUnk_0800A3A9.inc delete mode 100644 data/scripts/gUnk_0800A3AA.inc delete mode 100644 data/scripts/gUnk_0800A5A6.inc create mode 100644 data/scripts/gUnk_0800A638.inc delete mode 100644 data/scripts/gUnk_0800A67E.inc delete mode 100644 data/scripts/gUnk_0800A6AB.inc delete mode 100644 data/scripts/gUnk_0800A74A.inc delete mode 100644 data/scripts/gUnk_0800A7E8.inc delete mode 100644 data/scripts/gUnk_0800A816.inc delete mode 100644 data/scripts/gUnk_0800A820.inc delete mode 100644 data/scripts/gUnk_0800A85C.inc delete mode 100644 data/scripts/gUnk_0800A898.inc delete mode 100644 data/scripts/gUnk_0800A8D4.inc delete mode 100644 data/scripts/gUnk_0800A908.inc delete mode 100644 data/scripts/gUnk_0800A910.inc delete mode 100644 data/scripts/gUnk_0800AA03.inc delete mode 100644 data/scripts/gUnk_0800AB23.inc delete mode 100644 data/scripts/gUnk_0800AB4F.inc create mode 100644 data/scripts/gUnk_0800AB6E.inc delete mode 100644 data/scripts/gUnk_0800ABF0.inc delete mode 100644 data/scripts/gUnk_0800AC24.inc delete mode 100644 data/scripts/gUnk_0800AC6D.inc delete mode 100644 data/scripts/gUnk_0800ACB5.inc delete mode 100644 data/scripts/gUnk_0800ACE0.inc delete mode 100644 data/scripts/gUnk_0800AD74.inc delete mode 100644 data/scripts/gUnk_0800ADA7.inc delete mode 100644 data/scripts/gUnk_0800ADB4.inc delete mode 100644 data/scripts/gUnk_0800AF7E.inc delete mode 100644 data/scripts/gUnk_0800AFA7.inc delete mode 100644 data/scripts/gUnk_0800B0B0.inc delete mode 100644 data/scripts/gUnk_0800B177.inc delete mode 100644 data/scripts/gUnk_0800B17C.inc delete mode 100644 data/scripts/gUnk_0800B284.inc delete mode 100644 data/scripts/gUnk_0800B2B4.inc delete mode 100644 data/scripts/gUnk_0800B322.inc delete mode 100644 data/scripts/gUnk_0800B329.inc delete mode 100644 data/scripts/gUnk_0800B348.inc delete mode 100644 data/scripts/gUnk_0800B35C.inc delete mode 100644 data/scripts/gUnk_0800B374.inc delete mode 100644 data/scripts/gUnk_0800B40F.inc delete mode 100644 data/scripts/gUnk_0800B41C.inc delete mode 100644 data/scripts/gUnk_0800B508.inc delete mode 100644 data/scripts/gUnk_0800B50F.inc delete mode 100644 data/scripts/gUnk_0800B614.inc delete mode 100644 data/scripts/gUnk_0800B708.inc delete mode 100644 data/scripts/gUnk_0800B71F.inc delete mode 100644 data/scripts/gUnk_0800B730.inc delete mode 100644 data/scripts/gUnk_0800B7C4.inc create mode 100644 data/scripts/gUnk_0800B7FC.inc create mode 100644 data/scripts/gUnk_0800B828.inc delete mode 100644 data/scripts/gUnk_0800B84F.inc delete mode 100644 data/scripts/gUnk_0800B861.inc delete mode 100644 data/scripts/gUnk_0800B888.inc delete mode 100644 data/scripts/gUnk_0800B8A0.inc delete mode 100644 data/scripts/gUnk_0800B8B8.inc delete mode 100644 data/scripts/gUnk_0800B8E4.inc delete mode 100644 data/scripts/gUnk_0800B906.inc delete mode 100644 data/scripts/gUnk_0800B91C.inc delete mode 100644 data/scripts/gUnk_0800B964.inc delete mode 100644 data/scripts/gUnk_0800BA3C.inc delete mode 100644 data/scripts/gUnk_0800BA78.inc delete mode 100644 data/scripts/gUnk_0800BB08.inc delete mode 100644 data/scripts/gUnk_0800BB1A.inc delete mode 100644 data/scripts/gUnk_0800BB74.inc delete mode 100644 data/scripts/gUnk_0800BBDB.inc delete mode 100644 data/scripts/gUnk_0800BC22.inc delete mode 100644 data/scripts/gUnk_0800BCAE.inc delete mode 100644 data/scripts/gUnk_0800BCB7.inc delete mode 100644 data/scripts/gUnk_0800BCBE.inc delete mode 100644 data/scripts/gUnk_0800BD08.inc delete mode 100644 data/scripts/gUnk_0800BD70.inc delete mode 100644 data/scripts/gUnk_0800BDAC.inc delete mode 100644 data/scripts/gUnk_0800BDC4.inc delete mode 100644 data/scripts/gUnk_0800BE54.inc delete mode 100644 data/scripts/gUnk_0800BF14.inc delete mode 100644 data/scripts/gUnk_0800BF4A.inc delete mode 100644 data/scripts/gUnk_0800BF70.inc delete mode 100644 data/scripts/gUnk_0800BFBF.inc delete mode 100644 data/scripts/gUnk_0800BFE1.inc delete mode 100644 data/scripts/gUnk_0800BFE3.inc delete mode 100644 data/scripts/gUnk_0800C007.inc delete mode 100644 data/scripts/gUnk_0800C024.inc delete mode 100644 data/scripts/gUnk_0800C07B.inc delete mode 100644 data/scripts/gUnk_0800C0C7.inc delete mode 100644 data/scripts/gUnk_0800C0D3.inc delete mode 100644 data/scripts/gUnk_0800C0E8.inc delete mode 100644 data/scripts/gUnk_0800C113.inc delete mode 100644 data/scripts/gUnk_0800C147.inc delete mode 100644 data/scripts/gUnk_0800C204.inc delete mode 100644 data/scripts/gUnk_0800C207.inc delete mode 100644 data/scripts/gUnk_0800C208.inc delete mode 100644 data/scripts/gUnk_0800C210.inc delete mode 100644 data/scripts/gUnk_0800C263.inc delete mode 100644 data/scripts/gUnk_0800C2A7.inc delete mode 100644 data/scripts/gUnk_0800C2CE.inc create mode 100644 data/scripts/gUnk_0800C370.inc delete mode 100644 data/scripts/gUnk_0800C396.inc create mode 100644 data/scripts/gUnk_0800C3B0.inc delete mode 100644 data/scripts/gUnk_0800C408.inc delete mode 100644 data/scripts/gUnk_0800C4DB.inc delete mode 100644 data/scripts/gUnk_0800C521.inc delete mode 100644 data/scripts/gUnk_0800C556.inc delete mode 100644 data/scripts/gUnk_0800C584.inc delete mode 100644 data/scripts/gUnk_0800C59A.inc delete mode 100644 data/scripts/gUnk_0800C5C8.inc delete mode 100644 data/scripts/gUnk_0800C5FC.inc delete mode 100644 data/scripts/gUnk_0800C600.inc delete mode 100644 data/scripts/gUnk_0800C607.inc delete mode 100644 data/scripts/gUnk_0800C634.inc delete mode 100644 data/scripts/gUnk_0800C6C6.inc delete mode 100644 data/scripts/gUnk_0800C774.inc delete mode 100644 data/scripts/gUnk_0800C779.inc delete mode 100644 data/scripts/gUnk_0800C808.inc delete mode 100644 data/scripts/gUnk_0800C861.inc delete mode 100644 data/scripts/gUnk_0800C8B0.inc delete mode 100644 data/scripts/gUnk_0800C8DA.inc delete mode 100644 data/scripts/gUnk_0800C931.inc delete mode 100644 data/scripts/gUnk_0800C963.inc delete mode 100644 data/scripts/gUnk_0800CA08.inc delete mode 100644 data/scripts/gUnk_0800CAAA.inc delete mode 100644 data/scripts/gUnk_0800CB07.inc delete mode 100644 data/scripts/gUnk_0800CBA3.inc delete mode 100644 data/scripts/gUnk_0800CC08.inc delete mode 100644 data/scripts/gUnk_0800CC0D.inc delete mode 100644 data/scripts/gUnk_0800CC42.inc delete mode 100644 data/scripts/gUnk_0800CCCD.inc delete mode 100644 data/scripts/gUnk_0800CCDD.inc delete mode 100644 data/scripts/gUnk_0800CD08.inc delete mode 100644 data/scripts/gUnk_0800CD67.inc delete mode 100644 data/scripts/gUnk_0800CE07.inc delete mode 100644 data/scripts/gUnk_0800CF04.inc delete mode 100644 data/scripts/gUnk_0800CF16.inc delete mode 100644 data/scripts/gUnk_0800CF4B.inc delete mode 100644 data/scripts/gUnk_0800CF50.inc delete mode 100644 data/scripts/gUnk_0800CF7B.inc delete mode 100644 data/scripts/gUnk_0800CF88.inc delete mode 100644 data/scripts/gUnk_0800CF95.inc delete mode 100644 data/scripts/gUnk_0800CFA9.inc delete mode 100644 data/scripts/gUnk_0800CFAC.inc delete mode 100644 data/scripts/gUnk_0800D011.inc delete mode 100644 data/scripts/gUnk_0800D05F.inc delete mode 100644 data/scripts/gUnk_0800D0CE.inc delete mode 100644 data/scripts/gUnk_0800D127.inc delete mode 100644 data/scripts/gUnk_0800D190.inc delete mode 100644 data/scripts/gUnk_0800D1C4.inc delete mode 100644 data/scripts/gUnk_0800D1D4.inc delete mode 100644 data/scripts/gUnk_0800D207.inc create mode 100644 data/scripts/gUnk_0800D242.inc create mode 100644 data/scripts/gUnk_0800D24C.inc delete mode 100644 data/scripts/gUnk_0800D2CE.inc delete mode 100644 data/scripts/gUnk_0800D306.inc delete mode 100644 data/scripts/gUnk_0800D308.inc delete mode 100644 data/scripts/gUnk_0800D30F.inc delete mode 100644 data/scripts/gUnk_0800D350.inc delete mode 100644 data/scripts/gUnk_0800D44C.inc delete mode 100644 data/scripts/gUnk_0800D4BF.inc delete mode 100644 data/scripts/gUnk_0800D4DC.inc delete mode 100644 data/scripts/gUnk_0800D59C.inc delete mode 100644 data/scripts/gUnk_0800D5E5.inc delete mode 100644 data/scripts/gUnk_0800D60C.inc delete mode 100644 data/scripts/gUnk_0800D62B.inc create mode 100644 data/scripts/gUnk_0800D698.inc delete mode 100644 data/scripts/gUnk_0800D6BA.inc delete mode 100644 data/scripts/gUnk_0800D702.inc delete mode 100644 data/scripts/gUnk_0800D703.inc delete mode 100644 data/scripts/gUnk_0800D725.inc delete mode 100644 data/scripts/gUnk_0800D728.inc delete mode 100644 data/scripts/gUnk_0800D7CF.inc delete mode 100644 data/scripts/gUnk_0800D7DC.inc create mode 100644 data/scripts/gUnk_0800D84C.inc delete mode 100644 data/scripts/gUnk_0800D8E4.inc delete mode 100644 data/scripts/gUnk_0800D906.inc rename data/scripts/{gUnk_0800D3EC.inc => gUnk_0800D92C.inc} (57%) delete mode 100644 data/scripts/gUnk_0800D97D.inc delete mode 100644 data/scripts/gUnk_0800D981.inc rename data/scripts/{gUnk_0800AD54.inc => gUnk_0800DA00.inc} (54%) delete mode 100644 data/scripts/gUnk_0800DA11.inc delete mode 100644 data/scripts/gUnk_0800DA4C.inc delete mode 100644 data/scripts/gUnk_0800DA4D.inc delete mode 100644 data/scripts/gUnk_0800DB4A.inc delete mode 100644 data/scripts/gUnk_0800DB88.inc delete mode 100644 data/scripts/gUnk_0800DC10.inc delete mode 100644 data/scripts/gUnk_0800DC19.inc create mode 100644 data/scripts/gUnk_0800DC4C.inc delete mode 100644 data/scripts/gUnk_0800DC91.inc delete mode 100644 data/scripts/gUnk_0800DCDC.inc delete mode 100644 data/scripts/gUnk_0800DD04.inc delete mode 100644 data/scripts/gUnk_0800DD10.inc delete mode 100644 data/scripts/gUnk_0800DD19.inc delete mode 100644 data/scripts/gUnk_0800DD22.inc delete mode 100644 data/scripts/gUnk_0800DD8D.inc delete mode 100644 data/scripts/gUnk_0800DDAA.inc create mode 100644 data/scripts/gUnk_0800DDD0.inc delete mode 100644 data/scripts/gUnk_0800DDE8.inc delete mode 100644 data/scripts/gUnk_0800DDFC.inc create mode 100644 data/scripts/gUnk_0800DE2C.inc create mode 100644 data/scripts/gUnk_0800DE50.inc delete mode 100644 data/scripts/gUnk_0800DEF6.inc delete mode 100644 data/scripts/gUnk_0800DF07.inc delete mode 100644 data/scripts/gUnk_0800DFD0.inc delete mode 100644 data/scripts/gUnk_0800DFD7.inc delete mode 100644 data/scripts/gUnk_0800DFDE.inc create mode 100644 data/scripts/gUnk_0800E094.inc delete mode 100644 data/scripts/gUnk_0800E0F6.inc delete mode 100644 data/scripts/gUnk_0800E140.inc delete mode 100644 data/scripts/gUnk_0800E153.inc delete mode 100644 data/scripts/gUnk_0800E154.inc delete mode 100644 data/scripts/gUnk_0800E1C5.inc delete mode 100644 data/scripts/gUnk_0800E200.inc delete mode 100644 data/scripts/gUnk_0800E300.inc delete mode 100644 data/scripts/gUnk_0800E305.inc delete mode 100644 data/scripts/gUnk_0800E307.inc delete mode 100644 data/scripts/gUnk_0800E30C.inc delete mode 100644 data/scripts/gUnk_0800E329.inc delete mode 100644 data/scripts/gUnk_0800E350.inc delete mode 100644 data/scripts/gUnk_0800E3EE.inc delete mode 100644 data/scripts/gUnk_0800E3F9.inc delete mode 100644 data/scripts/gUnk_0800E3FA.inc delete mode 100644 data/scripts/gUnk_0800E3FC.inc delete mode 100644 data/scripts/gUnk_0800E400.inc delete mode 100644 data/scripts/gUnk_0800E408.inc delete mode 100644 data/scripts/gUnk_0800E40B.inc delete mode 100644 data/scripts/gUnk_0800E411.inc delete mode 100644 data/scripts/gUnk_0800E430.inc delete mode 100644 data/scripts/gUnk_0800E434.inc delete mode 100644 data/scripts/gUnk_0800E46C.inc delete mode 100644 data/scripts/gUnk_0800E489.inc delete mode 100644 data/scripts/gUnk_0800E499.inc delete mode 100644 data/scripts/gUnk_0800E4A4.inc delete mode 100644 data/scripts/gUnk_0800E4E3.inc delete mode 100644 data/scripts/gUnk_0800E50C.inc create mode 100644 data/scripts/gUnk_0800E5D6.inc delete mode 100644 data/scripts/gUnk_0800E60E.inc delete mode 100644 data/scripts/gUnk_0800E6E8.inc delete mode 100644 data/scripts/gUnk_0800E707.inc delete mode 100644 data/scripts/gUnk_0800E70A.inc delete mode 100644 data/scripts/gUnk_0800E734.inc delete mode 100644 data/scripts/gUnk_0800E760.inc delete mode 100644 data/scripts/gUnk_0800E7D9.inc delete mode 100644 data/scripts/gUnk_0800E7F4.inc delete mode 100644 data/scripts/gUnk_0800E7FA.inc delete mode 100644 data/scripts/gUnk_0800E823.inc delete mode 100644 data/scripts/gUnk_0800E824.inc create mode 100644 data/scripts/gUnk_0800E8A4.inc create mode 100644 data/scripts/gUnk_0800E8D6.inc delete mode 100644 data/scripts/gUnk_0800E8DB.inc create mode 100644 data/scripts/gUnk_0800E908.inc delete mode 100644 data/scripts/gUnk_0800E920.inc delete mode 100644 data/scripts/gUnk_0800E964.inc delete mode 100644 data/scripts/gUnk_0800E9D6.inc delete mode 100644 data/scripts/gUnk_0800EAA4.inc delete mode 100644 data/scripts/gUnk_0800EAEB.inc delete mode 100644 data/scripts/gUnk_0800EAF8.inc delete mode 100644 data/scripts/gUnk_0800EB2C.inc delete mode 100644 data/scripts/gUnk_0800EB64.inc delete mode 100644 data/scripts/gUnk_0800EBC0.inc delete mode 100644 data/scripts/gUnk_0800EBDC.inc delete mode 100644 data/scripts/gUnk_0800EBE0.inc delete mode 100644 data/scripts/gUnk_0800EBF0.inc delete mode 100644 data/scripts/gUnk_0800EC08.inc delete mode 100644 data/scripts/gUnk_0800EC14.inc delete mode 100644 data/scripts/gUnk_0800EC54.inc delete mode 100644 data/scripts/gUnk_0800EC61.inc delete mode 100644 data/scripts/gUnk_0800EC8C.inc delete mode 100644 data/scripts/gUnk_0800ECF1.inc delete mode 100644 data/scripts/gUnk_0800ED04.inc delete mode 100644 data/scripts/gUnk_0800ED0C.inc delete mode 100644 data/scripts/gUnk_0800ED0D.inc delete mode 100644 data/scripts/gUnk_0800ED5C.inc delete mode 100644 data/scripts/gUnk_0800ED90.inc delete mode 100644 data/scripts/gUnk_0800EDD9.inc delete mode 100644 data/scripts/gUnk_0800EDE0.inc delete mode 100644 data/scripts/gUnk_0800EE09.inc delete mode 100644 data/scripts/gUnk_0800EE50.inc delete mode 100644 data/scripts/gUnk_0800EE8C.inc delete mode 100644 data/scripts/gUnk_0800EEE0.inc delete mode 100644 data/scripts/gUnk_0800EEFD.inc delete mode 100644 data/scripts/gUnk_0800EF07.inc delete mode 100644 data/scripts/gUnk_0800EF12.inc delete mode 100644 data/scripts/gUnk_0800EF93.inc create mode 100644 data/scripts/gUnk_0800EF9C.inc delete mode 100644 data/scripts/gUnk_0800EFE0.inc delete mode 100644 data/scripts/gUnk_0800EFE4.inc delete mode 100644 data/scripts/gUnk_0800F090.inc delete mode 100644 data/scripts/gUnk_0800F094.inc delete mode 100644 data/scripts/gUnk_0800F0D6.inc delete mode 100644 data/scripts/gUnk_0800F0E2.inc delete mode 100644 data/scripts/gUnk_0800F0F2.inc delete mode 100644 data/scripts/gUnk_0800F0F3.inc delete mode 100644 data/scripts/gUnk_0800F0F4.inc delete mode 100644 data/scripts/gUnk_0800F1DE.inc delete mode 100644 data/scripts/gUnk_0800F1E1.inc delete mode 100644 data/scripts/gUnk_0800F1E5.inc delete mode 100644 data/scripts/gUnk_0800F1E7.inc delete mode 100644 data/scripts/gUnk_0800F1ED.inc delete mode 100644 data/scripts/gUnk_0800F1FB.inc delete mode 100644 data/scripts/gUnk_0800F1FD.inc delete mode 100644 data/scripts/gUnk_0800F203.inc delete mode 100644 data/scripts/gUnk_0800F207.inc delete mode 100644 data/scripts/gUnk_0800F210.inc delete mode 100644 data/scripts/gUnk_0800F2EB.inc delete mode 100644 data/scripts/gUnk_0800F2F0.inc delete mode 100644 data/scripts/gUnk_0800F2F2.inc delete mode 100644 data/scripts/gUnk_0800F303.inc create mode 100644 data/scripts/gUnk_0800F33C.inc create mode 100644 data/scripts/gUnk_0800F354.inc create mode 100644 data/scripts/gUnk_0800F36C.inc create mode 100644 data/scripts/gUnk_0800F384.inc delete mode 100644 data/scripts/gUnk_0800F3DB.inc delete mode 100644 data/scripts/gUnk_0800F3E5.inc delete mode 100644 data/scripts/gUnk_0800F3E6.inc delete mode 100644 data/scripts/gUnk_0800F3E8.inc delete mode 100644 data/scripts/gUnk_0800F3EB.inc delete mode 100644 data/scripts/gUnk_0800F3ED.inc delete mode 100644 data/scripts/gUnk_0800F3F5.inc delete mode 100644 data/scripts/gUnk_0800F3F9.inc delete mode 100644 data/scripts/gUnk_0800F400.inc delete mode 100644 data/scripts/gUnk_0800F408.inc delete mode 100644 data/scripts/gUnk_0800F409.inc delete mode 100644 data/scripts/gUnk_0800F410.inc delete mode 100644 data/scripts/gUnk_0800F426.inc delete mode 100644 data/scripts/gUnk_0800F4EA.inc delete mode 100644 data/scripts/gUnk_0800F4EB.inc delete mode 100644 data/scripts/gUnk_0800F4EF.inc delete mode 100644 data/scripts/gUnk_0800F4F0.inc delete mode 100644 data/scripts/gUnk_0800F4F1.inc delete mode 100644 data/scripts/gUnk_0800F4F3.inc delete mode 100644 data/scripts/gUnk_0800F4F7.inc delete mode 100644 data/scripts/gUnk_0800F4F9.inc delete mode 100644 data/scripts/gUnk_0800F501.inc delete mode 100644 data/scripts/gUnk_0800F50E.inc delete mode 100644 data/scripts/gUnk_0800F584.inc delete mode 100644 data/scripts/gUnk_0800F58F.inc delete mode 100644 data/scripts/gUnk_0800F5B0.inc delete mode 100644 data/scripts/gUnk_0800F5E9.inc delete mode 100644 data/scripts/gUnk_0800F5EC.inc delete mode 100644 data/scripts/gUnk_0800F5ED.inc delete mode 100644 data/scripts/gUnk_0800F5EE.inc delete mode 100644 data/scripts/gUnk_0800F5EF.inc delete mode 100644 data/scripts/gUnk_0800F5F0.inc delete mode 100644 data/scripts/gUnk_0800F5F2.inc delete mode 100644 data/scripts/gUnk_0800F5F4.inc delete mode 100644 data/scripts/gUnk_0800F5FC.inc delete mode 100644 data/scripts/gUnk_0800F5FF.inc delete mode 100644 data/scripts/gUnk_0800F606.inc delete mode 100644 data/scripts/gUnk_0800F607.inc delete mode 100644 data/scripts/gUnk_0800F608.inc delete mode 100644 data/scripts/gUnk_0800F60A.inc delete mode 100644 data/scripts/gUnk_0800F628.inc delete mode 100644 data/scripts/gUnk_0800F650.inc delete mode 100644 data/scripts/gUnk_0800F688.inc delete mode 100644 data/scripts/gUnk_0800F6A0.inc delete mode 100644 data/scripts/gUnk_0800F6C8.inc delete mode 100644 data/scripts/gUnk_0800F6E0.inc delete mode 100644 data/scripts/gUnk_0800F6E9.inc delete mode 100644 data/scripts/gUnk_0800F6EC.inc delete mode 100644 data/scripts/gUnk_0800F6ED.inc delete mode 100644 data/scripts/gUnk_0800F6EE.inc delete mode 100644 data/scripts/gUnk_0800F6EF.inc delete mode 100644 data/scripts/gUnk_0800F6F0.inc delete mode 100644 data/scripts/gUnk_0800F6F1.inc delete mode 100644 data/scripts/gUnk_0800F6F2.inc delete mode 100644 data/scripts/gUnk_0800F6F3.inc delete mode 100644 data/scripts/gUnk_0800F6F4.inc delete mode 100644 data/scripts/gUnk_0800F6F9.inc delete mode 100644 data/scripts/gUnk_0800F6FE.inc delete mode 100644 data/scripts/gUnk_0800F702.inc delete mode 100644 data/scripts/gUnk_0800F706.inc delete mode 100644 data/scripts/gUnk_0800F71E.inc delete mode 100644 data/scripts/gUnk_0800F734.inc delete mode 100644 data/scripts/gUnk_0800F73C.inc delete mode 100644 data/scripts/gUnk_0800F7E6.inc delete mode 100644 data/scripts/gUnk_0800F7EB.inc delete mode 100644 data/scripts/gUnk_0800F7EE.inc delete mode 100644 data/scripts/gUnk_0800F7EF.inc delete mode 100644 data/scripts/gUnk_0800F7F0.inc delete mode 100644 data/scripts/gUnk_0800F7F4.inc delete mode 100644 data/scripts/gUnk_0800F7F5.inc delete mode 100644 data/scripts/gUnk_0800F7F7.inc delete mode 100644 data/scripts/gUnk_0800F7FC.inc delete mode 100644 data/scripts/gUnk_0800F7FD.inc delete mode 100644 data/scripts/gUnk_0800F7FF.inc delete mode 100644 data/scripts/gUnk_0800F800.inc delete mode 100644 data/scripts/gUnk_0800F805.inc delete mode 100644 data/scripts/gUnk_0800F808.inc delete mode 100644 data/scripts/gUnk_0800F8EF.inc delete mode 100644 data/scripts/gUnk_0800F8F0.inc delete mode 100644 data/scripts/gUnk_0800F8F1.inc delete mode 100644 data/scripts/gUnk_0800F8F2.inc delete mode 100644 data/scripts/gUnk_0800F8F3.inc delete mode 100644 data/scripts/gUnk_0800F8F4.inc delete mode 100644 data/scripts/gUnk_0800F8F5.inc delete mode 100644 data/scripts/gUnk_0800F8F8.inc delete mode 100644 data/scripts/gUnk_0800F8F9.inc delete mode 100644 data/scripts/gUnk_0800F900.inc delete mode 100644 data/scripts/gUnk_0800F902.inc delete mode 100644 data/scripts/gUnk_0800F916.inc delete mode 100644 data/scripts/gUnk_0800F9F0.inc delete mode 100644 data/scripts/gUnk_0800F9F2.inc delete mode 100644 data/scripts/gUnk_0800F9F3.inc delete mode 100644 data/scripts/gUnk_0800F9F4.inc delete mode 100644 data/scripts/gUnk_0800F9F6.inc delete mode 100644 data/scripts/gUnk_0800F9F7.inc delete mode 100644 data/scripts/gUnk_0800F9F8.inc delete mode 100644 data/scripts/gUnk_0800FA02.inc delete mode 100644 data/scripts/gUnk_0800FA07.inc delete mode 100644 data/scripts/gUnk_0800FA08.inc delete mode 100644 data/scripts/gUnk_0800FA09.inc delete mode 100644 data/scripts/gUnk_0800FA0D.inc create mode 100644 data/scripts/gUnk_0800FA54.inc rename data/scripts/{gUnk_0801635C.inc => gUnk_0800FA9C.inc} (51%) delete mode 100644 data/scripts/gUnk_0800FAF3.inc delete mode 100644 data/scripts/gUnk_0800FAF5.inc delete mode 100644 data/scripts/gUnk_0800FAF6.inc delete mode 100644 data/scripts/gUnk_0800FAF7.inc delete mode 100644 data/scripts/gUnk_0800FAF8.inc delete mode 100644 data/scripts/gUnk_0800FAFD.inc delete mode 100644 data/scripts/gUnk_0800FAFE.inc delete mode 100644 data/scripts/gUnk_0800FAFF.inc delete mode 100644 data/scripts/gUnk_0800FB00.inc delete mode 100644 data/scripts/gUnk_0800FB01.inc delete mode 100644 data/scripts/gUnk_0800FB02.inc delete mode 100644 data/scripts/gUnk_0800FB04.inc delete mode 100644 data/scripts/gUnk_0800FB08.inc delete mode 100644 data/scripts/gUnk_0800FB0A.inc create mode 100644 data/scripts/gUnk_0800FB2C.inc delete mode 100644 data/scripts/gUnk_0800FB31.inc delete mode 100644 data/scripts/gUnk_0800FBBB.inc delete mode 100644 data/scripts/gUnk_0800FBF0.inc delete mode 100644 data/scripts/gUnk_0800FBF3.inc delete mode 100644 data/scripts/gUnk_0800FBF5.inc delete mode 100644 data/scripts/gUnk_0800FBF6.inc delete mode 100644 data/scripts/gUnk_0800FBF8.inc delete mode 100644 data/scripts/gUnk_0800FBF9.inc delete mode 100644 data/scripts/gUnk_0800FBFA.inc delete mode 100644 data/scripts/gUnk_0800FBFB.inc delete mode 100644 data/scripts/gUnk_0800FBFC.inc delete mode 100644 data/scripts/gUnk_0800FBFF.inc delete mode 100644 data/scripts/gUnk_0800FC00.inc delete mode 100644 data/scripts/gUnk_0800FC01.inc delete mode 100644 data/scripts/gUnk_0800FC05.inc delete mode 100644 data/scripts/gUnk_0800FC06.inc delete mode 100644 data/scripts/gUnk_0800FC08.inc delete mode 100644 data/scripts/gUnk_0800FC09.inc delete mode 100644 data/scripts/gUnk_0800FC0E.inc delete mode 100644 data/scripts/gUnk_0800FC24.inc delete mode 100644 data/scripts/gUnk_0800FCEA.inc delete mode 100644 data/scripts/gUnk_0800FCEE.inc delete mode 100644 data/scripts/gUnk_0800FCF2.inc delete mode 100644 data/scripts/gUnk_0800FCF3.inc delete mode 100644 data/scripts/gUnk_0800FCF5.inc delete mode 100644 data/scripts/gUnk_0800FCF7.inc delete mode 100644 data/scripts/gUnk_0800FCF8.inc delete mode 100644 data/scripts/gUnk_0800FCFA.inc delete mode 100644 data/scripts/gUnk_0800FCFB.inc delete mode 100644 data/scripts/gUnk_0800FCFC.inc delete mode 100644 data/scripts/gUnk_0800FCFE.inc delete mode 100644 data/scripts/gUnk_0800FCFF.inc delete mode 100644 data/scripts/gUnk_0800FD00.inc delete mode 100644 data/scripts/gUnk_0800FD01.inc delete mode 100644 data/scripts/gUnk_0800FD04.inc delete mode 100644 data/scripts/gUnk_0800FD05.inc delete mode 100644 data/scripts/gUnk_0800FD16.inc delete mode 100644 data/scripts/gUnk_0800FD21.inc delete mode 100644 data/scripts/gUnk_0800FD80.inc delete mode 100644 data/scripts/gUnk_0800FDCC.inc delete mode 100644 data/scripts/gUnk_0800FDF2.inc delete mode 100644 data/scripts/gUnk_0800FDF3.inc delete mode 100644 data/scripts/gUnk_0800FDFA.inc delete mode 100644 data/scripts/gUnk_0800FDFC.inc delete mode 100644 data/scripts/gUnk_0800FDFE.inc delete mode 100644 data/scripts/gUnk_0800FDFF.inc delete mode 100644 data/scripts/gUnk_0800FE00.inc delete mode 100644 data/scripts/gUnk_0800FE01.inc delete mode 100644 data/scripts/gUnk_0800FE02.inc delete mode 100644 data/scripts/gUnk_0800FE04.inc delete mode 100644 data/scripts/gUnk_0800FE06.inc delete mode 100644 data/scripts/gUnk_0800FE07.inc delete mode 100644 data/scripts/gUnk_0800FE08.inc delete mode 100644 data/scripts/gUnk_0800FE09.inc delete mode 100644 data/scripts/gUnk_0800FE40.inc delete mode 100644 data/scripts/gUnk_0800FE44.inc delete mode 100644 data/scripts/gUnk_0800FE64.inc delete mode 100644 data/scripts/gUnk_0800FE88.inc delete mode 100644 data/scripts/gUnk_0800FEBC.inc delete mode 100644 data/scripts/gUnk_0800FEF0.inc delete mode 100644 data/scripts/gUnk_0800FEF2.inc delete mode 100644 data/scripts/gUnk_0800FEF9.inc delete mode 100644 data/scripts/gUnk_0800FEFC.inc delete mode 100644 data/scripts/gUnk_0800FEFE.inc delete mode 100644 data/scripts/gUnk_0800FF01.inc delete mode 100644 data/scripts/gUnk_0800FF03.inc delete mode 100644 data/scripts/gUnk_0800FF04.inc delete mode 100644 data/scripts/gUnk_0800FF05.inc delete mode 100644 data/scripts/gUnk_0800FF06.inc delete mode 100644 data/scripts/gUnk_0800FF08.inc delete mode 100644 data/scripts/gUnk_0800FF2A.inc delete mode 100644 data/scripts/gUnk_0800FFB0.inc delete mode 100644 data/scripts/gUnk_0800FFBB.inc delete mode 100644 data/scripts/gUnk_0800FFD6.inc delete mode 100644 data/scripts/gUnk_0800FFEE.inc delete mode 100644 data/scripts/gUnk_0800FFF6.inc delete mode 100644 data/scripts/gUnk_0800FFFC.inc delete mode 100644 data/scripts/gUnk_0800FFFD.inc delete mode 100644 data/scripts/gUnk_0800FFFF.inc delete mode 100644 data/scripts/gUnk_08010000.inc delete mode 100644 data/scripts/gUnk_08010001.inc delete mode 100644 data/scripts/gUnk_08010002.inc delete mode 100644 data/scripts/gUnk_08010003.inc delete mode 100644 data/scripts/gUnk_08010005.inc delete mode 100644 data/scripts/gUnk_08010007.inc delete mode 100644 data/scripts/gUnk_08010008.inc delete mode 100644 data/scripts/gUnk_08010009.inc delete mode 100644 data/scripts/gUnk_0801000A.inc delete mode 100644 data/scripts/gUnk_0801000C.inc delete mode 100644 data/scripts/gUnk_0801000D.inc delete mode 100644 data/scripts/gUnk_0801000E.inc delete mode 100644 data/scripts/gUnk_0801000F.inc delete mode 100644 data/scripts/gUnk_08010018.inc delete mode 100644 data/scripts/gUnk_0801001B.inc delete mode 100644 data/scripts/gUnk_0801001D.inc delete mode 100644 data/scripts/gUnk_08010023.inc delete mode 100644 data/scripts/gUnk_08010044.inc delete mode 100644 data/scripts/gUnk_08010098.inc delete mode 100644 data/scripts/gUnk_08010099.inc delete mode 100644 data/scripts/gUnk_080100C1.inc delete mode 100644 data/scripts/gUnk_080100F5.inc delete mode 100644 data/scripts/gUnk_080100FC.inc delete mode 100644 data/scripts/gUnk_080100FE.inc delete mode 100644 data/scripts/gUnk_080100FF.inc delete mode 100644 data/scripts/gUnk_08010100.inc delete mode 100644 data/scripts/gUnk_08010102.inc delete mode 100644 data/scripts/gUnk_08010103.inc delete mode 100644 data/scripts/gUnk_08010105.inc delete mode 100644 data/scripts/gUnk_08010106.inc delete mode 100644 data/scripts/gUnk_0801010A.inc delete mode 100644 data/scripts/gUnk_08010111.inc delete mode 100644 data/scripts/gUnk_08010120.inc delete mode 100644 data/scripts/gUnk_08010130.inc delete mode 100644 data/scripts/gUnk_08010148.inc delete mode 100644 data/scripts/gUnk_080101FA.inc delete mode 100644 data/scripts/gUnk_080101FD.inc delete mode 100644 data/scripts/gUnk_080101FF.inc delete mode 100644 data/scripts/gUnk_08010200.inc delete mode 100644 data/scripts/gUnk_08010203.inc delete mode 100644 data/scripts/gUnk_08010207.inc delete mode 100644 data/scripts/gUnk_08010208.inc delete mode 100644 data/scripts/gUnk_0801020C.inc delete mode 100644 data/scripts/gUnk_08010220.inc delete mode 100644 data/scripts/gUnk_08010236.inc delete mode 100644 data/scripts/gUnk_08010294.inc delete mode 100644 data/scripts/gUnk_080102E0.inc delete mode 100644 data/scripts/gUnk_080102FB.inc delete mode 100644 data/scripts/gUnk_080102FD.inc delete mode 100644 data/scripts/gUnk_080102FE.inc delete mode 100644 data/scripts/gUnk_08010303.inc delete mode 100644 data/scripts/gUnk_08010304.inc delete mode 100644 data/scripts/gUnk_08010305.inc delete mode 100644 data/scripts/gUnk_0801030A.inc delete mode 100644 data/scripts/gUnk_0801030C.inc delete mode 100644 data/scripts/gUnk_08010320.inc delete mode 100644 data/scripts/gUnk_080103B0.inc delete mode 100644 data/scripts/gUnk_080103D0.inc delete mode 100644 data/scripts/gUnk_080103F8.inc delete mode 100644 data/scripts/gUnk_080103FD.inc delete mode 100644 data/scripts/gUnk_08010400.inc delete mode 100644 data/scripts/gUnk_08010406.inc delete mode 100644 data/scripts/gUnk_08010407.inc delete mode 100644 data/scripts/gUnk_0801040A.inc delete mode 100644 data/scripts/gUnk_08010428.inc delete mode 100644 data/scripts/gUnk_08010454.inc delete mode 100644 data/scripts/gUnk_08010480.inc delete mode 100644 data/scripts/gUnk_080104A0.inc delete mode 100644 data/scripts/gUnk_080104EC.inc delete mode 100644 data/scripts/gUnk_080104FF.inc delete mode 100644 data/scripts/gUnk_08010501.inc delete mode 100644 data/scripts/gUnk_08010502.inc delete mode 100644 data/scripts/gUnk_08010503.inc delete mode 100644 data/scripts/gUnk_0801050A.inc delete mode 100644 data/scripts/gUnk_0801050B.inc delete mode 100644 data/scripts/gUnk_08010526.inc delete mode 100644 data/scripts/gUnk_0801059F.inc delete mode 100644 data/scripts/gUnk_080105C9.inc delete mode 100644 data/scripts/gUnk_080105FB.inc delete mode 100644 data/scripts/gUnk_080105FF.inc delete mode 100644 data/scripts/gUnk_08010600.inc delete mode 100644 data/scripts/gUnk_0801060A.inc delete mode 100644 data/scripts/gUnk_0801060D.inc delete mode 100644 data/scripts/gUnk_08010617.inc delete mode 100644 data/scripts/gUnk_0801061C.inc delete mode 100644 data/scripts/gUnk_08010644.inc delete mode 100644 data/scripts/gUnk_08010650.inc delete mode 100644 data/scripts/gUnk_08010674.inc delete mode 100644 data/scripts/gUnk_080106AC.inc delete mode 100644 data/scripts/gUnk_08010700.inc delete mode 100644 data/scripts/gUnk_08010701.inc delete mode 100644 data/scripts/gUnk_08010705.inc delete mode 100644 data/scripts/gUnk_0801070E.inc delete mode 100644 data/scripts/gUnk_08010734.inc delete mode 100644 data/scripts/gUnk_08010794.inc delete mode 100644 data/scripts/gUnk_080107D0.inc delete mode 100644 data/scripts/gUnk_0801080A.inc delete mode 100644 data/scripts/gUnk_0801080B.inc delete mode 100644 data/scripts/gUnk_08010815.inc delete mode 100644 data/scripts/gUnk_0801081B.inc delete mode 100644 data/scripts/gUnk_080108D0.inc delete mode 100644 data/scripts/gUnk_080108FF.inc delete mode 100644 data/scripts/gUnk_0801090C.inc delete mode 100644 data/scripts/gUnk_0801090F.inc delete mode 100644 data/scripts/gUnk_08010917.inc delete mode 100644 data/scripts/gUnk_080109A0.inc delete mode 100644 data/scripts/gUnk_080109F6.inc delete mode 100644 data/scripts/gUnk_08010A1F.inc delete mode 100644 data/scripts/gUnk_08010AE4.inc delete mode 100644 data/scripts/gUnk_08010B04.inc delete mode 100644 data/scripts/gUnk_08010BEC.inc delete mode 100644 data/scripts/gUnk_08010BF9.inc delete mode 100644 data/scripts/gUnk_08010BFE.inc delete mode 100644 data/scripts/gUnk_08010C1A.inc delete mode 100644 data/scripts/gUnk_08010D03.inc delete mode 100644 data/scripts/gUnk_08010E00.inc delete mode 100644 data/scripts/gUnk_08010E0D.inc create mode 100644 data/scripts/gUnk_08010E5A.inc delete mode 100644 data/scripts/gUnk_08010F00.inc create mode 100644 data/scripts/gUnk_08010F84.inc delete mode 100644 data/scripts/gUnk_08010FFF.inc delete mode 100644 data/scripts/gUnk_08011000.inc delete mode 100644 data/scripts/gUnk_08011001.inc delete mode 100644 data/scripts/gUnk_0801101F.inc delete mode 100644 data/scripts/gUnk_08011083.inc create mode 100644 data/scripts/gUnk_08011098.inc create mode 100644 data/scripts/gUnk_080110BC.inc delete mode 100644 data/scripts/gUnk_080110DC.inc delete mode 100644 data/scripts/gUnk_08011208.inc delete mode 100644 data/scripts/gUnk_0801121D.inc delete mode 100644 data/scripts/gUnk_0801130F.inc delete mode 100644 data/scripts/gUnk_08011328.inc create mode 100644 data/scripts/gUnk_080113AA.inc delete mode 100644 data/scripts/gUnk_08011403.inc create mode 100644 data/scripts/gUnk_08011442.inc create mode 100644 data/scripts/gUnk_08011508.inc delete mode 100644 data/scripts/gUnk_08011809.inc create mode 100644 data/scripts/gUnk_08011890.inc delete mode 100644 data/scripts/gUnk_08011958.inc delete mode 100644 data/scripts/gUnk_08011964.inc delete mode 100644 data/scripts/gUnk_080119B0.inc delete mode 100644 data/scripts/gUnk_080119D8.inc delete mode 100644 data/scripts/gUnk_080119E4.inc delete mode 100644 data/scripts/gUnk_080119F0.inc delete mode 100644 data/scripts/gUnk_08011A04.inc delete mode 100644 data/scripts/gUnk_08011A2C.inc delete mode 100644 data/scripts/gUnk_08011A64.inc delete mode 100644 data/scripts/gUnk_08011AE4.inc delete mode 100644 data/scripts/gUnk_08011B04.inc delete mode 100644 data/scripts/gUnk_08011BE4.inc delete mode 100644 data/scripts/gUnk_08011C04.inc delete mode 100644 data/scripts/gUnk_08011D28.inc delete mode 100644 data/scripts/gUnk_08011DD4.inc delete mode 100644 data/scripts/gUnk_08011E04.inc delete mode 100644 data/scripts/gUnk_08011E80.inc delete mode 100644 data/scripts/gUnk_08011F0C.inc delete mode 100644 data/scripts/gUnk_08011F98.inc delete mode 100644 data/scripts/gUnk_08012024.inc delete mode 100644 data/scripts/gUnk_08012091.inc delete mode 100644 data/scripts/gUnk_080120B0.inc delete mode 100644 data/scripts/gUnk_080120ED.inc delete mode 100644 data/scripts/gUnk_080120FB.inc delete mode 100644 data/scripts/gUnk_0801213C.inc delete mode 100644 data/scripts/gUnk_080121C8.inc delete mode 100644 data/scripts/gUnk_08012200.inc delete mode 100644 data/scripts/gUnk_08012238.inc delete mode 100644 data/scripts/gUnk_08012270.inc delete mode 100644 data/scripts/gUnk_08012360.inc delete mode 100644 data/scripts/gUnk_08012480.inc create mode 100644 data/scripts/gUnk_080126FC.inc create mode 100644 data/scripts/gUnk_08012AF0.inc create mode 100644 data/scripts/gUnk_08012B18.inc create mode 100644 data/scripts/gUnk_08012B24.inc create mode 100644 data/scripts/gUnk_08012B50.inc create mode 100644 data/scripts/gUnk_08012B7C.inc delete mode 100644 data/scripts/gUnk_08012C0C.inc create mode 100644 data/scripts/gUnk_08012C68.inc delete mode 100644 data/scripts/gUnk_08012C98.inc delete mode 100644 data/scripts/gUnk_08012DA1.inc create mode 100644 data/scripts/gUnk_08012DF8.inc delete mode 100644 data/scripts/gUnk_08012EC0.inc delete mode 100644 data/scripts/gUnk_08012F0C.inc create mode 100644 data/scripts/gUnk_08012F86.inc delete mode 100644 data/scripts/gUnk_08013001.inc delete mode 100644 data/scripts/gUnk_08013003.inc delete mode 100644 data/scripts/gUnk_0801300B.inc delete mode 100644 data/scripts/gUnk_0801303C.inc delete mode 100644 data/scripts/gUnk_08013070.inc delete mode 100644 data/scripts/gUnk_08013081.inc delete mode 100644 data/scripts/gUnk_08013090.inc delete mode 100644 data/scripts/gUnk_08013188.inc rename data/scripts/{gUnk_080131AC.inc => gUnk_0801319A.inc} (69%) create mode 100644 data/scripts/gUnk_0801330C.inc create mode 100644 data/scripts/gUnk_08013494.inc create mode 100644 data/scripts/gUnk_08013650.inc create mode 100644 data/scripts/gUnk_080136B4.inc delete mode 100644 data/scripts/gUnk_080137DA.inc create mode 100644 data/scripts/gUnk_08013AA6.inc delete mode 100644 data/scripts/gUnk_08013B70.inc create mode 100644 data/scripts/gUnk_08013D04.inc create mode 100644 data/scripts/gUnk_08013D44.inc create mode 100644 data/scripts/gUnk_08013D84.inc create mode 100644 data/scripts/gUnk_08013DC4.inc create mode 100644 data/scripts/gUnk_08013E28.inc create mode 100644 data/scripts/gUnk_080140B8.inc delete mode 100644 data/scripts/gUnk_080140F8.inc create mode 100644 data/scripts/gUnk_08014198.inc rename data/scripts/{gUnk_080142B0.inc => gUnk_08014248.inc} (54%) delete mode 100644 data/scripts/gUnk_08014274.inc delete mode 100644 data/scripts/gUnk_08014402.inc delete mode 100644 data/scripts/gUnk_08014548.inc create mode 100644 data/scripts/gUnk_08014588.inc delete mode 100644 data/scripts/gUnk_080145A0.inc delete mode 100644 data/scripts/gUnk_08014628.inc delete mode 100644 data/scripts/gUnk_080148F0.inc delete mode 100644 data/scripts/gUnk_08014994.inc delete mode 100644 data/scripts/gUnk_08014A28.inc delete mode 100644 data/scripts/gUnk_08014A54.inc delete mode 100644 data/scripts/gUnk_08014A80.inc delete mode 100644 data/scripts/gUnk_08014AC4.inc delete mode 100644 data/scripts/gUnk_08014C2C.inc delete mode 100644 data/scripts/gUnk_08014C94.inc delete mode 100644 data/scripts/gUnk_08014E50.inc delete mode 100644 data/scripts/gUnk_08014ECC.inc delete mode 100644 data/scripts/gUnk_08014EF8.inc delete mode 100644 data/scripts/gUnk_08014F30.inc delete mode 100644 data/scripts/gUnk_08014FBC.inc delete mode 100644 data/scripts/gUnk_08015001.inc delete mode 100644 data/scripts/gUnk_08015087.inc delete mode 100644 data/scripts/gUnk_080150EF.inc create mode 100644 data/scripts/gUnk_080152DC.inc create mode 100644 data/scripts/gUnk_08015304.inc rename data/scripts/{gUnk_0800E9F4.inc => gUnk_08015338.inc} (66%) create mode 100644 data/scripts/gUnk_08015360.inc create mode 100644 data/scripts/gUnk_08015384.inc create mode 100644 data/scripts/gUnk_0801548E.inc create mode 100644 data/scripts/gUnk_080155F4.inc delete mode 100644 data/scripts/gUnk_080156A0.inc create mode 100644 data/scripts/gUnk_08015918.inc create mode 100644 data/scripts/gUnk_08015A7C.inc create mode 100644 data/scripts/gUnk_08015AA0.inc create mode 100644 data/scripts/gUnk_08015C7C.inc create mode 100644 data/scripts/gUnk_08015F80.inc create mode 100644 data/scripts/gUnk_08016004.inc delete mode 100644 data/scripts/gUnk_08016021.inc create mode 100644 data/scripts/gUnk_08016030.inc create mode 100644 data/scripts/gUnk_08016062.inc create mode 100644 data/scripts/gUnk_0801609E.inc delete mode 100644 data/scripts/gUnk_080160EA.inc delete mode 100644 data/scripts/gUnk_0801613C.inc delete mode 100644 data/scripts/gUnk_08016190.inc delete mode 100644 data/scripts/gUnk_080161E8.inc create mode 100644 data/scripts/gUnk_0801637C.inc delete mode 100644 data/scripts/gUnk_0801637D.inc delete mode 100644 data/scripts/gUnk_08016384.inc delete mode 100644 data/scripts/gUnk_08016408.inc create mode 100644 data/scripts/gUnk_08016482.inc create mode 100644 data/scripts/gUnk_080165A4.inc delete mode 100644 data/scripts/gUnk_080165F8.inc delete mode 100644 data/scripts/gUnk_0801660C.inc delete mode 100644 data/scripts/gUnk_08016628.inc delete mode 100644 data/scripts/gUnk_08016644.inc delete mode 100644 data/scripts/gUnk_0801666C.inc delete mode 100644 data/scripts/gUnk_080166B8.inc delete mode 100644 data/scripts/gUnk_080166FC.inc delete mode 100644 data/scripts/gUnk_08016798.inc delete mode 100644 data/scripts/gUnk_08016844.inc delete mode 100644 data/scripts/gUnk_080168E0.inc delete mode 100644 data/scripts/gUnk_080168F4.inc diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc new file mode 100644 index 00000000..36781ca8 --- /dev/null +++ b/asm/macros/scripts.inc @@ -0,0 +1,675 @@ +@ All the macro functions for scripts +@ Generated by disassemble_script.py +.macro SCRIPT_START name + .globl \name + .section .text +\name: +.endm +.macro SCRIPT_END + .short 0xffff +.endm + +.macro ScriptCommandNop + .short 0x0000 +.endm + +.macro StartScript + .short 0x0401 +.endm + +.macro StopScript + .short 0x0402 +.endm + +.macro Jump s + .short 0x0803 + .short \s +.endm + +.macro JumpIf s + .short 0x0804 + .short \s +.endm + +.macro JumpIfNot s + .short 0x0805 + .short \s +.endm + +.macro _0807E078 + .short 0x0006 +.endm + +.macro JumpAbsolute w + .short 0x0c07 + .word \w +.endm + +.macro JumpAbsoluteIf w + .short 0x0c08 + .word \w +.endm + +.macro JumpAbsoluteIfNot w + .short 0x0c09 + .word \w +.endm + +.macro _0807E0E0 a,b + .short 0x140a + .word \a + .word \b +.endm + +.macro Call w + .short 0x0c0b + .word \w +.endm + +.macro CallWithArg + .short 0x000c +.endm + +.macro LoadRoomEntityList w + .short 0x0c0d + .word \w +.endm + +.macro TestBit w + .short 0x0c0e + .word \w +.endm + +.macro CheckInventory1 s + .short 0x080f + .short \s +.endm + +.macro CheckInventory2 s + .short 0x0810 + .short \s +.endm + +.macro HasRoomItemForSale + .short 0x0411 +.endm + +.macro CheckLocalFlag s + .short 0x0812 + .short \s +.endm + +.macro CheckLocalFlagByOffset a,b + .short 0x0c13 + .short \a + .short \b +.endm + +.macro CheckGlobalFlag s + .short 0x0814 + .short \s +.endm + +.macro CheckRoomFlag s + .short 0x0815 + .short \s +.endm + +.macro CheckPlayerInRegion a,b,c + .short 0x1016 + .short \a + .short \b + .short \c +.endm + +.macro CheckPlayerInRegion2 s + .short 0x0817 + .short \s +.endm + +.macro CheckEntityInteractType + .short 0x0418 +.endm + +.macro _0807E30C + .short 0x0419 +.endm + +.macro HasRupees s + .short 0x081a + .short \s +.endm + +.macro _0807E3BC s + .short 0x081b + .short \s +.endm + +.macro _0807E3E8 + .short 0x041c +.endm + +.macro CheckKinstoneFused s + .short 0x081d + .short \s +.endm + +.macro BuyItem a,b + .short 0x0c1e + .short \a + .short \b +.endm + +.macro _0807E48C s + .short 0x081f + .short \s +.endm + +.macro _0807E4CC w + .short 0x0c20 + .word \w +.endm + +.macro _0807E4EC w + .short 0x0c21 + .word \w +.endm + +.macro _0807E514 w + .short 0x0c22 + .word \w +.endm + +.macro CheckPlayerFlags w + .short 0x0c23 + .word \w +.endm + +.macro _0807E564 + .short 0x0424 +.endm + +.macro EntityHasHeight + .short 0x0425 +.endm + +.macro ComparePlayerAction s + .short 0x0826 + .short \s +.endm + +.macro ComparePlayerAnimationState s + .short 0x0827 + .short \s +.endm + +.macro _0807E5F8 w + .short 0x0c28 + .word \w +.endm + +.macro _0807E610 w + .short 0x0c29 + .word \w +.endm + +.macro SetLocalFlag s + .short 0x082a + .short \s +.endm + +.macro SetLocalFlagByOffset a,b + .short 0x0c2b + .short \a + .short \b +.endm + +.macro ClearLocalFlag s + .short 0x082c + .short \s +.endm + +.macro SetGlobalFlag s + .short 0x082d + .short \s +.endm + +.macro ClearGlobalFlag s + .short 0x082e + .short \s +.endm + +.macro SetRoomFlag s + .short 0x082f + .short \s +.endm + +.macro ClearRoomFlag s + .short 0x0830 + .short \s +.endm + +.macro Wait s + .short 0x0831 + .short \s +.endm + +.macro WaitForSomething w + .short 0x0c32 + .word \w +.endm + +.macro WaitForSomething2 w + .short 0x0c33 + .word \w +.endm + +.macro WaitPlayerAction8 + .short 0x0434 +.endm + +.macro WaitForPlayerAction0x17 + .short 0x0435 +.endm + +.macro WaitFor_1 + .short 0x0436 +.endm + +.macro WaitFor_2 + .short 0x0437 +.endm + +.macro _0807E778 s + .short 0x0838 + .short \s +.endm + +.macro _0807E788 w + .short 0x0c39 + .word \w +.endm + +.macro _0807E79C + .short 0x043a +.endm + +.macro ScriptCommandNop2 s + .short 0x083b + .short \s +.endm + +.macro DoFade4 + .short 0x043c +.endm + +.macro DoFade5 + .short 0x043d +.endm + +.macro DoFade6 + .short 0x043e +.endm + +.macro DoFade7 + .short 0x043f +.endm + +.macro _0807E800 w + .short 0x0c40 + .word \w +.endm + +.macro _0807E80C w + .short 0x0c41 + .word \w +.endm + +.macro _0807E858 + .short 0x0042 +.endm + +.macro _0807E864 + .short 0x0443 +.endm + +.macro _0807E878 + .short 0x0444 +.endm + +.macro _0807E888 + .short 0x0445 +.endm + +.macro SetPlayerAction w + .short 0x0c46 + .word \w +.endm + +.macro StartPlayerScript w + .short 0x0c47 + .word \w +.endm + +.macro _0807E8D4 s + .short 0x0848 + .short \s +.endm + +.macro _0807E8E4_0 + .short 0x0449 +.endm + +.macro _0807E8E4_1 + .short 0x044a +.endm + +.macro _0807E8E4_2 + .short 0x044b +.endm + +.macro _0807E8E4_3 + .short 0x044c +.endm + +.macro _0807E908 s + .short 0x084d + .short \s +.endm + +.macro _0807E914 w + .short 0x0c4e + .word \w +.endm + +.macro _0807E924 + .short 0x044f +.endm + +.macro _0807E930 s + .short 0x0850 + .short \s +.endm + +.macro _0807E944 + .short 0x0451 +.endm + +.macro _0807E974 s + .short 0x0852 + .short \s +.endm + +.macro _0807E9D4 + .short 0x0453 +.endm + +.macro _0807E9DC + .short 0x0454 +.endm + +.macro _0807E9E4 s + .short 0x0855 + .short \s +.endm + +.macro _0807E9F0 + .short 0x0456 +.endm + +.macro _0807EA4C + .short 0x0457 +.endm + +.macro _0807EA88 s + .short 0x0858 + .short \s +.endm + +.macro _0807EA94 + .short 0x0459 +.endm + +.macro TextboxNoOverlapFollow s + .short 0x085a + .short \s +.endm + +.macro TextboxNoOverlap s + .short 0x085b + .short \s +.endm + +.macro TextboxNoOverlapFollowPos + .short 0x005c +.endm + +.macro _0807EAF0 + .short 0x005d +.endm + +.macro TextboxNoOverlapVar + .short 0x045e +.endm + +.macro _0807EB28 s + .short 0x085f + .short \s +.endm + +.macro _0807EB38 + .short 0x0460 +.endm + +.macro _0807EB44 s + .short 0x0861 + .short \s +.endm + +.macro _0807EB4C a,b + .short 0x0c62 + .short \a + .short \b +.endm + +.macro _0807EB74 + .short 0x0463 +.endm + +.macro _0807EB8C + .short 0x0464 +.endm + +.macro SetEntityDirection s + .short 0x0865 + .short \s +.endm + +.macro SetEntityDirectionWithAnimationState s + .short 0x0866 + .short \s +.endm + +.macro SetEntityNonPlanarMovement s + .short 0x0867 + .short \s +.endm + +.macro SetEntity0x20 w + .short 0x0c68 + .word \w +.endm + +.macro SetEntityPositionRelative w + .short 0x0c69 + .word \w +.endm + +.macro SetEntityPosition a,b + .short 0x0c6a + .short \a + .short \b +.endm + +.macro MoveEntityToPlayer + .short 0x046b +.endm + +.macro ScriptCommandNop3 + .short 0x046c +.endm + +.macro _0807EC1C s + .short 0x086d + .short \s +.endm + +.macro _0807EC64 s + .short 0x086e + .short \s +.endm + +.macro _0807EC94 s + .short 0x086f + .short \s +.endm + +.macro _0807ECC4 s + .short 0x0870 + .short \s +.endm + +.macro _0807ECF4 s + .short 0x0871 + .short \s +.endm + +.macro _0807ED24 a,b,c + .short 0x1072 + .short \a + .short \b + .short \c +.endm + +.macro _0807EDD4 a,b + .short 0x0c73 + .short \a + .short \b +.endm + +.macro _0807EE04 a,b + .short 0x0c74 + .short \a + .short \b +.endm + +.macro _0807EE30 + .short 0x0475 +.endm + +.macro _0807EEB4 + .short 0x0476 +.endm + +.macro _0807EEF4 a,b + .short 0x0c77 + .short \a + .short \b +.endm + +.macro _0807EF3C a,b + .short 0x0c78 + .short \a + .short \b +.endm + +.macro _0807EF80 s + .short 0x0879 + .short \s +.endm + +.macro _0807EF90 s + .short 0x087a + .short \s +.endm + +.macro SoundReq s + .short 0x087b + .short \s +.endm + +.macro SoundReq2 s + .short 0x087c + .short \s +.endm + +.macro SoundReq3 w + .short 0x0c7d + .word \w +.endm + +.macro SoundReq0x80100000 + .short 0x047e +.endm + +.macro ModRupees s + .short 0x087f + .short \s +.endm + +.macro ModHealth s + .short 0x0880 + .short \s +.endm + +.macro IncreaseMaxHealth s + .short 0x0881 + .short \s +.endm + +.macro _0807F034 s + .short 0x0882 + .short \s +.endm + +.macro _0807F050 s + .short 0x0883 + .short \s +.endm + +.macro GetInventoryValue s + .short 0x0884 + .short \s +.endm + +.macro _0807F078 a,b + .short 0x0c85 + .short \a + .short \b +.endm + +.macro _0807F088 s + .short 0x0886 + .short \s +.endm + +.macro CameraTargetEntity + .short 0x0487 +.endm + +.macro CameraTargetPlayer + .short 0x0488 +.endm + +.macro _0807F0B4 s + .short 0x0889 + .short \s +.endm + +.macro _0807F0C8 a,b + .short 0x0c8a + .short \a + .short \b +.endm + + diff --git a/data/scripts.s b/data/scripts.s index 1f07d4b8..edb0c350 100644 --- a/data/scripts.s +++ b/data/scripts.s @@ -7,2141 +7,3208 @@ .text -.include "data/scripts/gUnk_08008B5C.inc" +gUnk_08008B5C:: @ 08008B5C + .incbin "baserom.gba", 0x008B5C, 0x0000034 -.include "data/scripts/gUnk_08008B90.inc" +gUnk_08008B90:: @ 08008B90 + .incbin "baserom.gba", 0x008B90, 0x0000030 -.include "data/scripts/gUnk_08008BC0.inc" +gUnk_08008BC0:: @ 08008BC0 + .incbin "baserom.gba", 0x008BC0, 0x000008E -.include "data/scripts/gUnk_08008C4E.inc" +gUnk_08008C4E:: @ 08008C4E + .incbin "baserom.gba", 0x008C4E, 0x0000016 -.include "data/scripts/gUnk_08008C64.inc" +gUnk_08008C64:: @ 08008C64 + .incbin "baserom.gba", 0x008C64, 0x0000009 -.include "data/scripts/gUnk_08008C6D.inc" +gUnk_08008C6D:: @ 08008C6D + .incbin "baserom.gba", 0x008C6D, 0x0000011 -.include "data/scripts/gUnk_08008C7E.inc" +gUnk_08008C7E:: @ 08008C7E + .incbin "baserom.gba", 0x008C7E, 0x000003B -.include "data/scripts/gUnk_08008CB9.inc" +gUnk_08008CB9:: @ 08008CB9 + .incbin "baserom.gba", 0x008CB9, 0x0000097 -.include "data/scripts/gUnk_08008D50.inc" +gUnk_08008D50:: @ 08008D50 + .incbin "baserom.gba", 0x008D50, 0x000003C -.include "data/scripts/gUnk_08008D8C.inc" +gUnk_08008D8C:: @ 08008D8C + .incbin "baserom.gba", 0x008D8C, 0x0000034 -.include "data/scripts/gUnk_08008DC0.inc" +gUnk_08008DC0:: @ 08008DC0 + .incbin "baserom.gba", 0x008DC0, 0x0000048 -.include "data/scripts/gUnk_08008E08.inc" +gUnk_08008E08:: @ 08008E08 + .incbin "baserom.gba", 0x008E08, 0x0000002 -.include "data/scripts/gUnk_08008E0A.inc" +gUnk_08008E0A:: @ 08008E0A + .incbin "baserom.gba", 0x008E0A, 0x0000102 -.include "data/scripts/gUnk_08008F0C.inc" +gUnk_08008F0C:: @ 08008F0C + .incbin "baserom.gba", 0x008F0C, 0x000000A -.include "data/scripts/gUnk_08008F16.inc" +gUnk_08008F16:: @ 08008F16 + .incbin "baserom.gba", 0x008F16, 0x0000010 -.include "data/scripts/gUnk_08008F26.inc" +gUnk_08008F26:: @ 08008F26 + .incbin "baserom.gba", 0x008F26, 0x000006A -.include "data/scripts/gUnk_08008F90.inc" +gUnk_08008F90:: @ 08008F90 + .incbin "baserom.gba", 0x008F90, 0x0000030 -.include "data/scripts/gUnk_08008FC0.inc" +gUnk_08008FC0:: @ 08008FC0 + .incbin "baserom.gba", 0x008FC0, 0x0000011 -.include "data/scripts/gUnk_08008FD1.inc" +gUnk_08008FD1:: @ 08008FD1 + .incbin "baserom.gba", 0x008FD1, 0x000002B -.include "data/scripts/gUnk_08008FFC.inc" +gUnk_08008FFC:: @ 08008FFC + .incbin "baserom.gba", 0x008FFC, 0x000000C -.include "data/scripts/gUnk_08009008.inc" +gUnk_08009008:: @ 08009008 + .incbin "baserom.gba", 0x009008, 0x0000017 -.include "data/scripts/gUnk_0800901F.inc" +gUnk_0800901F:: @ 0800901F + .incbin "baserom.gba", 0x00901F, 0x000001D -.include "data/scripts/gUnk_0800903C.inc" +gUnk_0800903C:: @ 0800903C + .incbin "baserom.gba", 0x00903C, 0x0000044 -.include "data/scripts/gUnk_08009080.inc" +gUnk_08009080:: @ 08009080 + .incbin "baserom.gba", 0x009080, 0x000005B -.include "data/scripts/gUnk_080090DB.inc" +gUnk_080090DB:: @ 080090DB + .incbin "baserom.gba", 0x0090DB, 0x00000BD -.include "data/scripts/gUnk_08009198.inc" +gUnk_08009198:: @ 08009198 + .incbin "baserom.gba", 0x009198, 0x000006F -.include "data/scripts/gUnk_08009207.inc" +gUnk_08009207:: @ 08009207 + .incbin "baserom.gba", 0x009207, 0x000006D -.include "data/scripts/gUnk_08009274.inc" +gUnk_08009274:: @ 08009274 + .incbin "baserom.gba", 0x009274, 0x0000034 -.include "data/scripts/gUnk_080092A8.inc" +gUnk_080092A8:: @ 080092A8 + .incbin "baserom.gba", 0x0092A8, 0x000002C -.include "data/scripts/gUnk_080092D4.inc" +gUnk_080092D4:: @ 080092D4 + .incbin "baserom.gba", 0x0092D4, 0x000001C -.include "data/scripts/gUnk_080092F0.inc" +gUnk_080092F0:: @ 080092F0 + .incbin "baserom.gba", 0x0092F0, 0x0000018 -.include "data/scripts/gUnk_08009308.inc" +gUnk_08009308:: @ 08009308 + .incbin "baserom.gba", 0x009308, 0x0000010 -.include "data/scripts/gUnk_08009318.inc" +gUnk_08009318:: @ 08009318 + .incbin "baserom.gba", 0x009318, 0x0000008 -.include "data/scripts/gUnk_08009320.inc" +gUnk_08009320:: @ 08009320 + .incbin "baserom.gba", 0x009320, 0x0000020 -.include "data/scripts/gUnk_08009340.inc" +gUnk_08009340:: @ 08009340 + .incbin "baserom.gba", 0x009340, 0x0000008 -.include "data/scripts/gUnk_08009348.inc" +gUnk_08009348:: @ 08009348 + .incbin "baserom.gba", 0x009348, 0x000004B -.include "data/scripts/gUnk_08009393.inc" +gUnk_08009393:: @ 08009393 + .incbin "baserom.gba", 0x009393, 0x0000044 -.include "data/scripts/gUnk_080093D7.inc" +gUnk_080093D7:: @ 080093D7 + .incbin "baserom.gba", 0x0093D7, 0x0000030 -.include "data/scripts/gUnk_08009407.inc" +gUnk_08009407:: @ 08009407 + .incbin "baserom.gba", 0x009407, 0x000007F -.include "data/scripts/gUnk_08009486.inc" +gUnk_08009486:: @ 08009486 + .incbin "baserom.gba", 0x009486, 0x000001E -.include "data/scripts/gUnk_080094A4.inc" +gUnk_080094A4:: @ 080094A4 + .incbin "baserom.gba", 0x0094A4, 0x0000028 -.include "data/scripts/gUnk_080094CC.inc" +gUnk_080094CC:: @ 080094CC + .incbin "baserom.gba", 0x0094CC, 0x000000B -.include "data/scripts/gUnk_080094D7.inc" +gUnk_080094D7:: @ 080094D7 + .incbin "baserom.gba", 0x0094D7, 0x0000025 -.include "data/scripts/gUnk_080094FC.inc" +gUnk_080094FC:: @ 080094FC + .incbin "baserom.gba", 0x0094FC, 0x0000007 -.include "data/scripts/gUnk_08009503.inc" +gUnk_08009503:: @ 08009503 + .incbin "baserom.gba", 0x009503, 0x0000005 -.include "data/scripts/gUnk_08009508.inc" +gUnk_08009508:: @ 08009508 + .incbin "baserom.gba", 0x009508, 0x0000030 -.include "data/scripts/gUnk_08009538.inc" +gUnk_08009538:: @ 08009538 + .incbin "baserom.gba", 0x009538, 0x000003C -.include "data/scripts/gUnk_08009574.inc" +gUnk_08009574:: @ 08009574 + .incbin "baserom.gba", 0x009574, 0x0000058 -.include "data/scripts/gUnk_080095CC.inc" +gUnk_080095CC:: @ 080095CC + .incbin "baserom.gba", 0x0095CC, 0x0000060 -.include "data/scripts/gUnk_0800962C.inc" +gUnk_0800962C:: @ 0800962C + .incbin "baserom.gba", 0x00962C, 0x000006C -.include "data/scripts/gUnk_08009698.inc" +gUnk_08009698:: @ 08009698 + .incbin "baserom.gba", 0x009698, 0x000006C -.include "data/scripts/gUnk_08009704.inc" +gUnk_08009704:: @ 08009704 + .incbin "baserom.gba", 0x009704, 0x0000002 -.include "data/scripts/gUnk_08009706.inc" +gUnk_08009706:: @ 08009706 + .incbin "baserom.gba", 0x009706, 0x000003A -.include "data/scripts/gUnk_08009740.inc" +gUnk_08009740:: @ 08009740 + .incbin "baserom.gba", 0x009740, 0x0000038 -.include "data/scripts/gUnk_08009778.inc" +gUnk_08009778:: @ 08009778 + .incbin "baserom.gba", 0x009778, 0x000000E -.include "data/scripts/gUnk_08009786.inc" +gUnk_08009786:: @ 08009786 + .incbin "baserom.gba", 0x009786, 0x000001B -.include "data/scripts/gUnk_080097A1.inc" +gUnk_080097A1:: @ 080097A1 + .incbin "baserom.gba", 0x0097A1, 0x000004F -.include "data/scripts/gUnk_080097F0.inc" +gUnk_080097F0:: @ 080097F0 + .incbin "baserom.gba", 0x0097F0, 0x0000048 -.include "data/scripts/gUnk_08009838.inc" +gUnk_08009838:: @ 08009838 + .incbin "baserom.gba", 0x009838, 0x000009C -.include "data/scripts/gUnk_080098D4.inc" +gUnk_080098D4:: @ 080098D4 + .incbin "baserom.gba", 0x0098D4, 0x0000044 -.include "data/scripts/gUnk_08009918.inc" +gUnk_08009918:: @ 08009918 + .incbin "baserom.gba", 0x009918, 0x0000028 -.include "data/scripts/gUnk_08009940.inc" +gUnk_08009940:: @ 08009940 + .incbin "baserom.gba", 0x009940, 0x0000010 -.include "data/scripts/gUnk_08009950.inc" +gUnk_08009950:: @ 08009950 + .incbin "baserom.gba", 0x009950, 0x000008C -.include "data/scripts/gUnk_080099DC.inc" +gUnk_080099DC:: @ 080099DC + .incbin "baserom.gba", 0x0099DC, 0x0000028 -.include "data/scripts/gUnk_08009A04.inc" +gUnk_08009A04:: @ 08009A04 + .incbin "baserom.gba", 0x009A04, 0x0000003 -.include "data/scripts/gUnk_08009A07.inc" +gUnk_08009A07:: @ 08009A07 + .incbin "baserom.gba", 0x009A07, 0x0000025 -.include "data/scripts/gUnk_08009A2C.inc" +gUnk_08009A2C:: @ 08009A2C + .incbin "baserom.gba", 0x009A2C, 0x0000008 -.include "data/scripts/gUnk_08009A34.inc" +gUnk_08009A34:: @ 08009A34 + .incbin "baserom.gba", 0x009A34, 0x000001C -.include "data/scripts/gUnk_08009A50.inc" +gUnk_08009A50:: @ 08009A50 + .incbin "baserom.gba", 0x009A50, 0x0000027 -.include "data/scripts/gUnk_08009A77.inc" +gUnk_08009A77:: @ 08009A77 + .incbin "baserom.gba", 0x009A77, 0x000000A -.include "data/scripts/gUnk_08009A81.inc" +gUnk_08009A81:: @ 08009A81 + .incbin "baserom.gba", 0x009A81, 0x0000003 -.include "data/scripts/gUnk_08009A84.inc" +gUnk_08009A84:: @ 08009A84 + .incbin "baserom.gba", 0x009A84, 0x0000037 -.include "data/scripts/gUnk_08009ABB.inc" +gUnk_08009ABB:: @ 08009ABB + .incbin "baserom.gba", 0x009ABB, 0x000003D -.include "data/scripts/gUnk_08009AF8.inc" +gUnk_08009AF8:: @ 08009AF8 + .incbin "baserom.gba", 0x009AF8, 0x0000038 -.include "data/scripts/gUnk_08009B30.inc" +gUnk_08009B30:: @ 08009B30 + .incbin "baserom.gba", 0x009B30, 0x0000033 -.include "data/scripts/gUnk_08009B63.inc" +gUnk_08009B63:: @ 08009B63 + .incbin "baserom.gba", 0x009B63, 0x0000015 -.include "data/scripts/gUnk_08009B78.inc" +gUnk_08009B78:: @ 08009B78 + .incbin "baserom.gba", 0x009B78, 0x00000F0 -.include "data/scripts/gUnk_08009C68.inc" +gUnk_08009C68:: @ 08009C68 + .incbin "baserom.gba", 0x009C68, 0x0000017 -.include "data/scripts/gUnk_08009C7F.inc" +gUnk_08009C7F:: @ 08009C7F + .incbin "baserom.gba", 0x009C7F, 0x000001F -.include "data/scripts/gUnk_08009C9E.inc" +gUnk_08009C9E:: @ 08009C9E + .incbin "baserom.gba", 0x009C9E, 0x0000062 -.include "data/scripts/gUnk_08009D00.inc" +gUnk_08009D00:: @ 08009D00 + .incbin "baserom.gba", 0x009D00, 0x000006C -.include "data/scripts/gUnk_08009D6C.inc" +gUnk_08009D6C:: @ 08009D6C + .incbin "baserom.gba", 0x009D6C, 0x000000B -.include "data/scripts/gUnk_08009D77.inc" +gUnk_08009D77:: @ 08009D77 + .incbin "baserom.gba", 0x009D77, 0x0000039 -.include "data/scripts/gUnk_08009DB0.inc" +gUnk_08009DB0:: @ 08009DB0 + .incbin "baserom.gba", 0x009DB0, 0x000003C -.include "data/scripts/gUnk_08009DEC.inc" +gUnk_08009DEC:: @ 08009DEC + .incbin "baserom.gba", 0x009DEC, 0x000004C -.include "data/scripts/gUnk_08009E38.inc" +gUnk_08009E38:: @ 08009E38 + .incbin "baserom.gba", 0x009E38, 0x0000020 -.include "data/scripts/gUnk_08009E58.inc" +gUnk_08009E58:: @ 08009E58 + .incbin "baserom.gba", 0x009E58, 0x0000030 -.include "data/scripts/gUnk_08009E88.inc" +gUnk_08009E88:: @ 08009E88 + .incbin "baserom.gba", 0x009E88, 0x0000016 -.include "data/scripts/gUnk_08009E9E.inc" +gUnk_08009E9E:: @ 08009E9E + .incbin "baserom.gba", 0x009E9E, 0x000000B -.include "data/scripts/gUnk_08009EA9.inc" +gUnk_08009EA9:: @ 08009EA9 + .incbin "baserom.gba", 0x009EA9, 0x000000E -.include "data/scripts/gUnk_08009EB7.inc" +gUnk_08009EB7:: @ 08009EB7 + .incbin "baserom.gba", 0x009EB7, 0x0000015 -.include "data/scripts/gUnk_08009ECC.inc" +gUnk_08009ECC:: @ 08009ECC + .incbin "baserom.gba", 0x009ECC, 0x0000024 -.include "data/scripts/gUnk_08009EF0.inc" +gUnk_08009EF0:: @ 08009EF0 + .incbin "baserom.gba", 0x009EF0, 0x0000017 -.include "data/scripts/gUnk_08009F07.inc" +gUnk_08009F07:: @ 08009F07 + .incbin "baserom.gba", 0x009F07, 0x000000D -.include "data/scripts/gUnk_08009F14.inc" +gUnk_08009F14:: @ 08009F14 + .incbin "baserom.gba", 0x009F14, 0x0000025 -.include "data/scripts/gUnk_08009F39.inc" +gUnk_08009F39:: @ 08009F39 + .incbin "baserom.gba", 0x009F39, 0x0000039 -.include "data/scripts/gUnk_08009F72.inc" +gUnk_08009F72:: @ 08009F72 + .incbin "baserom.gba", 0x009F72, 0x00000F2 -.include "data/scripts/gUnk_0800A064.inc" +gUnk_0800A064:: @ 0800A064 + .incbin "baserom.gba", 0x00A064, 0x000001D -.include "data/scripts/gUnk_0800A081.inc" +gUnk_0800A081:: @ 0800A081 + .incbin "baserom.gba", 0x00A081, 0x0000033 -.include "data/scripts/gUnk_0800A0B4.inc" +gUnk_0800A0B4:: @ 0800A0B4 + .incbin "baserom.gba", 0x00A0B4, 0x0000048 -.include "data/scripts/gUnk_0800A0FC.inc" +gUnk_0800A0FC:: @ 0800A0FC + .incbin "baserom.gba", 0x00A0FC, 0x000000E -.include "data/scripts/gUnk_0800A10A.inc" +gUnk_0800A10A:: @ 0800A10A + .incbin "baserom.gba", 0x00A10A, 0x0000005 -.include "data/scripts/gUnk_0800A10F.inc" +gUnk_0800A10F:: @ 0800A10F + .incbin "baserom.gba", 0x00A10F, 0x0000015 -.include "data/scripts/gUnk_0800A124.inc" +gUnk_0800A124:: @ 0800A124 + .incbin "baserom.gba", 0x00A124, 0x0000010 -.include "data/scripts/gUnk_0800A134.inc" +gUnk_0800A134:: @ 0800A134 + .incbin "baserom.gba", 0x00A134, 0x0000080 -.include "data/scripts/gUnk_0800A1B4.inc" +gUnk_0800A1B4:: @ 0800A1B4 + .incbin "baserom.gba", 0x00A1B4, 0x0000024 -.include "data/scripts/gUnk_0800A1D8.inc" +gUnk_0800A1D8:: @ 0800A1D8 + .incbin "baserom.gba", 0x00A1D8, 0x000004C -.include "data/scripts/gUnk_0800A224.inc" +gUnk_0800A224:: @ 0800A224 + .incbin "baserom.gba", 0x00A224, 0x000003C -.include "data/scripts/gUnk_0800A260.inc" +gUnk_0800A260:: @ 0800A260 + .incbin "baserom.gba", 0x00A260, 0x00000E0 -.include "data/scripts/gUnk_0800A340.inc" +gUnk_0800A340:: @ 0800A340 + .incbin "baserom.gba", 0x00A340, 0x0000063 -.include "data/scripts/gUnk_0800A3A3.inc" +gUnk_0800A3A3:: @ 0800A3A3 + .incbin "baserom.gba", 0x00A3A3, 0x0000006 -.include "data/scripts/gUnk_0800A3A9.inc" +gUnk_0800A3A9:: @ 0800A3A9 + .incbin "baserom.gba", 0x00A3A9, 0x0000001 -.include "data/scripts/gUnk_0800A3AA.inc" +gUnk_0800A3AA:: @ 0800A3AA + .incbin "baserom.gba", 0x00A3AA, 0x000002E -.include "data/scripts/gUnk_0800A3D8.inc" +gUnk_0800A3D8:: @ 0800A3D8 + .incbin "baserom.gba", 0x00A3D8, 0x0000128 -.include "data/scripts/gUnk_0800A500.inc" +gUnk_0800A500:: @ 0800A500 + .incbin "baserom.gba", 0x00A500, 0x0000090 -.include "data/scripts/gUnk_0800A590.inc" +gUnk_0800A590:: @ 0800A590 + .incbin "baserom.gba", 0x00A590, 0x0000016 -.include "data/scripts/gUnk_0800A5A6.inc" +gUnk_0800A5A6:: @ 0800A5A6 + .incbin "baserom.gba", 0x00A5A6, 0x00000B6 -.include "data/scripts/gUnk_0800A65C.inc" +gUnk_0800A65C:: @ 0800A65C + .incbin "baserom.gba", 0x00A65C, 0x0000022 -.include "data/scripts/gUnk_0800A67E.inc" +gUnk_0800A67E:: @ 0800A67E + .incbin "baserom.gba", 0x00A67E, 0x0000002 -.include "data/scripts/gUnk_0800A680.inc" +gUnk_0800A680:: @ 0800A680 + .incbin "baserom.gba", 0x00A680, 0x0000024 -.include "data/scripts/gUnk_0800A6A4.inc" +gUnk_0800A6A4:: @ 0800A6A4 + .incbin "baserom.gba", 0x00A6A4, 0x0000007 -.include "data/scripts/gUnk_0800A6AB.inc" +gUnk_0800A6AB:: @ 0800A6AB + .incbin "baserom.gba", 0x00A6AB, 0x0000029 -.include "data/scripts/gUnk_0800A6D4.inc" +gUnk_0800A6D4:: @ 0800A6D4 + .incbin "baserom.gba", 0x00A6D4, 0x0000030 -.include "data/scripts/gUnk_0800A704.inc" +gUnk_0800A704:: @ 0800A704 + .incbin "baserom.gba", 0x00A704, 0x0000030 -.include "data/scripts/gUnk_0800A734.inc" +gUnk_0800A734:: @ 0800A734 + .incbin "baserom.gba", 0x00A734, 0x0000016 -.include "data/scripts/gUnk_0800A74A.inc" +gUnk_0800A74A:: @ 0800A74A + .incbin "baserom.gba", 0x00A74A, 0x000001A -.include "data/scripts/gUnk_0800A764.inc" +gUnk_0800A764:: @ 0800A764 + .incbin "baserom.gba", 0x00A764, 0x0000080 -.include "data/scripts/gUnk_0800A7E4.inc" +gUnk_0800A7E4:: @ 0800A7E4 + .incbin "baserom.gba", 0x00A7E4, 0x0000004 -.include "data/scripts/gUnk_0800A7E8.inc" +gUnk_0800A7E8:: @ 0800A7E8 + .incbin "baserom.gba", 0x00A7E8, 0x000002E -.include "data/scripts/gUnk_0800A816.inc" +gUnk_0800A816:: @ 0800A816 + .incbin "baserom.gba", 0x00A816, 0x000000A -.include "data/scripts/gUnk_0800A820.inc" +gUnk_0800A820:: @ 0800A820 + .incbin "baserom.gba", 0x00A820, 0x000003C -.include "data/scripts/gUnk_0800A85C.inc" +gUnk_0800A85C:: @ 0800A85C + .incbin "baserom.gba", 0x00A85C, 0x000003C -.include "data/scripts/gUnk_0800A898.inc" +gUnk_0800A898:: @ 0800A898 + .incbin "baserom.gba", 0x00A898, 0x000003C -.include "data/scripts/gUnk_0800A8D4.inc" +gUnk_0800A8D4:: @ 0800A8D4 + .incbin "baserom.gba", 0x00A8D4, 0x0000034 -.include "data/scripts/gUnk_0800A908.inc" +gUnk_0800A908:: @ 0800A908 + .incbin "baserom.gba", 0x00A908, 0x0000008 -.include "data/scripts/gUnk_0800A910.inc" +gUnk_0800A910:: @ 0800A910 + .incbin "baserom.gba", 0x00A910, 0x0000054 -.include "data/scripts/gUnk_0800A964.inc" +gUnk_0800A964:: @ 0800A964 + .incbin "baserom.gba", 0x00A964, 0x0000024 -.include "data/scripts/gUnk_0800A988.inc" +gUnk_0800A988:: @ 0800A988 + .incbin "baserom.gba", 0x00A988, 0x0000024 -.include "data/scripts/gUnk_0800A9AC.inc" +gUnk_0800A9AC:: @ 0800A9AC + .incbin "baserom.gba", 0x00A9AC, 0x0000024 -.include "data/scripts/gUnk_0800A9D0.inc" +gUnk_0800A9D0:: @ 0800A9D0 + .incbin "baserom.gba", 0x00A9D0, 0x0000024 -.include "data/scripts/gUnk_0800A9F4.inc" +gUnk_0800A9F4:: @ 0800A9F4 + .incbin "baserom.gba", 0x00A9F4, 0x000000F -.include "data/scripts/gUnk_0800AA03.inc" +gUnk_0800AA03:: @ 0800AA03 + .incbin "baserom.gba", 0x00AA03, 0x0000045 -.include "data/scripts/gUnk_0800AA48.inc" +gUnk_0800AA48:: @ 0800AA48 + .incbin "baserom.gba", 0x00AA48, 0x0000024 -.include "data/scripts/gUnk_0800AA6C.inc" +gUnk_0800AA6C:: @ 0800AA6C + .incbin "baserom.gba", 0x00AA6C, 0x0000024 -.include "data/scripts/gUnk_0800AA90.inc" +gUnk_0800AA90:: @ 0800AA90 + .incbin "baserom.gba", 0x00AA90, 0x0000024 -.include "data/scripts/gUnk_0800AAB4.inc" +gUnk_0800AAB4:: @ 0800AAB4 + .incbin "baserom.gba", 0x00AAB4, 0x0000024 -.include "data/scripts/gUnk_0800AAD8.inc" +gUnk_0800AAD8:: @ 0800AAD8 + .incbin "baserom.gba", 0x00AAD8, 0x0000030 -.include "data/scripts/gUnk_0800AB08.inc" +gUnk_0800AB08:: @ 0800AB08 + .incbin "baserom.gba", 0x00AB08, 0x000001B -.include "data/scripts/gUnk_0800AB23.inc" +gUnk_0800AB23:: @ 0800AB23 + .incbin "baserom.gba", 0x00AB23, 0x000002C -.include "data/scripts/gUnk_0800AB4F.inc" +gUnk_0800AB4F:: @ 0800AB4F + .incbin "baserom.gba", 0x00AB4F, 0x00000A1 -.include "data/scripts/gUnk_0800ABF0.inc" +gUnk_0800ABF0:: @ 0800ABF0 + .incbin "baserom.gba", 0x00ABF0, 0x0000034 -.include "data/scripts/gUnk_0800AC24.inc" +gUnk_0800AC24:: @ 0800AC24 + .incbin "baserom.gba", 0x00AC24, 0x0000049 -.include "data/scripts/gUnk_0800AC6D.inc" +gUnk_0800AC6D:: @ 0800AC6D + .incbin "baserom.gba", 0x00AC6D, 0x0000048 -.include "data/scripts/gUnk_0800ACB5.inc" +gUnk_0800ACB5:: @ 0800ACB5 + .incbin "baserom.gba", 0x00ACB5, 0x0000007 -.include "data/scripts/gUnk_0800ACBC.inc" +gUnk_0800ACBC:: @ 0800ACBC + .incbin "baserom.gba", 0x00ACBC, 0x0000024 -.include "data/scripts/gUnk_0800ACE0.inc" +gUnk_0800ACE0:: @ 0800ACE0 + .incbin "baserom.gba", 0x00ACE0, 0x0000074 -.include "data/scripts/gUnk_0800AD54.inc" +gUnk_0800AD54:: @ 0800AD54 + .incbin "baserom.gba", 0x00AD54, 0x0000020 -.include "data/scripts/gUnk_0800AD74.inc" +gUnk_0800AD74:: @ 0800AD74 + .incbin "baserom.gba", 0x00AD74, 0x0000033 -.include "data/scripts/gUnk_0800ADA7.inc" +gUnk_0800ADA7:: @ 0800ADA7 + .incbin "baserom.gba", 0x00ADA7, 0x000000D -.include "data/scripts/gUnk_0800ADB4.inc" +gUnk_0800ADB4:: @ 0800ADB4 + .incbin "baserom.gba", 0x00ADB4, 0x00000F0 -.include "data/scripts/gUnk_0800AEA4.inc" +gUnk_0800AEA4:: @ 0800AEA4 + .incbin "baserom.gba", 0x00AEA4, 0x0000038 -.include "data/scripts/gUnk_0800AEDC.inc" +gUnk_0800AEDC:: @ 0800AEDC + .incbin "baserom.gba", 0x00AEDC, 0x000003C -.include "data/scripts/gUnk_0800AF18.inc" +gUnk_0800AF18:: @ 0800AF18 + .incbin "baserom.gba", 0x00AF18, 0x000002C -.include "data/scripts/gUnk_0800AF44.inc" +gUnk_0800AF44:: @ 0800AF44 + .incbin "baserom.gba", 0x00AF44, 0x0000024 -.include "data/scripts/gUnk_0800AF68.inc" +gUnk_0800AF68:: @ 0800AF68 + .incbin "baserom.gba", 0x00AF68, 0x0000016 -.include "data/scripts/gUnk_0800AF7E.inc" +gUnk_0800AF7E:: @ 0800AF7E + .incbin "baserom.gba", 0x00AF7E, 0x000000E -.include "data/scripts/gUnk_0800AF8C.inc" +gUnk_0800AF8C:: @ 0800AF8C + .incbin "baserom.gba", 0x00AF8C, 0x000001B -.include "data/scripts/gUnk_0800AFA7.inc" +gUnk_0800AFA7:: @ 0800AFA7 + .incbin "baserom.gba", 0x00AFA7, 0x0000009 -.include "data/scripts/gUnk_0800AFB0.inc" +gUnk_0800AFB0:: @ 0800AFB0 + .incbin "baserom.gba", 0x00AFB0, 0x0000038 -.include "data/scripts/gUnk_0800AFE8.inc" +gUnk_0800AFE8:: @ 0800AFE8 + .incbin "baserom.gba", 0x00AFE8, 0x0000024 -.include "data/scripts/gUnk_0800B00C.inc" +gUnk_0800B00C:: @ 0800B00C + .incbin "baserom.gba", 0x00B00C, 0x00000A0 -.include "data/scripts/gUnk_0800B0AC.inc" +gUnk_0800B0AC:: @ 0800B0AC + .incbin "baserom.gba", 0x00B0AC, 0x0000004 -.include "data/scripts/gUnk_0800B0B0.inc" +gUnk_0800B0B0:: @ 0800B0B0 + .incbin "baserom.gba", 0x00B0B0, 0x0000020 -.include "data/scripts/gUnk_0800B0D0.inc" +gUnk_0800B0D0:: @ 0800B0D0 + .incbin "baserom.gba", 0x00B0D0, 0x00000A7 -.include "data/scripts/gUnk_0800B177.inc" +gUnk_0800B177:: @ 0800B177 + .incbin "baserom.gba", 0x00B177, 0x0000005 -.include "data/scripts/gUnk_0800B17C.inc" +gUnk_0800B17C:: @ 0800B17C + .incbin "baserom.gba", 0x00B17C, 0x0000044 -.include "data/scripts/gUnk_0800B1C0.inc" +gUnk_0800B1C0:: @ 0800B1C0 + .incbin "baserom.gba", 0x00B1C0, 0x0000040 -.include "data/scripts/gUnk_0800B200.inc" +gUnk_0800B200:: @ 0800B200 + .incbin "baserom.gba", 0x00B200, 0x0000054 -.include "data/scripts/gUnk_0800B254.inc" +gUnk_0800B254:: @ 0800B254 + .incbin "baserom.gba", 0x00B254, 0x0000030 -.include "data/scripts/gUnk_0800B284.inc" +gUnk_0800B284:: @ 0800B284 + .incbin "baserom.gba", 0x00B284, 0x0000030 -.include "data/scripts/gUnk_0800B2B4.inc" +gUnk_0800B2B4:: @ 0800B2B4 + .incbin "baserom.gba", 0x00B2B4, 0x0000054 -.include "data/scripts/gUnk_0800B308.inc" +gUnk_0800B308:: @ 0800B308 + .incbin "baserom.gba", 0x00B308, 0x000001A -.include "data/scripts/gUnk_0800B322.inc" +gUnk_0800B322:: @ 0800B322 + .incbin "baserom.gba", 0x00B322, 0x0000007 -.include "data/scripts/gUnk_0800B329.inc" +gUnk_0800B329:: @ 0800B329 + .incbin "baserom.gba", 0x00B329, 0x000001F -.include "data/scripts/gUnk_0800B348.inc" +gUnk_0800B348:: @ 0800B348 + .incbin "baserom.gba", 0x00B348, 0x0000014 -.include "data/scripts/gUnk_0800B35C.inc" +gUnk_0800B35C:: @ 0800B35C + .incbin "baserom.gba", 0x00B35C, 0x0000018 -.include "data/scripts/gUnk_0800B374.inc" +gUnk_0800B374:: @ 0800B374 + .incbin "baserom.gba", 0x00B374, 0x0000030 -.include "data/scripts/gUnk_0800B3A4.inc" +gUnk_0800B3A4:: @ 0800B3A4 + .incbin "baserom.gba", 0x00B3A4, 0x000006B -.include "data/scripts/gUnk_0800B40F.inc" +gUnk_0800B40F:: @ 0800B40F + .incbin "baserom.gba", 0x00B40F, 0x000000D -.include "data/scripts/gUnk_0800B41C.inc" +gUnk_0800B41C:: @ 0800B41C + .incbin "baserom.gba", 0x00B41C, 0x0000090 -.include "data/scripts/gUnk_0800B4AC.inc" +gUnk_0800B4AC:: @ 0800B4AC + .incbin "baserom.gba", 0x00B4AC, 0x000005C -.include "data/scripts/gUnk_0800B508.inc" +gUnk_0800B508:: @ 0800B508 + .incbin "baserom.gba", 0x00B508, 0x0000007 -.include "data/scripts/gUnk_0800B50F.inc" +gUnk_0800B50F:: @ 0800B50F + .incbin "baserom.gba", 0x00B50F, 0x000003D -.include "data/scripts/gUnk_0800B54C.inc" +gUnk_0800B54C:: @ 0800B54C + .incbin "baserom.gba", 0x00B54C, 0x0000028 -.include "data/scripts/gUnk_0800B574.inc" +gUnk_0800B574:: @ 0800B574 + .incbin "baserom.gba", 0x00B574, 0x0000050 -.include "data/scripts/gUnk_0800B5C4.inc" +gUnk_0800B5C4:: @ 0800B5C4 + .incbin "baserom.gba", 0x00B5C4, 0x0000028 -.include "data/scripts/gUnk_0800B5EC.inc" +gUnk_0800B5EC:: @ 0800B5EC + .incbin "baserom.gba", 0x00B5EC, 0x0000028 -.include "data/scripts/gUnk_0800B614.inc" +gUnk_0800B614:: @ 0800B614 + .incbin "baserom.gba", 0x00B614, 0x00000B4 -.include "data/scripts/gUnk_0800B6C8.inc" +gUnk_0800B6C8:: @ 0800B6C8 + .incbin "baserom.gba", 0x00B6C8, 0x0000040 -.include "data/scripts/gUnk_0800B708.inc" +gUnk_0800B708:: @ 0800B708 + .incbin "baserom.gba", 0x00B708, 0x0000017 -.include "data/scripts/gUnk_0800B71F.inc" +gUnk_0800B71F:: @ 0800B71F + .incbin "baserom.gba", 0x00B71F, 0x0000011 -.include "data/scripts/gUnk_0800B730.inc" +gUnk_0800B730:: @ 0800B730 + .incbin "baserom.gba", 0x00B730, 0x0000094 -.include "data/scripts/gUnk_0800B7C4.inc" +gUnk_0800B7C4:: @ 0800B7C4 + .incbin "baserom.gba", 0x00B7C4, 0x000008B -.include "data/scripts/gUnk_0800B84F.inc" +gUnk_0800B84F:: @ 0800B84F + .incbin "baserom.gba", 0x00B84F, 0x0000012 -.include "data/scripts/gUnk_0800B861.inc" +gUnk_0800B861:: @ 0800B861 + .incbin "baserom.gba", 0x00B861, 0x0000027 -.include "data/scripts/gUnk_0800B888.inc" +gUnk_0800B888:: @ 0800B888 + .incbin "baserom.gba", 0x00B888, 0x0000018 -.include "data/scripts/gUnk_0800B8A0.inc" +gUnk_0800B8A0:: @ 0800B8A0 + .incbin "baserom.gba", 0x00B8A0, 0x0000018 -.include "data/scripts/gUnk_0800B8B8.inc" +gUnk_0800B8B8:: @ 0800B8B8 + .incbin "baserom.gba", 0x00B8B8, 0x000002C -.include "data/scripts/gUnk_0800B8E4.inc" +gUnk_0800B8E4:: @ 0800B8E4 + .incbin "baserom.gba", 0x00B8E4, 0x0000022 -.include "data/scripts/gUnk_0800B906.inc" +gUnk_0800B906:: @ 0800B906 + .incbin "baserom.gba", 0x00B906, 0x0000016 -.include "data/scripts/gUnk_0800B91C.inc" +gUnk_0800B91C:: @ 0800B91C + .incbin "baserom.gba", 0x00B91C, 0x0000048 -.include "data/scripts/gUnk_0800B964.inc" +gUnk_0800B964:: @ 0800B964 + .incbin "baserom.gba", 0x00B964, 0x0000050 -.include "data/scripts/gUnk_0800B9B4.inc" +gUnk_0800B9B4:: @ 0800B9B4 + .incbin "baserom.gba", 0x00B9B4, 0x0000088 -.include "data/scripts/gUnk_0800BA3C.inc" +gUnk_0800BA3C:: @ 0800BA3C + .incbin "baserom.gba", 0x00BA3C, 0x000003C -.include "data/scripts/gUnk_0800BA78.inc" +gUnk_0800BA78:: @ 0800BA78 + .incbin "baserom.gba", 0x00BA78, 0x0000054 -.include "data/scripts/gUnk_0800BACC.inc" +gUnk_0800BACC:: @ 0800BACC + .incbin "baserom.gba", 0x00BACC, 0x0000034 -.include "data/scripts/gUnk_0800BB00.inc" +gUnk_0800BB00:: @ 0800BB00 + .incbin "baserom.gba", 0x00BB00, 0x0000008 -.include "data/scripts/gUnk_0800BB08.inc" +gUnk_0800BB08:: @ 0800BB08 + .incbin "baserom.gba", 0x00BB08, 0x0000012 -.include "data/scripts/gUnk_0800BB1A.inc" +gUnk_0800BB1A:: @ 0800BB1A + .incbin "baserom.gba", 0x00BB1A, 0x0000016 -.include "data/scripts/gUnk_0800BB30.inc" +gUnk_0800BB30:: @ 0800BB30 + .incbin "baserom.gba", 0x00BB30, 0x0000034 -.include "data/scripts/gUnk_0800BB64.inc" +gUnk_0800BB64:: @ 0800BB64 + .incbin "baserom.gba", 0x00BB64, 0x0000010 -.include "data/scripts/gUnk_0800BB74.inc" +gUnk_0800BB74:: @ 0800BB74 + .incbin "baserom.gba", 0x00BB74, 0x0000030 -.include "data/scripts/gUnk_0800BBA4.inc" +gUnk_0800BBA4:: @ 0800BBA4 + .incbin "baserom.gba", 0x00BBA4, 0x0000037 -.include "data/scripts/gUnk_0800BBDB.inc" +gUnk_0800BBDB:: @ 0800BBDB + .incbin "baserom.gba", 0x00BBDB, 0x0000001 -.include "data/scripts/gUnk_0800BBDC.inc" +gUnk_0800BBDC:: @ 0800BBDC + .incbin "baserom.gba", 0x00BBDC, 0x000002C -.include "data/scripts/gUnk_0800BC08.inc" +gUnk_0800BC08:: @ 0800BC08 + .incbin "baserom.gba", 0x00BC08, 0x000001A -.include "data/scripts/gUnk_0800BC22.inc" +gUnk_0800BC22:: @ 0800BC22 + .incbin "baserom.gba", 0x00BC22, 0x000002E -.include "data/scripts/gUnk_0800BC50.inc" +gUnk_0800BC50:: @ 0800BC50 + .incbin "baserom.gba", 0x00BC50, 0x000005E -.include "data/scripts/gUnk_0800BCAE.inc" +gUnk_0800BCAE:: @ 0800BCAE + .incbin "baserom.gba", 0x00BCAE, 0x0000009 -.include "data/scripts/gUnk_0800BCB7.inc" +gUnk_0800BCB7:: @ 0800BCB7 + .incbin "baserom.gba", 0x00BCB7, 0x0000007 -.include "data/scripts/gUnk_0800BCBE.inc" +gUnk_0800BCBE:: @ 0800BCBE + .incbin "baserom.gba", 0x00BCBE, 0x000002A -.include "data/scripts/gUnk_0800BCE8.inc" +gUnk_0800BCE8:: @ 0800BCE8 + .incbin "baserom.gba", 0x00BCE8, 0x0000020 -.include "data/scripts/gUnk_0800BD08.inc" +gUnk_0800BD08:: @ 0800BD08 + .incbin "baserom.gba", 0x00BD08, 0x0000068 -.include "data/scripts/gUnk_0800BD70.inc" +gUnk_0800BD70:: @ 0800BD70 + .incbin "baserom.gba", 0x00BD70, 0x0000008 -.include "data/scripts/gUnk_0800BD78.inc" +gUnk_0800BD78:: @ 0800BD78 + .incbin "baserom.gba", 0x00BD78, 0x0000034 -.include "data/scripts/gUnk_0800BDAC.inc" +gUnk_0800BDAC:: @ 0800BDAC + .incbin "baserom.gba", 0x00BDAC, 0x0000018 -.include "data/scripts/gUnk_0800BDC4.inc" +gUnk_0800BDC4:: @ 0800BDC4 + .incbin "baserom.gba", 0x00BDC4, 0x0000058 -.include "data/scripts/gUnk_0800BE1C.inc" +gUnk_0800BE1C:: @ 0800BE1C + .incbin "baserom.gba", 0x00BE1C, 0x0000038 -.include "data/scripts/gUnk_0800BE54.inc" +gUnk_0800BE54:: @ 0800BE54 + .incbin "baserom.gba", 0x00BE54, 0x0000078 -.include "data/scripts/gUnk_0800BECC.inc" +gUnk_0800BECC:: @ 0800BECC + .incbin "baserom.gba", 0x00BECC, 0x0000048 -.include "data/scripts/gUnk_0800BF14.inc" +gUnk_0800BF14:: @ 0800BF14 + .incbin "baserom.gba", 0x00BF14, 0x0000024 -.include "data/scripts/gUnk_0800BF38.inc" +gUnk_0800BF38:: @ 0800BF38 + .incbin "baserom.gba", 0x00BF38, 0x0000012 -.include "data/scripts/gUnk_0800BF4A.inc" +gUnk_0800BF4A:: @ 0800BF4A + .incbin "baserom.gba", 0x00BF4A, 0x0000026 -.include "data/scripts/gUnk_0800BF70.inc" +gUnk_0800BF70:: @ 0800BF70 + .incbin "baserom.gba", 0x00BF70, 0x000004F -.include "data/scripts/gUnk_0800BFBF.inc" +gUnk_0800BFBF:: @ 0800BFBF + .incbin "baserom.gba", 0x00BFBF, 0x0000022 -.include "data/scripts/gUnk_0800BFE1.inc" +gUnk_0800BFE1:: @ 0800BFE1 + .incbin "baserom.gba", 0x00BFE1, 0x0000002 -.include "data/scripts/gUnk_0800BFE3.inc" +gUnk_0800BFE3:: @ 0800BFE3 + .incbin "baserom.gba", 0x00BFE3, 0x0000021 -.include "data/scripts/gUnk_0800C004.inc" +gUnk_0800C004:: @ 0800C004 + .incbin "baserom.gba", 0x00C004, 0x0000003 -.include "data/scripts/gUnk_0800C007.inc" +gUnk_0800C007:: @ 0800C007 + .incbin "baserom.gba", 0x00C007, 0x000001D -.include "data/scripts/gUnk_0800C024.inc" +gUnk_0800C024:: @ 0800C024 + .incbin "baserom.gba", 0x00C024, 0x0000057 -.include "data/scripts/gUnk_0800C07B.inc" +gUnk_0800C07B:: @ 0800C07B + .incbin "baserom.gba", 0x00C07B, 0x0000035 -.include "data/scripts/gUnk_0800C0B0.inc" +gUnk_0800C0B0:: @ 0800C0B0 + .incbin "baserom.gba", 0x00C0B0, 0x0000017 -.include "data/scripts/gUnk_0800C0C7.inc" +gUnk_0800C0C7:: @ 0800C0C7 + .incbin "baserom.gba", 0x00C0C7, 0x000000C -.include "data/scripts/gUnk_0800C0D3.inc" +gUnk_0800C0D3:: @ 0800C0D3 + .incbin "baserom.gba", 0x00C0D3, 0x0000015 -.include "data/scripts/gUnk_0800C0E8.inc" +gUnk_0800C0E8:: @ 0800C0E8 + .incbin "baserom.gba", 0x00C0E8, 0x000002B -.include "data/scripts/gUnk_0800C113.inc" +gUnk_0800C113:: @ 0800C113 + .incbin "baserom.gba", 0x00C113, 0x0000034 -.include "data/scripts/gUnk_0800C147.inc" +gUnk_0800C147:: @ 0800C147 + .incbin "baserom.gba", 0x00C147, 0x0000019 -.include "data/scripts/gUnk_0800C160.inc" +gUnk_0800C160:: @ 0800C160 + .incbin "baserom.gba", 0x00C160, 0x0000078 -.include "data/scripts/gUnk_0800C1D8.inc" +gUnk_0800C1D8:: @ 0800C1D8 + .incbin "baserom.gba", 0x00C1D8, 0x000002C -.include "data/scripts/gUnk_0800C204.inc" +gUnk_0800C204:: @ 0800C204 + .incbin "baserom.gba", 0x00C204, 0x0000003 -.include "data/scripts/gUnk_0800C207.inc" +gUnk_0800C207:: @ 0800C207 + .incbin "baserom.gba", 0x00C207, 0x0000001 -.include "data/scripts/gUnk_0800C208.inc" +gUnk_0800C208:: @ 0800C208 + .incbin "baserom.gba", 0x00C208, 0x0000008 -.include "data/scripts/gUnk_0800C210.inc" +gUnk_0800C210:: @ 0800C210 + .incbin "baserom.gba", 0x00C210, 0x0000053 -.include "data/scripts/gUnk_0800C263.inc" +gUnk_0800C263:: @ 0800C263 + .incbin "baserom.gba", 0x00C263, 0x0000041 -.include "data/scripts/gUnk_0800C2A4.inc" +gUnk_0800C2A4:: @ 0800C2A4 + .incbin "baserom.gba", 0x00C2A4, 0x0000003 -.include "data/scripts/gUnk_0800C2A7.inc" +gUnk_0800C2A7:: @ 0800C2A7 + .incbin "baserom.gba", 0x00C2A7, 0x0000027 -.include "data/scripts/gUnk_0800C2CE.inc" +gUnk_0800C2CE:: @ 0800C2CE + .incbin "baserom.gba", 0x00C2CE, 0x0000082 -.include "data/scripts/gUnk_0800C350.inc" +gUnk_0800C350:: @ 0800C350 + .incbin "baserom.gba", 0x00C350, 0x0000046 -.include "data/scripts/gUnk_0800C396.inc" +gUnk_0800C396:: @ 0800C396 + .incbin "baserom.gba", 0x00C396, 0x0000036 -.include "data/scripts/gUnk_0800C3CC.inc" +gUnk_0800C3CC:: @ 0800C3CC + .incbin "baserom.gba", 0x00C3CC, 0x000003C -.include "data/scripts/gUnk_0800C408.inc" +gUnk_0800C408:: @ 0800C408 + .incbin "baserom.gba", 0x00C408, 0x0000008 -.include "data/scripts/gUnk_0800C410.inc" +gUnk_0800C410:: @ 0800C410 + .incbin "baserom.gba", 0x00C410, 0x000004C -.include "data/scripts/gUnk_0800C45C.inc" +gUnk_0800C45C:: @ 0800C45C + .incbin "baserom.gba", 0x00C45C, 0x0000038 -.include "data/scripts/gUnk_0800C494.inc" +gUnk_0800C494:: @ 0800C494 + .incbin "baserom.gba", 0x00C494, 0x000003C -.include "data/scripts/gUnk_0800C4D0.inc" +gUnk_0800C4D0:: @ 0800C4D0 + .incbin "baserom.gba", 0x00C4D0, 0x000000B -.include "data/scripts/gUnk_0800C4DB.inc" +gUnk_0800C4DB:: @ 0800C4DB + .incbin "baserom.gba", 0x00C4DB, 0x0000031 -.include "data/scripts/gUnk_0800C50C.inc" +gUnk_0800C50C:: @ 0800C50C + .incbin "baserom.gba", 0x00C50C, 0x0000015 -.include "data/scripts/gUnk_0800C521.inc" +gUnk_0800C521:: @ 0800C521 + .incbin "baserom.gba", 0x00C521, 0x000002F -.include "data/scripts/gUnk_0800C550.inc" +gUnk_0800C550:: @ 0800C550 + .incbin "baserom.gba", 0x00C550, 0x0000006 -.include "data/scripts/gUnk_0800C556.inc" +gUnk_0800C556:: @ 0800C556 + .incbin "baserom.gba", 0x00C556, 0x000002E -.include "data/scripts/gUnk_0800C584.inc" +gUnk_0800C584:: @ 0800C584 + .incbin "baserom.gba", 0x00C584, 0x0000016 -.include "data/scripts/gUnk_0800C59A.inc" +gUnk_0800C59A:: @ 0800C59A + .incbin "baserom.gba", 0x00C59A, 0x000002E -.include "data/scripts/gUnk_0800C5C8.inc" +gUnk_0800C5C8:: @ 0800C5C8 + .incbin "baserom.gba", 0x00C5C8, 0x0000034 -.include "data/scripts/gUnk_0800C5FC.inc" +gUnk_0800C5FC:: @ 0800C5FC + .incbin "baserom.gba", 0x00C5FC, 0x0000004 -.include "data/scripts/gUnk_0800C600.inc" +gUnk_0800C600:: @ 0800C600 + .incbin "baserom.gba", 0x00C600, 0x0000007 -.include "data/scripts/gUnk_0800C607.inc" +gUnk_0800C607:: @ 0800C607 + .incbin "baserom.gba", 0x00C607, 0x000002D -.include "data/scripts/gUnk_0800C634.inc" +gUnk_0800C634:: @ 0800C634 + .incbin "baserom.gba", 0x00C634, 0x0000092 -.include "data/scripts/gUnk_0800C6C6.inc" +gUnk_0800C6C6:: @ 0800C6C6 + .incbin "baserom.gba", 0x00C6C6, 0x00000AE -.include "data/scripts/gUnk_0800C774.inc" +gUnk_0800C774:: @ 0800C774 + .incbin "baserom.gba", 0x00C774, 0x0000005 -.include "data/scripts/gUnk_0800C779.inc" +gUnk_0800C779:: @ 0800C779 + .incbin "baserom.gba", 0x00C779, 0x000008F -.include "data/scripts/gUnk_0800C808.inc" +gUnk_0800C808:: @ 0800C808 + .incbin "baserom.gba", 0x00C808, 0x0000059 -.include "data/scripts/gUnk_0800C861.inc" +gUnk_0800C861:: @ 0800C861 + .incbin "baserom.gba", 0x00C861, 0x000004F -.include "data/scripts/gUnk_0800C8B0.inc" +gUnk_0800C8B0:: @ 0800C8B0 + .incbin "baserom.gba", 0x00C8B0, 0x000002A -.include "data/scripts/gUnk_0800C8DA.inc" +gUnk_0800C8DA:: @ 0800C8DA + .incbin "baserom.gba", 0x00C8DA, 0x0000016 -.include "data/scripts/gUnk_0800C8F0.inc" +gUnk_0800C8F0:: @ 0800C8F0 + .incbin "baserom.gba", 0x00C8F0, 0x000002C -.include "data/scripts/gUnk_0800C91C.inc" +gUnk_0800C91C:: @ 0800C91C + .incbin "baserom.gba", 0x00C91C, 0x0000015 -.include "data/scripts/gUnk_0800C931.inc" +gUnk_0800C931:: @ 0800C931 + .incbin "baserom.gba", 0x00C931, 0x0000032 -.include "data/scripts/gUnk_0800C963.inc" +gUnk_0800C963:: @ 0800C963 + .incbin "baserom.gba", 0x00C963, 0x00000A5 -.include "data/scripts/gUnk_0800CA08.inc" +gUnk_0800CA08:: @ 0800CA08 + .incbin "baserom.gba", 0x00CA08, 0x0000084 -.include "data/scripts/gUnk_0800CA8C.inc" +gUnk_0800CA8C:: @ 0800CA8C + .incbin "baserom.gba", 0x00CA8C, 0x000001E -.include "data/scripts/gUnk_0800CAAA.inc" +gUnk_0800CAAA:: @ 0800CAAA + .incbin "baserom.gba", 0x00CAAA, 0x0000012 -.include "data/scripts/gUnk_0800CABC.inc" +gUnk_0800CABC:: @ 0800CABC + .incbin "baserom.gba", 0x00CABC, 0x000004B -.include "data/scripts/gUnk_0800CB07.inc" +gUnk_0800CB07:: @ 0800CB07 + .incbin "baserom.gba", 0x00CB07, 0x000004D -.include "data/scripts/gUnk_0800CB54.inc" +gUnk_0800CB54:: @ 0800CB54 + .incbin "baserom.gba", 0x00CB54, 0x000004F -.include "data/scripts/gUnk_0800CBA3.inc" +gUnk_0800CBA3:: @ 0800CBA3 + .incbin "baserom.gba", 0x00CBA3, 0x0000031 -.include "data/scripts/gUnk_0800CBD4.inc" +gUnk_0800CBD4:: @ 0800CBD4 + .incbin "baserom.gba", 0x00CBD4, 0x0000034 -.include "data/scripts/gUnk_0800CC08.inc" +gUnk_0800CC08:: @ 0800CC08 + .incbin "baserom.gba", 0x00CC08, 0x0000005 -.include "data/scripts/gUnk_0800CC0D.inc" +gUnk_0800CC0D:: @ 0800CC0D + .incbin "baserom.gba", 0x00CC0D, 0x0000035 -.include "data/scripts/gUnk_0800CC42.inc" +gUnk_0800CC42:: @ 0800CC42 + .incbin "baserom.gba", 0x00CC42, 0x000002A -.include "data/scripts/gUnk_0800CC6C.inc" +gUnk_0800CC6C:: @ 0800CC6C + .incbin "baserom.gba", 0x00CC6C, 0x0000061 -.include "data/scripts/gUnk_0800CCCD.inc" +gUnk_0800CCCD:: @ 0800CCCD + .incbin "baserom.gba", 0x00CCCD, 0x0000010 -.include "data/scripts/gUnk_0800CCDD.inc" +gUnk_0800CCDD:: @ 0800CCDD + .incbin "baserom.gba", 0x00CCDD, 0x0000027 -.include "data/scripts/gUnk_0800CD04.inc" +gUnk_0800CD04:: @ 0800CD04 + .incbin "baserom.gba", 0x00CD04, 0x0000004 -.include "data/scripts/gUnk_0800CD08.inc" +gUnk_0800CD08:: @ 0800CD08 + .incbin "baserom.gba", 0x00CD08, 0x000005F -.include "data/scripts/gUnk_0800CD67.inc" +gUnk_0800CD67:: @ 0800CD67 + .incbin "baserom.gba", 0x00CD67, 0x0000015 -.include "data/scripts/gUnk_0800CD7C.inc" +gUnk_0800CD7C:: @ 0800CD7C + .incbin "baserom.gba", 0x00CD7C, 0x000008B -.include "data/scripts/gUnk_0800CE07.inc" +gUnk_0800CE07:: @ 0800CE07 + .incbin "baserom.gba", 0x00CE07, 0x00000FD -.include "data/scripts/gUnk_0800CF04.inc" +gUnk_0800CF04:: @ 0800CF04 + .incbin "baserom.gba", 0x00CF04, 0x0000012 -.include "data/scripts/gUnk_0800CF16.inc" +gUnk_0800CF16:: @ 0800CF16 + .incbin "baserom.gba", 0x00CF16, 0x0000035 -.include "data/scripts/gUnk_0800CF4B.inc" +gUnk_0800CF4B:: @ 0800CF4B + .incbin "baserom.gba", 0x00CF4B, 0x0000005 -.include "data/scripts/gUnk_0800CF50.inc" +gUnk_0800CF50:: @ 0800CF50 + .incbin "baserom.gba", 0x00CF50, 0x000002B -.include "data/scripts/gUnk_0800CF7B.inc" +gUnk_0800CF7B:: @ 0800CF7B + .incbin "baserom.gba", 0x00CF7B, 0x000000D -.include "data/scripts/gUnk_0800CF88.inc" +gUnk_0800CF88:: @ 0800CF88 + .incbin "baserom.gba", 0x00CF88, 0x000000D -.include "data/scripts/gUnk_0800CF95.inc" +gUnk_0800CF95:: @ 0800CF95 + .incbin "baserom.gba", 0x00CF95, 0x0000014 -.include "data/scripts/gUnk_0800CFA9.inc" +gUnk_0800CFA9:: @ 0800CFA9 + .incbin "baserom.gba", 0x00CFA9, 0x0000003 -.include "data/scripts/gUnk_0800CFAC.inc" +gUnk_0800CFAC:: @ 0800CFAC + .incbin "baserom.gba", 0x00CFAC, 0x0000065 -.include "data/scripts/gUnk_0800D011.inc" +gUnk_0800D011:: @ 0800D011 + .incbin "baserom.gba", 0x00D011, 0x000004E -.include "data/scripts/gUnk_0800D05F.inc" +gUnk_0800D05F:: @ 0800D05F + .incbin "baserom.gba", 0x00D05F, 0x000006F -.include "data/scripts/gUnk_0800D0CE.inc" +gUnk_0800D0CE:: @ 0800D0CE + .incbin "baserom.gba", 0x00D0CE, 0x0000059 -.include "data/scripts/gUnk_0800D127.inc" +gUnk_0800D127:: @ 0800D127 + .incbin "baserom.gba", 0x00D127, 0x0000069 -.include "data/scripts/gUnk_0800D190.inc" +gUnk_0800D190:: @ 0800D190 + .incbin "baserom.gba", 0x00D190, 0x0000024 -.include "data/scripts/gUnk_0800D1B4.inc" +gUnk_0800D1B4:: @ 0800D1B4 + .incbin "baserom.gba", 0x00D1B4, 0x0000010 -.include "data/scripts/gUnk_0800D1C4.inc" +gUnk_0800D1C4:: @ 0800D1C4 + .incbin "baserom.gba", 0x00D1C4, 0x0000010 -.include "data/scripts/gUnk_0800D1D4.inc" +gUnk_0800D1D4:: @ 0800D1D4 + .incbin "baserom.gba", 0x00D1D4, 0x000000C -.include "data/scripts/gUnk_0800D1E0.inc" +gUnk_0800D1E0:: @ 0800D1E0 + .incbin "baserom.gba", 0x00D1E0, 0x0000027 -.include "data/scripts/gUnk_0800D207.inc" +gUnk_0800D207:: @ 0800D207 + .incbin "baserom.gba", 0x00D207, 0x0000011 -.include "data/scripts/gUnk_0800D218.inc" +gUnk_0800D218:: @ 0800D218 + .incbin "baserom.gba", 0x00D218, 0x000003C -.include "data/scripts/gUnk_0800D254.inc" +gUnk_0800D254:: @ 0800D254 + .incbin "baserom.gba", 0x00D254, 0x0000024 -.include "data/scripts/gUnk_0800D278.inc" +gUnk_0800D278:: @ 0800D278 + .incbin "baserom.gba", 0x00D278, 0x0000056 -.include "data/scripts/gUnk_0800D2CE.inc" +gUnk_0800D2CE:: @ 0800D2CE + .incbin "baserom.gba", 0x00D2CE, 0x0000038 -.include "data/scripts/gUnk_0800D306.inc" +gUnk_0800D306:: @ 0800D306 + .incbin "baserom.gba", 0x00D306, 0x0000002 -.include "data/scripts/gUnk_0800D308.inc" +gUnk_0800D308:: @ 0800D308 + .incbin "baserom.gba", 0x00D308, 0x0000007 -.include "data/scripts/gUnk_0800D30F.inc" +gUnk_0800D30F:: @ 0800D30F + .incbin "baserom.gba", 0x00D30F, 0x0000041 -.include "data/scripts/gUnk_0800D350.inc" +gUnk_0800D350:: @ 0800D350 + .incbin "baserom.gba", 0x00D350, 0x000009C -.include "data/scripts/gUnk_0800D3EC.inc" +gUnk_0800D3EC:: @ 0800D3EC + .incbin "baserom.gba", 0x00D3EC, 0x0000028 -.include "data/scripts/gUnk_0800D414.inc" +gUnk_0800D414:: @ 0800D414 + .incbin "baserom.gba", 0x00D414, 0x0000038 -.include "data/scripts/gUnk_0800D44C.inc" +gUnk_0800D44C:: @ 0800D44C + .incbin "baserom.gba", 0x00D44C, 0x0000073 -.include "data/scripts/gUnk_0800D4BF.inc" +gUnk_0800D4BF:: @ 0800D4BF + .incbin "baserom.gba", 0x00D4BF, 0x000001D -.include "data/scripts/gUnk_0800D4DC.inc" +gUnk_0800D4DC:: @ 0800D4DC + .incbin "baserom.gba", 0x00D4DC, 0x00000C0 -.include "data/scripts/gUnk_0800D59C.inc" +gUnk_0800D59C:: @ 0800D59C + .incbin "baserom.gba", 0x00D59C, 0x0000049 -.include "data/scripts/gUnk_0800D5E5.inc" +gUnk_0800D5E5:: @ 0800D5E5 + .incbin "baserom.gba", 0x00D5E5, 0x0000027 -.include "data/scripts/gUnk_0800D60C.inc" +gUnk_0800D60C:: @ 0800D60C + .incbin "baserom.gba", 0x00D60C, 0x000001F -.include "data/scripts/gUnk_0800D62B.inc" +gUnk_0800D62B:: @ 0800D62B + .incbin "baserom.gba", 0x00D62B, 0x0000089 -.include "data/scripts/gUnk_0800D6B4.inc" +gUnk_0800D6B4:: @ 0800D6B4 + .incbin "baserom.gba", 0x00D6B4, 0x0000006 -.include "data/scripts/gUnk_0800D6BA.inc" +gUnk_0800D6BA:: @ 0800D6BA + .incbin "baserom.gba", 0x00D6BA, 0x0000016 -.include "data/scripts/gUnk_0800D6D0.inc" +gUnk_0800D6D0:: @ 0800D6D0 + .incbin "baserom.gba", 0x00D6D0, 0x0000020 -.include "data/scripts/gUnk_0800D6F0.inc" +gUnk_0800D6F0:: @ 0800D6F0 + .incbin "baserom.gba", 0x00D6F0, 0x0000012 -.include "data/scripts/gUnk_0800D702.inc" +gUnk_0800D702:: @ 0800D702 + .incbin "baserom.gba", 0x00D702, 0x0000001 -.include "data/scripts/gUnk_0800D703.inc" +gUnk_0800D703:: @ 0800D703 + .incbin "baserom.gba", 0x00D703, 0x000000D -.include "data/scripts/gUnk_0800D710.inc" +gUnk_0800D710:: @ 0800D710 + .incbin "baserom.gba", 0x00D710, 0x0000015 -.include "data/scripts/gUnk_0800D725.inc" +gUnk_0800D725:: @ 0800D725 + .incbin "baserom.gba", 0x00D725, 0x0000003 -.include "data/scripts/gUnk_0800D728.inc" +gUnk_0800D728:: @ 0800D728 + .incbin "baserom.gba", 0x00D728, 0x0000044 -.include "data/scripts/gUnk_0800D76C.inc" +gUnk_0800D76C:: @ 0800D76C + .incbin "baserom.gba", 0x00D76C, 0x0000063 -.include "data/scripts/gUnk_0800D7CF.inc" +gUnk_0800D7CF:: @ 0800D7CF + .incbin "baserom.gba", 0x00D7CF, 0x000000D -.include "data/scripts/gUnk_0800D7DC.inc" +gUnk_0800D7DC:: @ 0800D7DC + .incbin "baserom.gba", 0x00D7DC, 0x0000098 -.include "data/scripts/gUnk_0800D874.inc" +gUnk_0800D874:: @ 0800D874 + .incbin "baserom.gba", 0x00D874, 0x0000070 -.include "data/scripts/gUnk_0800D8E4.inc" +gUnk_0800D8E4:: @ 0800D8E4 + .incbin "baserom.gba", 0x00D8E4, 0x0000022 -.include "data/scripts/gUnk_0800D906.inc" +gUnk_0800D906:: @ 0800D906 + .incbin "baserom.gba", 0x00D906, 0x000004E -.include "data/scripts/gUnk_0800D954.inc" +gUnk_0800D954:: @ 0800D954 + .incbin "baserom.gba", 0x00D954, 0x0000029 -.include "data/scripts/gUnk_0800D97D.inc" +gUnk_0800D97D:: @ 0800D97D + .incbin "baserom.gba", 0x00D97D, 0x0000004 -.include "data/scripts/gUnk_0800D981.inc" +gUnk_0800D981:: @ 0800D981 + .incbin "baserom.gba", 0x00D981, 0x0000090 -.include "data/scripts/gUnk_0800DA11.inc" +gUnk_0800DA11:: @ 0800DA11 + .incbin "baserom.gba", 0x00DA11, 0x0000017 -.include "data/scripts/gUnk_0800DA28.inc" +gUnk_0800DA28:: @ 0800DA28 + .incbin "baserom.gba", 0x00DA28, 0x0000024 -.include "data/scripts/gUnk_0800DA4C.inc" +gUnk_0800DA4C:: @ 0800DA4C + .incbin "baserom.gba", 0x00DA4C, 0x0000001 -.include "data/scripts/gUnk_0800DA4D.inc" +gUnk_0800DA4D:: @ 0800DA4D + .incbin "baserom.gba", 0x00DA4D, 0x0000013 -.include "data/scripts/gUnk_0800DA60.inc" +gUnk_0800DA60:: @ 0800DA60 + .incbin "baserom.gba", 0x00DA60, 0x00000AE -.include "data/scripts/gUnk_0800DB0E.inc" +gUnk_0800DB0E:: @ 0800DB0E + .incbin "baserom.gba", 0x00DB0E, 0x000000A -.include "data/scripts/gUnk_0800DB18.inc" +gUnk_0800DB18:: @ 0800DB18 + .incbin "baserom.gba", 0x00DB18, 0x0000010 -.include "data/scripts/gUnk_0800DB28.inc" +gUnk_0800DB28:: @ 0800DB28 + .incbin "baserom.gba", 0x00DB28, 0x0000022 -.include "data/scripts/gUnk_0800DB4A.inc" +gUnk_0800DB4A:: @ 0800DB4A + .incbin "baserom.gba", 0x00DB4A, 0x000002E -.include "data/scripts/gUnk_0800DB78.inc" +gUnk_0800DB78:: @ 0800DB78 + .incbin "baserom.gba", 0x00DB78, 0x0000010 -.include "data/scripts/gUnk_0800DB88.inc" +gUnk_0800DB88:: @ 0800DB88 + .incbin "baserom.gba", 0x00DB88, 0x0000088 -.include "data/scripts/gUnk_0800DC10.inc" +gUnk_0800DC10:: @ 0800DC10 + .incbin "baserom.gba", 0x00DC10, 0x0000009 -.include "data/scripts/gUnk_0800DC19.inc" +gUnk_0800DC19:: @ 0800DC19 + .incbin "baserom.gba", 0x00DC19, 0x0000078 -.include "data/scripts/gUnk_0800DC91.inc" +gUnk_0800DC91:: @ 0800DC91 + .incbin "baserom.gba", 0x00DC91, 0x000001B -.include "data/scripts/gUnk_0800DCAC.inc" +gUnk_0800DCAC:: @ 0800DCAC + .incbin "baserom.gba", 0x00DCAC, 0x0000030 -.include "data/scripts/gUnk_0800DCDC.inc" +gUnk_0800DCDC:: @ 0800DCDC + .incbin "baserom.gba", 0x00DCDC, 0x0000028 -.include "data/scripts/gUnk_0800DD04.inc" +gUnk_0800DD04:: @ 0800DD04 + .incbin "baserom.gba", 0x00DD04, 0x000000C -.include "data/scripts/gUnk_0800DD10.inc" +gUnk_0800DD10:: @ 0800DD10 + .incbin "baserom.gba", 0x00DD10, 0x0000009 -.include "data/scripts/gUnk_0800DD19.inc" +gUnk_0800DD19:: @ 0800DD19 + .incbin "baserom.gba", 0x00DD19, 0x0000009 -.include "data/scripts/gUnk_0800DD22.inc" +gUnk_0800DD22:: @ 0800DD22 + .incbin "baserom.gba", 0x00DD22, 0x000006B -.include "data/scripts/gUnk_0800DD8D.inc" +gUnk_0800DD8D:: @ 0800DD8D + .incbin "baserom.gba", 0x00DD8D, 0x000001D -.include "data/scripts/gUnk_0800DDAA.inc" +gUnk_0800DDAA:: @ 0800DDAA + .incbin "baserom.gba", 0x00DDAA, 0x000003E -.include "data/scripts/gUnk_0800DDE8.inc" +gUnk_0800DDE8:: @ 0800DDE8 + .incbin "baserom.gba", 0x00DDE8, 0x0000014 -.include "data/scripts/gUnk_0800DDFC.inc" +gUnk_0800DDFC:: @ 0800DDFC + .incbin "baserom.gba", 0x00DDFC, 0x0000004 -.include "data/scripts/gUnk_0800DE00.inc" +gUnk_0800DE00:: @ 0800DE00 + .incbin "baserom.gba", 0x00DE00, 0x0000078 -.include "data/scripts/gUnk_0800DE78.inc" +gUnk_0800DE78:: @ 0800DE78 + .incbin "baserom.gba", 0x00DE78, 0x0000038 -.include "data/scripts/gUnk_0800DEB0.inc" +gUnk_0800DEB0:: @ 0800DEB0 + .incbin "baserom.gba", 0x00DEB0, 0x0000024 -.include "data/scripts/gUnk_0800DED4.inc" +gUnk_0800DED4:: @ 0800DED4 + .incbin "baserom.gba", 0x00DED4, 0x0000022 -.include "data/scripts/gUnk_0800DEF6.inc" +gUnk_0800DEF6:: @ 0800DEF6 + .incbin "baserom.gba", 0x00DEF6, 0x0000011 -.include "data/scripts/gUnk_0800DF07.inc" +gUnk_0800DF07:: @ 0800DF07 + .incbin "baserom.gba", 0x00DF07, 0x000001D -.include "data/scripts/gUnk_0800DF24.inc" +gUnk_0800DF24:: @ 0800DF24 + .incbin "baserom.gba", 0x00DF24, 0x0000090 -.include "data/scripts/gUnk_0800DFB4.inc" +gUnk_0800DFB4:: @ 0800DFB4 + .incbin "baserom.gba", 0x00DFB4, 0x000001C -.include "data/scripts/gUnk_0800DFD0.inc" +gUnk_0800DFD0:: @ 0800DFD0 + .incbin "baserom.gba", 0x00DFD0, 0x0000007 -.include "data/scripts/gUnk_0800DFD7.inc" +gUnk_0800DFD7:: @ 0800DFD7 + .incbin "baserom.gba", 0x00DFD7, 0x0000007 -.include "data/scripts/gUnk_0800DFDE.inc" +gUnk_0800DFDE:: @ 0800DFDE + .incbin "baserom.gba", 0x00DFDE, 0x0000006 -.include "data/scripts/gUnk_0800DFE4.inc" +gUnk_0800DFE4:: @ 0800DFE4 + .incbin "baserom.gba", 0x00DFE4, 0x000006C -.include "data/scripts/gUnk_0800E050.inc" +gUnk_0800E050:: @ 0800E050 + .incbin "baserom.gba", 0x00E050, 0x000006C -.include "data/scripts/gUnk_0800E0BC.inc" +gUnk_0800E0BC:: @ 0800E0BC + .incbin "baserom.gba", 0x00E0BC, 0x000003A -.include "data/scripts/gUnk_0800E0F6.inc" +gUnk_0800E0F6:: @ 0800E0F6 + .incbin "baserom.gba", 0x00E0F6, 0x000004A -.include "data/scripts/gUnk_0800E140.inc" +gUnk_0800E140:: @ 0800E140 + .incbin "baserom.gba", 0x00E140, 0x0000013 -.include "data/scripts/gUnk_0800E153.inc" +gUnk_0800E153:: @ 0800E153 + .incbin "baserom.gba", 0x00E153, 0x0000001 -.include "data/scripts/gUnk_0800E154.inc" +gUnk_0800E154:: @ 0800E154 + .incbin "baserom.gba", 0x00E154, 0x0000071 -.include "data/scripts/gUnk_0800E1C5.inc" +gUnk_0800E1C5:: @ 0800E1C5 + .incbin "baserom.gba", 0x00E1C5, 0x000003B -.include "data/scripts/gUnk_0800E200.inc" +gUnk_0800E200:: @ 0800E200 + .incbin "baserom.gba", 0x00E200, 0x0000100 -.include "data/scripts/gUnk_0800E300.inc" +gUnk_0800E300:: @ 0800E300 + .incbin "baserom.gba", 0x00E300, 0x0000005 -.include "data/scripts/gUnk_0800E305.inc" +gUnk_0800E305:: @ 0800E305 + .incbin "baserom.gba", 0x00E305, 0x0000002 -.include "data/scripts/gUnk_0800E307.inc" +gUnk_0800E307:: @ 0800E307 + .incbin "baserom.gba", 0x00E307, 0x0000005 -.include "data/scripts/gUnk_0800E30C.inc" +gUnk_0800E30C:: @ 0800E30C + .incbin "baserom.gba", 0x00E30C, 0x000001D -.include "data/scripts/gUnk_0800E329.inc" +gUnk_0800E329:: @ 0800E329 + .incbin "baserom.gba", 0x00E329, 0x0000027 -.include "data/scripts/gUnk_0800E350.inc" +gUnk_0800E350:: @ 0800E350 + .incbin "baserom.gba", 0x00E350, 0x000009E -.include "data/scripts/gUnk_0800E3EE.inc" +gUnk_0800E3EE:: @ 0800E3EE + .incbin "baserom.gba", 0x00E3EE, 0x000000B -.include "data/scripts/gUnk_0800E3F9.inc" +gUnk_0800E3F9:: @ 0800E3F9 + .incbin "baserom.gba", 0x00E3F9, 0x0000001 -.include "data/scripts/gUnk_0800E3FA.inc" +gUnk_0800E3FA:: @ 0800E3FA + .incbin "baserom.gba", 0x00E3FA, 0x0000002 -.include "data/scripts/gUnk_0800E3FC.inc" +gUnk_0800E3FC:: @ 0800E3FC + .incbin "baserom.gba", 0x00E3FC, 0x0000004 -.include "data/scripts/gUnk_0800E400.inc" +gUnk_0800E400:: @ 0800E400 + .incbin "baserom.gba", 0x00E400, 0x0000008 -.include "data/scripts/gUnk_0800E408.inc" +gUnk_0800E408:: @ 0800E408 + .incbin "baserom.gba", 0x00E408, 0x0000003 -.include "data/scripts/gUnk_0800E40B.inc" +gUnk_0800E40B:: @ 0800E40B + .incbin "baserom.gba", 0x00E40B, 0x0000006 -.include "data/scripts/gUnk_0800E411.inc" +gUnk_0800E411:: @ 0800E411 + .incbin "baserom.gba", 0x00E411, 0x000001F -.include "data/scripts/gUnk_0800E430.inc" +gUnk_0800E430:: @ 0800E430 + .incbin "baserom.gba", 0x00E430, 0x0000004 -.include "data/scripts/gUnk_0800E434.inc" +gUnk_0800E434:: @ 0800E434 + .incbin "baserom.gba", 0x00E434, 0x0000038 -.include "data/scripts/gUnk_0800E46C.inc" +gUnk_0800E46C:: @ 0800E46C + .incbin "baserom.gba", 0x00E46C, 0x000001D -.include "data/scripts/gUnk_0800E489.inc" +gUnk_0800E489:: @ 0800E489 + .incbin "baserom.gba", 0x00E489, 0x0000010 -.include "data/scripts/gUnk_0800E499.inc" +gUnk_0800E499:: @ 0800E499 + .incbin "baserom.gba", 0x00E499, 0x000000B -.include "data/scripts/gUnk_0800E4A4.inc" +gUnk_0800E4A4:: @ 0800E4A4 + .incbin "baserom.gba", 0x00E4A4, 0x000003F -.include "data/scripts/gUnk_0800E4E3.inc" +gUnk_0800E4E3:: @ 0800E4E3 + .incbin "baserom.gba", 0x00E4E3, 0x0000021 -.include "data/scripts/gUnk_0800E504.inc" +gUnk_0800E504:: @ 0800E504 + .incbin "baserom.gba", 0x00E504, 0x0000008 -.include "data/scripts/gUnk_0800E50C.inc" +gUnk_0800E50C:: @ 0800E50C + .incbin "baserom.gba", 0x00E50C, 0x0000038 -.include "data/scripts/gUnk_0800E544.inc" +gUnk_0800E544:: @ 0800E544 + .incbin "baserom.gba", 0x00E544, 0x0000048 -.include "data/scripts/gUnk_0800E58C.inc" +gUnk_0800E58C:: @ 0800E58C + .incbin "baserom.gba", 0x00E58C, 0x0000038 -.include "data/scripts/gUnk_0800E5C4.inc" +gUnk_0800E5C4:: @ 0800E5C4 + .incbin "baserom.gba", 0x00E5C4, 0x000003C -.include "data/scripts/gUnk_0800E600.inc" +gUnk_0800E600:: @ 0800E600 + .incbin "baserom.gba", 0x00E600, 0x000000E -.include "data/scripts/gUnk_0800E60E.inc" +gUnk_0800E60E:: @ 0800E60E + .incbin "baserom.gba", 0x00E60E, 0x000001E -.include "data/scripts/gUnk_0800E62C.inc" +gUnk_0800E62C:: @ 0800E62C + .incbin "baserom.gba", 0x00E62C, 0x000002C -.include "data/scripts/gUnk_0800E658.inc" +gUnk_0800E658:: @ 0800E658 + .incbin "baserom.gba", 0x00E658, 0x000002C -.include "data/scripts/gUnk_0800E684.inc" +gUnk_0800E684:: @ 0800E684 + .incbin "baserom.gba", 0x00E684, 0x000002C -.include "data/scripts/gUnk_0800E6B0.inc" +gUnk_0800E6B0:: @ 0800E6B0 + .incbin "baserom.gba", 0x00E6B0, 0x0000038 -.include "data/scripts/gUnk_0800E6E8.inc" +gUnk_0800E6E8:: @ 0800E6E8 + .incbin "baserom.gba", 0x00E6E8, 0x000001F -.include "data/scripts/gUnk_0800E707.inc" +gUnk_0800E707:: @ 0800E707 + .incbin "baserom.gba", 0x00E707, 0x0000003 -.include "data/scripts/gUnk_0800E70A.inc" +gUnk_0800E70A:: @ 0800E70A + .incbin "baserom.gba", 0x00E70A, 0x000002A -.include "data/scripts/gUnk_0800E734.inc" +gUnk_0800E734:: @ 0800E734 + .incbin "baserom.gba", 0x00E734, 0x000002C -.include "data/scripts/gUnk_0800E760.inc" +gUnk_0800E760:: @ 0800E760 + .incbin "baserom.gba", 0x00E760, 0x0000079 -.include "data/scripts/gUnk_0800E7D9.inc" +gUnk_0800E7D9:: @ 0800E7D9 + .incbin "baserom.gba", 0x00E7D9, 0x000001B -.include "data/scripts/gUnk_0800E7F4.inc" +gUnk_0800E7F4:: @ 0800E7F4 + .incbin "baserom.gba", 0x00E7F4, 0x0000006 -.include "data/scripts/gUnk_0800E7FA.inc" +gUnk_0800E7FA:: @ 0800E7FA + .incbin "baserom.gba", 0x00E7FA, 0x0000029 -.include "data/scripts/gUnk_0800E823.inc" +gUnk_0800E823:: @ 0800E823 + .incbin "baserom.gba", 0x00E823, 0x0000001 -.include "data/scripts/gUnk_0800E824.inc" +gUnk_0800E824:: @ 0800E824 + .incbin "baserom.gba", 0x00E824, 0x00000B7 -.include "data/scripts/gUnk_0800E8DB.inc" +gUnk_0800E8DB:: @ 0800E8DB + .incbin "baserom.gba", 0x00E8DB, 0x0000045 -.include "data/scripts/gUnk_0800E920.inc" +gUnk_0800E920:: @ 0800E920 + .incbin "baserom.gba", 0x00E920, 0x0000044 -.include "data/scripts/gUnk_0800E964.inc" +gUnk_0800E964:: @ 0800E964 + .incbin "baserom.gba", 0x00E964, 0x0000072 -.include "data/scripts/gUnk_0800E9D6.inc" +gUnk_0800E9D6:: @ 0800E9D6 + .incbin "baserom.gba", 0x00E9D6, 0x000001E -.include "data/scripts/gUnk_0800E9F4.inc" +gUnk_0800E9F4:: @ 0800E9F4 + .incbin "baserom.gba", 0x00E9F4, 0x0000028 -.include "data/scripts/gUnk_0800EA1C.inc" +gUnk_0800EA1C:: @ 0800EA1C + .incbin "baserom.gba", 0x00EA1C, 0x0000038 -.include "data/scripts/gUnk_0800EA54.inc" +gUnk_0800EA54:: @ 0800EA54 + .incbin "baserom.gba", 0x00EA54, 0x0000050 -.include "data/scripts/gUnk_0800EAA4.inc" +gUnk_0800EAA4:: @ 0800EAA4 + .incbin "baserom.gba", 0x00EAA4, 0x0000047 -.include "data/scripts/gUnk_0800EAEB.inc" +gUnk_0800EAEB:: @ 0800EAEB + .incbin "baserom.gba", 0x00EAEB, 0x000000D -.include "data/scripts/gUnk_0800EAF8.inc" +gUnk_0800EAF8:: @ 0800EAF8 + .incbin "baserom.gba", 0x00EAF8, 0x0000034 -.include "data/scripts/gUnk_0800EB2C.inc" +gUnk_0800EB2C:: @ 0800EB2C + .incbin "baserom.gba", 0x00EB2C, 0x0000038 -.include "data/scripts/gUnk_0800EB64.inc" +gUnk_0800EB64:: @ 0800EB64 + .incbin "baserom.gba", 0x00EB64, 0x000005C -.include "data/scripts/gUnk_0800EBC0.inc" +gUnk_0800EBC0:: @ 0800EBC0 + .incbin "baserom.gba", 0x00EBC0, 0x000001C -.include "data/scripts/gUnk_0800EBDC.inc" +gUnk_0800EBDC:: @ 0800EBDC + .incbin "baserom.gba", 0x00EBDC, 0x0000004 -.include "data/scripts/gUnk_0800EBE0.inc" +gUnk_0800EBE0:: @ 0800EBE0 + .incbin "baserom.gba", 0x00EBE0, 0x0000010 -.include "data/scripts/gUnk_0800EBF0.inc" +gUnk_0800EBF0:: @ 0800EBF0 + .incbin "baserom.gba", 0x00EBF0, 0x0000018 -.include "data/scripts/gUnk_0800EC08.inc" +gUnk_0800EC08:: @ 0800EC08 + .incbin "baserom.gba", 0x00EC08, 0x000000C -.include "data/scripts/gUnk_0800EC14.inc" +gUnk_0800EC14:: @ 0800EC14 + .incbin "baserom.gba", 0x00EC14, 0x0000040 -.include "data/scripts/gUnk_0800EC54.inc" +gUnk_0800EC54:: @ 0800EC54 + .incbin "baserom.gba", 0x00EC54, 0x000000D -.include "data/scripts/gUnk_0800EC61.inc" +gUnk_0800EC61:: @ 0800EC61 + .incbin "baserom.gba", 0x00EC61, 0x000002B -.include "data/scripts/gUnk_0800EC8C.inc" +gUnk_0800EC8C:: @ 0800EC8C + .incbin "baserom.gba", 0x00EC8C, 0x0000065 -.include "data/scripts/gUnk_0800ECF1.inc" +gUnk_0800ECF1:: @ 0800ECF1 + .incbin "baserom.gba", 0x00ECF1, 0x0000013 -.include "data/scripts/gUnk_0800ED04.inc" +gUnk_0800ED04:: @ 0800ED04 + .incbin "baserom.gba", 0x00ED04, 0x0000008 -.include "data/scripts/gUnk_0800ED0C.inc" +gUnk_0800ED0C:: @ 0800ED0C + .incbin "baserom.gba", 0x00ED0C, 0x0000001 -.include "data/scripts/gUnk_0800ED0D.inc" +gUnk_0800ED0D:: @ 0800ED0D + .incbin "baserom.gba", 0x00ED0D, 0x000004F -.include "data/scripts/gUnk_0800ED5C.inc" +gUnk_0800ED5C:: @ 0800ED5C + .incbin "baserom.gba", 0x00ED5C, 0x0000034 -.include "data/scripts/gUnk_0800ED90.inc" +gUnk_0800ED90:: @ 0800ED90 + .incbin "baserom.gba", 0x00ED90, 0x0000049 -.include "data/scripts/gUnk_0800EDD9.inc" +gUnk_0800EDD9:: @ 0800EDD9 + .incbin "baserom.gba", 0x00EDD9, 0x0000007 -.include "data/scripts/gUnk_0800EDE0.inc" +gUnk_0800EDE0:: @ 0800EDE0 + .incbin "baserom.gba", 0x00EDE0, 0x0000029 -.include "data/scripts/gUnk_0800EE09.inc" +gUnk_0800EE09:: @ 0800EE09 + .incbin "baserom.gba", 0x00EE09, 0x0000047 -.include "data/scripts/gUnk_0800EE50.inc" +gUnk_0800EE50:: @ 0800EE50 + .incbin "baserom.gba", 0x00EE50, 0x000003C -.include "data/scripts/gUnk_0800EE8C.inc" +gUnk_0800EE8C:: @ 0800EE8C + .incbin "baserom.gba", 0x00EE8C, 0x0000054 -.include "data/scripts/gUnk_0800EEE0.inc" +gUnk_0800EEE0:: @ 0800EEE0 + .incbin "baserom.gba", 0x00EEE0, 0x000001D -.include "data/scripts/gUnk_0800EEFD.inc" +gUnk_0800EEFD:: @ 0800EEFD + .incbin "baserom.gba", 0x00EEFD, 0x000000A -.include "data/scripts/gUnk_0800EF07.inc" +gUnk_0800EF07:: @ 0800EF07 + .incbin "baserom.gba", 0x00EF07, 0x000000B -.include "data/scripts/gUnk_0800EF12.inc" +gUnk_0800EF12:: @ 0800EF12 + .incbin "baserom.gba", 0x00EF12, 0x000002E -.include "data/scripts/gUnk_0800EF40.inc" +gUnk_0800EF40:: @ 0800EF40 + .incbin "baserom.gba", 0x00EF40, 0x0000053 -.include "data/scripts/gUnk_0800EF93.inc" +gUnk_0800EF93:: @ 0800EF93 + .incbin "baserom.gba", 0x00EF93, 0x000002D -.include "data/scripts/gUnk_0800EFC0.inc" +gUnk_0800EFC0:: @ 0800EFC0 + .incbin "baserom.gba", 0x00EFC0, 0x0000020 -.include "data/scripts/gUnk_0800EFE0.inc" +gUnk_0800EFE0:: @ 0800EFE0 + .incbin "baserom.gba", 0x00EFE0, 0x0000004 -.include "data/scripts/gUnk_0800EFE4.inc" +gUnk_0800EFE4:: @ 0800EFE4 + .incbin "baserom.gba", 0x00EFE4, 0x00000AC -.include "data/scripts/gUnk_0800F090.inc" +gUnk_0800F090:: @ 0800F090 + .incbin "baserom.gba", 0x00F090, 0x0000004 -.include "data/scripts/gUnk_0800F094.inc" +gUnk_0800F094:: @ 0800F094 + .incbin "baserom.gba", 0x00F094, 0x0000042 -.include "data/scripts/gUnk_0800F0D6.inc" +gUnk_0800F0D6:: @ 0800F0D6 + .incbin "baserom.gba", 0x00F0D6, 0x000000C -.include "data/scripts/gUnk_0800F0E2.inc" +gUnk_0800F0E2:: @ 0800F0E2 + .incbin "baserom.gba", 0x00F0E2, 0x0000010 -.include "data/scripts/gUnk_0800F0F2.inc" +gUnk_0800F0F2:: @ 0800F0F2 + .incbin "baserom.gba", 0x00F0F2, 0x0000001 -.include "data/scripts/gUnk_0800F0F3.inc" +gUnk_0800F0F3:: @ 0800F0F3 + .incbin "baserom.gba", 0x00F0F3, 0x0000001 -.include "data/scripts/gUnk_0800F0F4.inc" +gUnk_0800F0F4:: @ 0800F0F4 + .incbin "baserom.gba", 0x00F0F4, 0x0000058 -.include "data/scripts/gUnk_0800F14C.inc" +gUnk_0800F14C:: @ 0800F14C + .incbin "baserom.gba", 0x00F14C, 0x0000038 -.include "data/scripts/gUnk_0800F184.inc" +gUnk_0800F184:: @ 0800F184 + .incbin "baserom.gba", 0x00F184, 0x000005A -.include "data/scripts/gUnk_0800F1DE.inc" +gUnk_0800F1DE:: @ 0800F1DE + .incbin "baserom.gba", 0x00F1DE, 0x0000003 -.include "data/scripts/gUnk_0800F1E1.inc" +gUnk_0800F1E1:: @ 0800F1E1 + .incbin "baserom.gba", 0x00F1E1, 0x0000004 -.include "data/scripts/gUnk_0800F1E5.inc" +gUnk_0800F1E5:: @ 0800F1E5 + .incbin "baserom.gba", 0x00F1E5, 0x0000002 -.include "data/scripts/gUnk_0800F1E7.inc" +gUnk_0800F1E7:: @ 0800F1E7 + .incbin "baserom.gba", 0x00F1E7, 0x0000006 -.include "data/scripts/gUnk_0800F1ED.inc" +gUnk_0800F1ED:: @ 0800F1ED + .incbin "baserom.gba", 0x00F1ED, 0x000000E -.include "data/scripts/gUnk_0800F1FB.inc" +gUnk_0800F1FB:: @ 0800F1FB + .incbin "baserom.gba", 0x00F1FB, 0x0000002 -.include "data/scripts/gUnk_0800F1FD.inc" +gUnk_0800F1FD:: @ 0800F1FD + .incbin "baserom.gba", 0x00F1FD, 0x0000006 -.include "data/scripts/gUnk_0800F203.inc" +gUnk_0800F203:: @ 0800F203 + .incbin "baserom.gba", 0x00F203, 0x0000004 -.include "data/scripts/gUnk_0800F207.inc" +gUnk_0800F207:: @ 0800F207 + .incbin "baserom.gba", 0x00F207, 0x0000009 -.include "data/scripts/gUnk_0800F210.inc" +gUnk_0800F210:: @ 0800F210 + .incbin "baserom.gba", 0x00F210, 0x00000DB -.include "data/scripts/gUnk_0800F2EB.inc" +gUnk_0800F2EB:: @ 0800F2EB + .incbin "baserom.gba", 0x00F2EB, 0x0000005 -.include "data/scripts/gUnk_0800F2F0.inc" +gUnk_0800F2F0:: @ 0800F2F0 + .incbin "baserom.gba", 0x00F2F0, 0x0000002 -.include "data/scripts/gUnk_0800F2F2.inc" +gUnk_0800F2F2:: @ 0800F2F2 + .incbin "baserom.gba", 0x00F2F2, 0x0000011 -.include "data/scripts/gUnk_0800F303.inc" +gUnk_0800F303:: @ 0800F303 + .incbin "baserom.gba", 0x00F303, 0x0000099 -.include "data/scripts/gUnk_0800F39C.inc" +gUnk_0800F39C:: @ 0800F39C + .incbin "baserom.gba", 0x00F39C, 0x000003F -.include "data/scripts/gUnk_0800F3DB.inc" +gUnk_0800F3DB:: @ 0800F3DB + .incbin "baserom.gba", 0x00F3DB, 0x000000A -.include "data/scripts/gUnk_0800F3E5.inc" +gUnk_0800F3E5:: @ 0800F3E5 + .incbin "baserom.gba", 0x00F3E5, 0x0000001 -.include "data/scripts/gUnk_0800F3E6.inc" +gUnk_0800F3E6:: @ 0800F3E6 + .incbin "baserom.gba", 0x00F3E6, 0x0000002 -.include "data/scripts/gUnk_0800F3E8.inc" +gUnk_0800F3E8:: @ 0800F3E8 + .incbin "baserom.gba", 0x00F3E8, 0x0000003 -.include "data/scripts/gUnk_0800F3EB.inc" +gUnk_0800F3EB:: @ 0800F3EB + .incbin "baserom.gba", 0x00F3EB, 0x0000002 -.include "data/scripts/gUnk_0800F3ED.inc" +gUnk_0800F3ED:: @ 0800F3ED + .incbin "baserom.gba", 0x00F3ED, 0x0000008 -.include "data/scripts/gUnk_0800F3F5.inc" +gUnk_0800F3F5:: @ 0800F3F5 + .incbin "baserom.gba", 0x00F3F5, 0x0000004 -.include "data/scripts/gUnk_0800F3F9.inc" +gUnk_0800F3F9:: @ 0800F3F9 + .incbin "baserom.gba", 0x00F3F9, 0x0000007 -.include "data/scripts/gUnk_0800F400.inc" +gUnk_0800F400:: @ 0800F400 + .incbin "baserom.gba", 0x00F400, 0x0000008 -.include "data/scripts/gUnk_0800F408.inc" +gUnk_0800F408:: @ 0800F408 + .incbin "baserom.gba", 0x00F408, 0x0000001 -.include "data/scripts/gUnk_0800F409.inc" +gUnk_0800F409:: @ 0800F409 + .incbin "baserom.gba", 0x00F409, 0x0000007 -.include "data/scripts/gUnk_0800F410.inc" +gUnk_0800F410:: @ 0800F410 + .incbin "baserom.gba", 0x00F410, 0x0000016 -.include "data/scripts/gUnk_0800F426.inc" +gUnk_0800F426:: @ 0800F426 + .incbin "baserom.gba", 0x00F426, 0x000000A -.include "data/scripts/gUnk_0800F430.inc" +gUnk_0800F430:: @ 0800F430 + .incbin "baserom.gba", 0x00F430, 0x0000094 -.include "data/scripts/gUnk_0800F4C4.inc" +gUnk_0800F4C4:: @ 0800F4C4 + .incbin "baserom.gba", 0x00F4C4, 0x0000026 -.include "data/scripts/gUnk_0800F4EA.inc" +gUnk_0800F4EA:: @ 0800F4EA + .incbin "baserom.gba", 0x00F4EA, 0x0000001 -.include "data/scripts/gUnk_0800F4EB.inc" +gUnk_0800F4EB:: @ 0800F4EB + .incbin "baserom.gba", 0x00F4EB, 0x0000004 -.include "data/scripts/gUnk_0800F4EF.inc" +gUnk_0800F4EF:: @ 0800F4EF + .incbin "baserom.gba", 0x00F4EF, 0x0000001 -.include "data/scripts/gUnk_0800F4F0.inc" +gUnk_0800F4F0:: @ 0800F4F0 + .incbin "baserom.gba", 0x00F4F0, 0x0000001 -.include "data/scripts/gUnk_0800F4F1.inc" +gUnk_0800F4F1:: @ 0800F4F1 + .incbin "baserom.gba", 0x00F4F1, 0x0000002 -.include "data/scripts/gUnk_0800F4F3.inc" +gUnk_0800F4F3:: @ 0800F4F3 + .incbin "baserom.gba", 0x00F4F3, 0x0000004 -.include "data/scripts/gUnk_0800F4F7.inc" +gUnk_0800F4F7:: @ 0800F4F7 + .incbin "baserom.gba", 0x00F4F7, 0x0000002 -.include "data/scripts/gUnk_0800F4F9.inc" +gUnk_0800F4F9:: @ 0800F4F9 + .incbin "baserom.gba", 0x00F4F9, 0x0000008 -.include "data/scripts/gUnk_0800F501.inc" +gUnk_0800F501:: @ 0800F501 + .incbin "baserom.gba", 0x00F501, 0x000000D -.include "data/scripts/gUnk_0800F50E.inc" +gUnk_0800F50E:: @ 0800F50E + .incbin "baserom.gba", 0x00F50E, 0x0000046 -.include "data/scripts/gUnk_0800F554.inc" +gUnk_0800F554:: @ 0800F554 + .incbin "baserom.gba", 0x00F554, 0x0000030 -.include "data/scripts/gUnk_0800F584.inc" +gUnk_0800F584:: @ 0800F584 + .incbin "baserom.gba", 0x00F584, 0x000000B -.include "data/scripts/gUnk_0800F58F.inc" +gUnk_0800F58F:: @ 0800F58F + .incbin "baserom.gba", 0x00F58F, 0x0000021 -.include "data/scripts/gUnk_0800F5B0.inc" +gUnk_0800F5B0:: @ 0800F5B0 + .incbin "baserom.gba", 0x00F5B0, 0x0000039 -.include "data/scripts/gUnk_0800F5E9.inc" +gUnk_0800F5E9:: @ 0800F5E9 + .incbin "baserom.gba", 0x00F5E9, 0x0000003 -.include "data/scripts/gUnk_0800F5EC.inc" +gUnk_0800F5EC:: @ 0800F5EC + .incbin "baserom.gba", 0x00F5EC, 0x0000001 -.include "data/scripts/gUnk_0800F5ED.inc" +gUnk_0800F5ED:: @ 0800F5ED + .incbin "baserom.gba", 0x00F5ED, 0x0000001 -.include "data/scripts/gUnk_0800F5EE.inc" +gUnk_0800F5EE:: @ 0800F5EE + .incbin "baserom.gba", 0x00F5EE, 0x0000001 -.include "data/scripts/gUnk_0800F5EF.inc" +gUnk_0800F5EF:: @ 0800F5EF + .incbin "baserom.gba", 0x00F5EF, 0x0000001 -.include "data/scripts/gUnk_0800F5F0.inc" +gUnk_0800F5F0:: @ 0800F5F0 + .incbin "baserom.gba", 0x00F5F0, 0x0000002 -.include "data/scripts/gUnk_0800F5F2.inc" +gUnk_0800F5F2:: @ 0800F5F2 + .incbin "baserom.gba", 0x00F5F2, 0x0000002 -.include "data/scripts/gUnk_0800F5F4.inc" +gUnk_0800F5F4:: @ 0800F5F4 + .incbin "baserom.gba", 0x00F5F4, 0x0000008 -.include "data/scripts/gUnk_0800F5FC.inc" +gUnk_0800F5FC:: @ 0800F5FC + .incbin "baserom.gba", 0x00F5FC, 0x0000003 -.include "data/scripts/gUnk_0800F5FF.inc" +gUnk_0800F5FF:: @ 0800F5FF + .incbin "baserom.gba", 0x00F5FF, 0x0000007 -.include "data/scripts/gUnk_0800F606.inc" +gUnk_0800F606:: @ 0800F606 + .incbin "baserom.gba", 0x00F606, 0x0000001 -.include "data/scripts/gUnk_0800F607.inc" +gUnk_0800F607:: @ 0800F607 + .incbin "baserom.gba", 0x00F607, 0x0000001 -.include "data/scripts/gUnk_0800F608.inc" +gUnk_0800F608:: @ 0800F608 + .incbin "baserom.gba", 0x00F608, 0x0000002 -.include "data/scripts/gUnk_0800F60A.inc" +gUnk_0800F60A:: @ 0800F60A + .incbin "baserom.gba", 0x00F60A, 0x000001E -.include "data/scripts/gUnk_0800F628.inc" +gUnk_0800F628:: @ 0800F628 + .incbin "baserom.gba", 0x00F628, 0x0000028 -.include "data/scripts/gUnk_0800F650.inc" +gUnk_0800F650:: @ 0800F650 + .incbin "baserom.gba", 0x00F650, 0x0000038 -.include "data/scripts/gUnk_0800F688.inc" +gUnk_0800F688:: @ 0800F688 + .incbin "baserom.gba", 0x00F688, 0x0000018 -.include "data/scripts/gUnk_0800F6A0.inc" +gUnk_0800F6A0:: @ 0800F6A0 + .incbin "baserom.gba", 0x00F6A0, 0x0000028 -.include "data/scripts/gUnk_0800F6C8.inc" +gUnk_0800F6C8:: @ 0800F6C8 + .incbin "baserom.gba", 0x00F6C8, 0x0000018 -.include "data/scripts/gUnk_0800F6E0.inc" +gUnk_0800F6E0:: @ 0800F6E0 + .incbin "baserom.gba", 0x00F6E0, 0x0000009 -.include "data/scripts/gUnk_0800F6E9.inc" +gUnk_0800F6E9:: @ 0800F6E9 + .incbin "baserom.gba", 0x00F6E9, 0x0000003 -.include "data/scripts/gUnk_0800F6EC.inc" +gUnk_0800F6EC:: @ 0800F6EC + .incbin "baserom.gba", 0x00F6EC, 0x0000001 -.include "data/scripts/gUnk_0800F6ED.inc" +gUnk_0800F6ED:: @ 0800F6ED + .incbin "baserom.gba", 0x00F6ED, 0x0000001 -.include "data/scripts/gUnk_0800F6EE.inc" +gUnk_0800F6EE:: @ 0800F6EE + .incbin "baserom.gba", 0x00F6EE, 0x0000001 -.include "data/scripts/gUnk_0800F6EF.inc" +gUnk_0800F6EF:: @ 0800F6EF + .incbin "baserom.gba", 0x00F6EF, 0x0000001 -.include "data/scripts/gUnk_0800F6F0.inc" +gUnk_0800F6F0:: @ 0800F6F0 + .incbin "baserom.gba", 0x00F6F0, 0x0000001 -.include "data/scripts/gUnk_0800F6F1.inc" +gUnk_0800F6F1:: @ 0800F6F1 + .incbin "baserom.gba", 0x00F6F1, 0x0000001 -.include "data/scripts/gUnk_0800F6F2.inc" +gUnk_0800F6F2:: @ 0800F6F2 + .incbin "baserom.gba", 0x00F6F2, 0x0000001 -.include "data/scripts/gUnk_0800F6F3.inc" +gUnk_0800F6F3:: @ 0800F6F3 + .incbin "baserom.gba", 0x00F6F3, 0x0000001 -.include "data/scripts/gUnk_0800F6F4.inc" +gUnk_0800F6F4:: @ 0800F6F4 + .incbin "baserom.gba", 0x00F6F4, 0x0000005 -.include "data/scripts/gUnk_0800F6F9.inc" +gUnk_0800F6F9:: @ 0800F6F9 + .incbin "baserom.gba", 0x00F6F9, 0x0000005 -.include "data/scripts/gUnk_0800F6FE.inc" +gUnk_0800F6FE:: @ 0800F6FE + .incbin "baserom.gba", 0x00F6FE, 0x0000004 -.include "data/scripts/gUnk_0800F702.inc" +gUnk_0800F702:: @ 0800F702 + .incbin "baserom.gba", 0x00F702, 0x0000004 -.include "data/scripts/gUnk_0800F706.inc" +gUnk_0800F706:: @ 0800F706 + .incbin "baserom.gba", 0x00F706, 0x0000018 -.include "data/scripts/gUnk_0800F71E.inc" +gUnk_0800F71E:: @ 0800F71E + .incbin "baserom.gba", 0x00F71E, 0x0000006 -.include "data/scripts/gUnk_0800F724.inc" +gUnk_0800F724:: @ 0800F724 + .incbin "baserom.gba", 0x00F724, 0x0000010 -.include "data/scripts/gUnk_0800F734.inc" +gUnk_0800F734:: @ 0800F734 + .incbin "baserom.gba", 0x00F734, 0x0000008 -.include "data/scripts/gUnk_0800F73C.inc" +gUnk_0800F73C:: @ 0800F73C + .incbin "baserom.gba", 0x00F73C, 0x00000AA -.include "data/scripts/gUnk_0800F7E6.inc" +gUnk_0800F7E6:: @ 0800F7E6 + .incbin "baserom.gba", 0x00F7E6, 0x0000005 -.include "data/scripts/gUnk_0800F7EB.inc" +gUnk_0800F7EB:: @ 0800F7EB + .incbin "baserom.gba", 0x00F7EB, 0x0000003 -.include "data/scripts/gUnk_0800F7EE.inc" +gUnk_0800F7EE:: @ 0800F7EE + .incbin "baserom.gba", 0x00F7EE, 0x0000001 -.include "data/scripts/gUnk_0800F7EF.inc" +gUnk_0800F7EF:: @ 0800F7EF + .incbin "baserom.gba", 0x00F7EF, 0x0000001 -.include "data/scripts/gUnk_0800F7F0.inc" +gUnk_0800F7F0:: @ 0800F7F0 + .incbin "baserom.gba", 0x00F7F0, 0x0000004 -.include "data/scripts/gUnk_0800F7F4.inc" +gUnk_0800F7F4:: @ 0800F7F4 + .incbin "baserom.gba", 0x00F7F4, 0x0000001 -.include "data/scripts/gUnk_0800F7F5.inc" +gUnk_0800F7F5:: @ 0800F7F5 + .incbin "baserom.gba", 0x00F7F5, 0x0000002 -.include "data/scripts/gUnk_0800F7F7.inc" +gUnk_0800F7F7:: @ 0800F7F7 + .incbin "baserom.gba", 0x00F7F7, 0x0000005 -.include "data/scripts/gUnk_0800F7FC.inc" +gUnk_0800F7FC:: @ 0800F7FC + .incbin "baserom.gba", 0x00F7FC, 0x0000001 -.include "data/scripts/gUnk_0800F7FD.inc" +gUnk_0800F7FD:: @ 0800F7FD + .incbin "baserom.gba", 0x00F7FD, 0x0000002 -.include "data/scripts/gUnk_0800F7FF.inc" +gUnk_0800F7FF:: @ 0800F7FF + .incbin "baserom.gba", 0x00F7FF, 0x0000001 -.include "data/scripts/gUnk_0800F800.inc" +gUnk_0800F800:: @ 0800F800 + .incbin "baserom.gba", 0x00F800, 0x0000005 -.include "data/scripts/gUnk_0800F805.inc" +gUnk_0800F805:: @ 0800F805 + .incbin "baserom.gba", 0x00F805, 0x0000003 -.include "data/scripts/gUnk_0800F808.inc" +gUnk_0800F808:: @ 0800F808 + .incbin "baserom.gba", 0x00F808, 0x00000E7 -.include "data/scripts/gUnk_0800F8EF.inc" +gUnk_0800F8EF:: @ 0800F8EF + .incbin "baserom.gba", 0x00F8EF, 0x0000001 -.include "data/scripts/gUnk_0800F8F0.inc" +gUnk_0800F8F0:: @ 0800F8F0 + .incbin "baserom.gba", 0x00F8F0, 0x0000001 -.include "data/scripts/gUnk_0800F8F1.inc" +gUnk_0800F8F1:: @ 0800F8F1 + .incbin "baserom.gba", 0x00F8F1, 0x0000001 -.include "data/scripts/gUnk_0800F8F2.inc" +gUnk_0800F8F2:: @ 0800F8F2 + .incbin "baserom.gba", 0x00F8F2, 0x0000001 -.include "data/scripts/gUnk_0800F8F3.inc" +gUnk_0800F8F3:: @ 0800F8F3 + .incbin "baserom.gba", 0x00F8F3, 0x0000001 -.include "data/scripts/gUnk_0800F8F4.inc" +gUnk_0800F8F4:: @ 0800F8F4 + .incbin "baserom.gba", 0x00F8F4, 0x0000001 -.include "data/scripts/gUnk_0800F8F5.inc" +gUnk_0800F8F5:: @ 0800F8F5 + .incbin "baserom.gba", 0x00F8F5, 0x0000003 -.include "data/scripts/gUnk_0800F8F8.inc" +gUnk_0800F8F8:: @ 0800F8F8 + .incbin "baserom.gba", 0x00F8F8, 0x0000001 -.include "data/scripts/gUnk_0800F8F9.inc" +gUnk_0800F8F9:: @ 0800F8F9 + .incbin "baserom.gba", 0x00F8F9, 0x0000007 -.include "data/scripts/gUnk_0800F900.inc" +gUnk_0800F900:: @ 0800F900 + .incbin "baserom.gba", 0x00F900, 0x0000002 -.include "data/scripts/gUnk_0800F902.inc" +gUnk_0800F902:: @ 0800F902 + .incbin "baserom.gba", 0x00F902, 0x0000014 -.include "data/scripts/gUnk_0800F916.inc" +gUnk_0800F916:: @ 0800F916 + .incbin "baserom.gba", 0x00F916, 0x00000DA -.include "data/scripts/gUnk_0800F9F0.inc" +gUnk_0800F9F0:: @ 0800F9F0 + .incbin "baserom.gba", 0x00F9F0, 0x0000002 -.include "data/scripts/gUnk_0800F9F2.inc" +gUnk_0800F9F2:: @ 0800F9F2 + .incbin "baserom.gba", 0x00F9F2, 0x0000001 -.include "data/scripts/gUnk_0800F9F3.inc" +gUnk_0800F9F3:: @ 0800F9F3 + .incbin "baserom.gba", 0x00F9F3, 0x0000001 -.include "data/scripts/gUnk_0800F9F4.inc" +gUnk_0800F9F4:: @ 0800F9F4 + .incbin "baserom.gba", 0x00F9F4, 0x0000002 -.include "data/scripts/gUnk_0800F9F6.inc" +gUnk_0800F9F6:: @ 0800F9F6 + .incbin "baserom.gba", 0x00F9F6, 0x0000001 -.include "data/scripts/gUnk_0800F9F7.inc" +gUnk_0800F9F7:: @ 0800F9F7 + .incbin "baserom.gba", 0x00F9F7, 0x0000001 -.include "data/scripts/gUnk_0800F9F8.inc" +gUnk_0800F9F8:: @ 0800F9F8 + .incbin "baserom.gba", 0x00F9F8, 0x000000A -.include "data/scripts/gUnk_0800FA02.inc" +gUnk_0800FA02:: @ 0800FA02 + .incbin "baserom.gba", 0x00FA02, 0x0000005 -.include "data/scripts/gUnk_0800FA07.inc" +gUnk_0800FA07:: @ 0800FA07 + .incbin "baserom.gba", 0x00FA07, 0x0000001 -.include "data/scripts/gUnk_0800FA08.inc" +gUnk_0800FA08:: @ 0800FA08 + .incbin "baserom.gba", 0x00FA08, 0x0000001 -.include "data/scripts/gUnk_0800FA09.inc" +gUnk_0800FA09:: @ 0800FA09 + .incbin "baserom.gba", 0x00FA09, 0x0000004 -.include "data/scripts/gUnk_0800FA0D.inc" +gUnk_0800FA0D:: @ 0800FA0D + .incbin "baserom.gba", 0x00FA0D, 0x000006B -.include "data/scripts/gUnk_0800FA78.inc" +gUnk_0800FA78:: @ 0800FA78 + .incbin "baserom.gba", 0x00FA78, 0x0000048 -.include "data/scripts/gUnk_0800FAC0.inc" +gUnk_0800FAC0:: @ 0800FAC0 + .incbin "baserom.gba", 0x00FAC0, 0x0000024 -.include "data/scripts/gUnk_0800FAE4.inc" +gUnk_0800FAE4:: @ 0800FAE4 + .incbin "baserom.gba", 0x00FAE4, 0x000000F -.include "data/scripts/gUnk_0800FAF3.inc" +gUnk_0800FAF3:: @ 0800FAF3 + .incbin "baserom.gba", 0x00FAF3, 0x0000002 -.include "data/scripts/gUnk_0800FAF5.inc" +gUnk_0800FAF5:: @ 0800FAF5 + .incbin "baserom.gba", 0x00FAF5, 0x0000001 -.include "data/scripts/gUnk_0800FAF6.inc" +gUnk_0800FAF6:: @ 0800FAF6 + .incbin "baserom.gba", 0x00FAF6, 0x0000001 -.include "data/scripts/gUnk_0800FAF7.inc" +gUnk_0800FAF7:: @ 0800FAF7 + .incbin "baserom.gba", 0x00FAF7, 0x0000001 -.include "data/scripts/gUnk_0800FAF8.inc" +gUnk_0800FAF8:: @ 0800FAF8 + .incbin "baserom.gba", 0x00FAF8, 0x0000005 -.include "data/scripts/gUnk_0800FAFD.inc" +gUnk_0800FAFD:: @ 0800FAFD + .incbin "baserom.gba", 0x00FAFD, 0x0000001 -.include "data/scripts/gUnk_0800FAFE.inc" +gUnk_0800FAFE:: @ 0800FAFE + .incbin "baserom.gba", 0x00FAFE, 0x0000001 -.include "data/scripts/gUnk_0800FAFF.inc" +gUnk_0800FAFF:: @ 0800FAFF + .incbin "baserom.gba", 0x00FAFF, 0x0000001 -.include "data/scripts/gUnk_0800FB00.inc" +gUnk_0800FB00:: @ 0800FB00 + .incbin "baserom.gba", 0x00FB00, 0x0000001 -.include "data/scripts/gUnk_0800FB01.inc" +gUnk_0800FB01:: @ 0800FB01 + .incbin "baserom.gba", 0x00FB01, 0x0000001 -.include "data/scripts/gUnk_0800FB02.inc" +gUnk_0800FB02:: @ 0800FB02 + .incbin "baserom.gba", 0x00FB02, 0x0000002 -.include "data/scripts/gUnk_0800FB04.inc" +gUnk_0800FB04:: @ 0800FB04 + .incbin "baserom.gba", 0x00FB04, 0x0000004 -.include "data/scripts/gUnk_0800FB08.inc" +gUnk_0800FB08:: @ 0800FB08 + .incbin "baserom.gba", 0x00FB08, 0x0000002 -.include "data/scripts/gUnk_0800FB0A.inc" +gUnk_0800FB0A:: @ 0800FB0A + .incbin "baserom.gba", 0x00FB0A, 0x0000027 -.include "data/scripts/gUnk_0800FB31.inc" +gUnk_0800FB31:: @ 0800FB31 + .incbin "baserom.gba", 0x00FB31, 0x0000013 -.include "data/scripts/gUnk_0800FB44.inc" +gUnk_0800FB44:: @ 0800FB44 + .incbin "baserom.gba", 0x00FB44, 0x0000077 -.include "data/scripts/gUnk_0800FBBB.inc" +gUnk_0800FBBB:: @ 0800FBBB + .incbin "baserom.gba", 0x00FBBB, 0x0000035 -.include "data/scripts/gUnk_0800FBF0.inc" +gUnk_0800FBF0:: @ 0800FBF0 + .incbin "baserom.gba", 0x00FBF0, 0x0000003 -.include "data/scripts/gUnk_0800FBF3.inc" +gUnk_0800FBF3:: @ 0800FBF3 + .incbin "baserom.gba", 0x00FBF3, 0x0000002 -.include "data/scripts/gUnk_0800FBF5.inc" +gUnk_0800FBF5:: @ 0800FBF5 + .incbin "baserom.gba", 0x00FBF5, 0x0000001 -.include "data/scripts/gUnk_0800FBF6.inc" +gUnk_0800FBF6:: @ 0800FBF6 + .incbin "baserom.gba", 0x00FBF6, 0x0000002 -.include "data/scripts/gUnk_0800FBF8.inc" +gUnk_0800FBF8:: @ 0800FBF8 + .incbin "baserom.gba", 0x00FBF8, 0x0000001 -.include "data/scripts/gUnk_0800FBF9.inc" +gUnk_0800FBF9:: @ 0800FBF9 + .incbin "baserom.gba", 0x00FBF9, 0x0000001 -.include "data/scripts/gUnk_0800FBFA.inc" +gUnk_0800FBFA:: @ 0800FBFA + .incbin "baserom.gba", 0x00FBFA, 0x0000001 -.include "data/scripts/gUnk_0800FBFB.inc" +gUnk_0800FBFB:: @ 0800FBFB + .incbin "baserom.gba", 0x00FBFB, 0x0000001 -.include "data/scripts/gUnk_0800FBFC.inc" +gUnk_0800FBFC:: @ 0800FBFC + .incbin "baserom.gba", 0x00FBFC, 0x0000003 -.include "data/scripts/gUnk_0800FBFF.inc" +gUnk_0800FBFF:: @ 0800FBFF + .incbin "baserom.gba", 0x00FBFF, 0x0000001 -.include "data/scripts/gUnk_0800FC00.inc" +gUnk_0800FC00:: @ 0800FC00 + .incbin "baserom.gba", 0x00FC00, 0x0000001 -.include "data/scripts/gUnk_0800FC01.inc" +gUnk_0800FC01:: @ 0800FC01 + .incbin "baserom.gba", 0x00FC01, 0x0000004 -.include "data/scripts/gUnk_0800FC05.inc" +gUnk_0800FC05:: @ 0800FC05 + .incbin "baserom.gba", 0x00FC05, 0x0000001 -.include "data/scripts/gUnk_0800FC06.inc" +gUnk_0800FC06:: @ 0800FC06 + .incbin "baserom.gba", 0x00FC06, 0x0000002 -.include "data/scripts/gUnk_0800FC08.inc" +gUnk_0800FC08:: @ 0800FC08 + .incbin "baserom.gba", 0x00FC08, 0x0000001 -.include "data/scripts/gUnk_0800FC09.inc" +gUnk_0800FC09:: @ 0800FC09 + .incbin "baserom.gba", 0x00FC09, 0x0000005 -.include "data/scripts/gUnk_0800FC0E.inc" +gUnk_0800FC0E:: @ 0800FC0E + .incbin "baserom.gba", 0x00FC0E, 0x0000016 -.include "data/scripts/gUnk_0800FC24.inc" +gUnk_0800FC24:: @ 0800FC24 + .incbin "baserom.gba", 0x00FC24, 0x00000C6 -.include "data/scripts/gUnk_0800FCEA.inc" +gUnk_0800FCEA:: @ 0800FCEA + .incbin "baserom.gba", 0x00FCEA, 0x0000004 -.include "data/scripts/gUnk_0800FCEE.inc" +gUnk_0800FCEE:: @ 0800FCEE + .incbin "baserom.gba", 0x00FCEE, 0x0000004 -.include "data/scripts/gUnk_0800FCF2.inc" +gUnk_0800FCF2:: @ 0800FCF2 + .incbin "baserom.gba", 0x00FCF2, 0x0000001 -.include "data/scripts/gUnk_0800FCF3.inc" +gUnk_0800FCF3:: @ 0800FCF3 + .incbin "baserom.gba", 0x00FCF3, 0x0000002 -.include "data/scripts/gUnk_0800FCF5.inc" +gUnk_0800FCF5:: @ 0800FCF5 + .incbin "baserom.gba", 0x00FCF5, 0x0000002 -.include "data/scripts/gUnk_0800FCF7.inc" +gUnk_0800FCF7:: @ 0800FCF7 + .incbin "baserom.gba", 0x00FCF7, 0x0000001 -.include "data/scripts/gUnk_0800FCF8.inc" +gUnk_0800FCF8:: @ 0800FCF8 + .incbin "baserom.gba", 0x00FCF8, 0x0000002 -.include "data/scripts/gUnk_0800FCFA.inc" +gUnk_0800FCFA:: @ 0800FCFA + .incbin "baserom.gba", 0x00FCFA, 0x0000001 -.include "data/scripts/gUnk_0800FCFB.inc" +gUnk_0800FCFB:: @ 0800FCFB + .incbin "baserom.gba", 0x00FCFB, 0x0000001 -.include "data/scripts/gUnk_0800FCFC.inc" +gUnk_0800FCFC:: @ 0800FCFC + .incbin "baserom.gba", 0x00FCFC, 0x0000002 -.include "data/scripts/gUnk_0800FCFE.inc" +gUnk_0800FCFE:: @ 0800FCFE + .incbin "baserom.gba", 0x00FCFE, 0x0000001 -.include "data/scripts/gUnk_0800FCFF.inc" +gUnk_0800FCFF:: @ 0800FCFF + .incbin "baserom.gba", 0x00FCFF, 0x0000001 -.include "data/scripts/gUnk_0800FD00.inc" +gUnk_0800FD00:: @ 0800FD00 + .incbin "baserom.gba", 0x00FD00, 0x0000001 -.include "data/scripts/gUnk_0800FD01.inc" +gUnk_0800FD01:: @ 0800FD01 + .incbin "baserom.gba", 0x00FD01, 0x0000003 -.include "data/scripts/gUnk_0800FD04.inc" +gUnk_0800FD04:: @ 0800FD04 + .incbin "baserom.gba", 0x00FD04, 0x0000001 -.include "data/scripts/gUnk_0800FD05.inc" +gUnk_0800FD05:: @ 0800FD05 + .incbin "baserom.gba", 0x00FD05, 0x0000007 -.include "data/scripts/gUnk_0800FD0C.inc" +gUnk_0800FD0C:: @ 0800FD0C + .incbin "baserom.gba", 0x00FD0C, 0x000000A -.include "data/scripts/gUnk_0800FD16.inc" +gUnk_0800FD16:: @ 0800FD16 + .incbin "baserom.gba", 0x00FD16, 0x000000B -.include "data/scripts/gUnk_0800FD21.inc" +gUnk_0800FD21:: @ 0800FD21 + .incbin "baserom.gba", 0x00FD21, 0x000005F -.include "data/scripts/gUnk_0800FD80.inc" +gUnk_0800FD80:: @ 0800FD80 + .incbin "baserom.gba", 0x00FD80, 0x0000020 -.include "data/scripts/gUnk_0800FDA0.inc" +gUnk_0800FDA0:: @ 0800FDA0 + .incbin "baserom.gba", 0x00FDA0, 0x000002C -.include "data/scripts/gUnk_0800FDCC.inc" +gUnk_0800FDCC:: @ 0800FDCC + .incbin "baserom.gba", 0x00FDCC, 0x0000026 -.include "data/scripts/gUnk_0800FDF2.inc" +gUnk_0800FDF2:: @ 0800FDF2 + .incbin "baserom.gba", 0x00FDF2, 0x0000001 -.include "data/scripts/gUnk_0800FDF3.inc" +gUnk_0800FDF3:: @ 0800FDF3 + .incbin "baserom.gba", 0x00FDF3, 0x0000007 -.include "data/scripts/gUnk_0800FDFA.inc" +gUnk_0800FDFA:: @ 0800FDFA + .incbin "baserom.gba", 0x00FDFA, 0x0000002 -.include "data/scripts/gUnk_0800FDFC.inc" +gUnk_0800FDFC:: @ 0800FDFC + .incbin "baserom.gba", 0x00FDFC, 0x0000002 -.include "data/scripts/gUnk_0800FDFE.inc" +gUnk_0800FDFE:: @ 0800FDFE + .incbin "baserom.gba", 0x00FDFE, 0x0000001 -.include "data/scripts/gUnk_0800FDFF.inc" +gUnk_0800FDFF:: @ 0800FDFF + .incbin "baserom.gba", 0x00FDFF, 0x0000001 -.include "data/scripts/gUnk_0800FE00.inc" +gUnk_0800FE00:: @ 0800FE00 + .incbin "baserom.gba", 0x00FE00, 0x0000001 -.include "data/scripts/gUnk_0800FE01.inc" +gUnk_0800FE01:: @ 0800FE01 + .incbin "baserom.gba", 0x00FE01, 0x0000001 -.include "data/scripts/gUnk_0800FE02.inc" +gUnk_0800FE02:: @ 0800FE02 + .incbin "baserom.gba", 0x00FE02, 0x0000002 -.include "data/scripts/gUnk_0800FE04.inc" +gUnk_0800FE04:: @ 0800FE04 + .incbin "baserom.gba", 0x00FE04, 0x0000002 -.include "data/scripts/gUnk_0800FE06.inc" +gUnk_0800FE06:: @ 0800FE06 + .incbin "baserom.gba", 0x00FE06, 0x0000001 -.include "data/scripts/gUnk_0800FE07.inc" +gUnk_0800FE07:: @ 0800FE07 + .incbin "baserom.gba", 0x00FE07, 0x0000001 -.include "data/scripts/gUnk_0800FE08.inc" +gUnk_0800FE08:: @ 0800FE08 + .incbin "baserom.gba", 0x00FE08, 0x0000001 -.include "data/scripts/gUnk_0800FE09.inc" +gUnk_0800FE09:: @ 0800FE09 + .incbin "baserom.gba", 0x00FE09, 0x0000037 -.include "data/scripts/gUnk_0800FE40.inc" +gUnk_0800FE40:: @ 0800FE40 + .incbin "baserom.gba", 0x00FE40, 0x0000004 -.include "data/scripts/gUnk_0800FE44.inc" +gUnk_0800FE44:: @ 0800FE44 + .incbin "baserom.gba", 0x00FE44, 0x0000020 -.include "data/scripts/gUnk_0800FE64.inc" +gUnk_0800FE64:: @ 0800FE64 + .incbin "baserom.gba", 0x00FE64, 0x0000024 -.include "data/scripts/gUnk_0800FE88.inc" +gUnk_0800FE88:: @ 0800FE88 + .incbin "baserom.gba", 0x00FE88, 0x0000034 -.include "data/scripts/gUnk_0800FEBC.inc" +gUnk_0800FEBC:: @ 0800FEBC + .incbin "baserom.gba", 0x00FEBC, 0x0000034 -.include "data/scripts/gUnk_0800FEF0.inc" +gUnk_0800FEF0:: @ 0800FEF0 + .incbin "baserom.gba", 0x00FEF0, 0x0000002 -.include "data/scripts/gUnk_0800FEF2.inc" +gUnk_0800FEF2:: @ 0800FEF2 + .incbin "baserom.gba", 0x00FEF2, 0x0000007 -.include "data/scripts/gUnk_0800FEF9.inc" +gUnk_0800FEF9:: @ 0800FEF9 + .incbin "baserom.gba", 0x00FEF9, 0x0000003 -.include "data/scripts/gUnk_0800FEFC.inc" +gUnk_0800FEFC:: @ 0800FEFC + .incbin "baserom.gba", 0x00FEFC, 0x0000002 -.include "data/scripts/gUnk_0800FEFE.inc" +gUnk_0800FEFE:: @ 0800FEFE + .incbin "baserom.gba", 0x00FEFE, 0x0000003 -.include "data/scripts/gUnk_0800FF01.inc" +gUnk_0800FF01:: @ 0800FF01 + .incbin "baserom.gba", 0x00FF01, 0x0000002 -.include "data/scripts/gUnk_0800FF03.inc" +gUnk_0800FF03:: @ 0800FF03 + .incbin "baserom.gba", 0x00FF03, 0x0000001 -.include "data/scripts/gUnk_0800FF04.inc" +gUnk_0800FF04:: @ 0800FF04 + .incbin "baserom.gba", 0x00FF04, 0x0000001 -.include "data/scripts/gUnk_0800FF05.inc" +gUnk_0800FF05:: @ 0800FF05 + .incbin "baserom.gba", 0x00FF05, 0x0000001 -.include "data/scripts/gUnk_0800FF06.inc" +gUnk_0800FF06:: @ 0800FF06 + .incbin "baserom.gba", 0x00FF06, 0x0000002 -.include "data/scripts/gUnk_0800FF08.inc" +gUnk_0800FF08:: @ 0800FF08 + .incbin "baserom.gba", 0x00FF08, 0x0000010 -.include "data/scripts/gUnk_0800FF18.inc" +gUnk_0800FF18:: @ 0800FF18 + .incbin "baserom.gba", 0x00FF18, 0x0000012 -.include "data/scripts/gUnk_0800FF2A.inc" +gUnk_0800FF2A:: @ 0800FF2A + .incbin "baserom.gba", 0x00FF2A, 0x000004A -.include "data/scripts/gUnk_0800FF74.inc" +gUnk_0800FF74:: @ 0800FF74 + .incbin "baserom.gba", 0x00FF74, 0x000003C -.include "data/scripts/gUnk_0800FFB0.inc" +gUnk_0800FFB0:: @ 0800FFB0 + .incbin "baserom.gba", 0x00FFB0, 0x000000B -.include "data/scripts/gUnk_0800FFBB.inc" +gUnk_0800FFBB:: @ 0800FFBB + .incbin "baserom.gba", 0x00FFBB, 0x000001B -.include "data/scripts/gUnk_0800FFD6.inc" +gUnk_0800FFD6:: @ 0800FFD6 + .incbin "baserom.gba", 0x00FFD6, 0x0000018 -.include "data/scripts/gUnk_0800FFEE.inc" +gUnk_0800FFEE:: @ 0800FFEE + .incbin "baserom.gba", 0x00FFEE, 0x0000008 -.include "data/scripts/gUnk_0800FFF6.inc" +gUnk_0800FFF6:: @ 0800FFF6 + .incbin "baserom.gba", 0x00FFF6, 0x0000006 -.include "data/scripts/gUnk_0800FFFC.inc" +gUnk_0800FFFC:: @ 0800FFFC + .incbin "baserom.gba", 0x00FFFC, 0x0000001 -.include "data/scripts/gUnk_0800FFFD.inc" +gUnk_0800FFFD:: @ 0800FFFD + .incbin "baserom.gba", 0x00FFFD, 0x0000002 -.include "data/scripts/gUnk_0800FFFF.inc" +gUnk_0800FFFF:: @ 0800FFFF + .incbin "baserom.gba", 0x00FFFF, 0x0000001 -.include "data/scripts/gUnk_08010000.inc" +gUnk_08010000:: @ 08010000 + .incbin "baserom.gba", 0x010000, 0x0000001 -.include "data/scripts/gUnk_08010001.inc" +gUnk_08010001:: @ 08010001 + .incbin "baserom.gba", 0x010001, 0x0000001 -.include "data/scripts/gUnk_08010002.inc" +gUnk_08010002:: @ 08010002 + .incbin "baserom.gba", 0x010002, 0x0000001 -.include "data/scripts/gUnk_08010003.inc" +gUnk_08010003:: @ 08010003 + .incbin "baserom.gba", 0x010003, 0x0000002 -.include "data/scripts/gUnk_08010005.inc" +gUnk_08010005:: @ 08010005 + .incbin "baserom.gba", 0x010005, 0x0000002 -.include "data/scripts/gUnk_08010007.inc" +gUnk_08010007:: @ 08010007 + .incbin "baserom.gba", 0x010007, 0x0000001 -.include "data/scripts/gUnk_08010008.inc" +gUnk_08010008:: @ 08010008 + .incbin "baserom.gba", 0x010008, 0x0000001 -.include "data/scripts/gUnk_08010009.inc" +gUnk_08010009:: @ 08010009 + .incbin "baserom.gba", 0x010009, 0x0000001 -.include "data/scripts/gUnk_0801000A.inc" +gUnk_0801000A:: @ 0801000A + .incbin "baserom.gba", 0x01000A, 0x0000002 -.include "data/scripts/gUnk_0801000C.inc" +gUnk_0801000C:: @ 0801000C + .incbin "baserom.gba", 0x01000C, 0x0000001 -.include "data/scripts/gUnk_0801000D.inc" +gUnk_0801000D:: @ 0801000D + .incbin "baserom.gba", 0x01000D, 0x0000001 -.include "data/scripts/gUnk_0801000E.inc" +gUnk_0801000E:: @ 0801000E + .incbin "baserom.gba", 0x01000E, 0x0000001 -.include "data/scripts/gUnk_0801000F.inc" +gUnk_0801000F:: @ 0801000F + .incbin "baserom.gba", 0x01000F, 0x0000009 -.include "data/scripts/gUnk_08010018.inc" +gUnk_08010018:: @ 08010018 + .incbin "baserom.gba", 0x010018, 0x0000003 -.include "data/scripts/gUnk_0801001B.inc" +gUnk_0801001B:: @ 0801001B + .incbin "baserom.gba", 0x01001B, 0x0000002 -.include "data/scripts/gUnk_0801001D.inc" +gUnk_0801001D:: @ 0801001D + .incbin "baserom.gba", 0x01001D, 0x0000006 -.include "data/scripts/gUnk_08010023.inc" +gUnk_08010023:: @ 08010023 + .incbin "baserom.gba", 0x010023, 0x0000021 -.include "data/scripts/gUnk_08010044.inc" +gUnk_08010044:: @ 08010044 + .incbin "baserom.gba", 0x010044, 0x0000054 -.include "data/scripts/gUnk_08010098.inc" +gUnk_08010098:: @ 08010098 + .incbin "baserom.gba", 0x010098, 0x0000001 -.include "data/scripts/gUnk_08010099.inc" +gUnk_08010099:: @ 08010099 + .incbin "baserom.gba", 0x010099, 0x0000028 -.include "data/scripts/gUnk_080100C1.inc" +gUnk_080100C1:: @ 080100C1 + .incbin "baserom.gba", 0x0100C1, 0x0000007 -.include "data/scripts/gUnk_080100C8.inc" +gUnk_080100C8:: @ 080100C8 + .incbin "baserom.gba", 0x0100C8, 0x000002D -.include "data/scripts/gUnk_080100F5.inc" +gUnk_080100F5:: @ 080100F5 + .incbin "baserom.gba", 0x0100F5, 0x0000007 -.include "data/scripts/gUnk_080100FC.inc" +gUnk_080100FC:: @ 080100FC + .incbin "baserom.gba", 0x0100FC, 0x0000002 -.include "data/scripts/gUnk_080100FE.inc" +gUnk_080100FE:: @ 080100FE + .incbin "baserom.gba", 0x0100FE, 0x0000001 -.include "data/scripts/gUnk_080100FF.inc" +gUnk_080100FF:: @ 080100FF + .incbin "baserom.gba", 0x0100FF, 0x0000001 -.include "data/scripts/gUnk_08010100.inc" +gUnk_08010100:: @ 08010100 + .incbin "baserom.gba", 0x010100, 0x0000002 -.include "data/scripts/gUnk_08010102.inc" +gUnk_08010102:: @ 08010102 + .incbin "baserom.gba", 0x010102, 0x0000001 -.include "data/scripts/gUnk_08010103.inc" +gUnk_08010103:: @ 08010103 + .incbin "baserom.gba", 0x010103, 0x0000002 -.include "data/scripts/gUnk_08010105.inc" +gUnk_08010105:: @ 08010105 + .incbin "baserom.gba", 0x010105, 0x0000001 -.include "data/scripts/gUnk_08010106.inc" +gUnk_08010106:: @ 08010106 + .incbin "baserom.gba", 0x010106, 0x0000004 -.include "data/scripts/gUnk_0801010A.inc" +gUnk_0801010A:: @ 0801010A + .incbin "baserom.gba", 0x01010A, 0x0000007 -.include "data/scripts/gUnk_08010111.inc" +gUnk_08010111:: @ 08010111 + .incbin "baserom.gba", 0x010111, 0x000000F -.include "data/scripts/gUnk_08010120.inc" +gUnk_08010120:: @ 08010120 + .incbin "baserom.gba", 0x010120, 0x0000010 -.include "data/scripts/gUnk_08010130.inc" +gUnk_08010130:: @ 08010130 + .incbin "baserom.gba", 0x010130, 0x0000018 -.include "data/scripts/gUnk_08010148.inc" +gUnk_08010148:: @ 08010148 + .incbin "baserom.gba", 0x010148, 0x00000B2 -.include "data/scripts/gUnk_080101FA.inc" +gUnk_080101FA:: @ 080101FA + .incbin "baserom.gba", 0x0101FA, 0x0000003 -.include "data/scripts/gUnk_080101FD.inc" +gUnk_080101FD:: @ 080101FD + .incbin "baserom.gba", 0x0101FD, 0x0000002 -.include "data/scripts/gUnk_080101FF.inc" +gUnk_080101FF:: @ 080101FF + .incbin "baserom.gba", 0x0101FF, 0x0000001 -.include "data/scripts/gUnk_08010200.inc" +gUnk_08010200:: @ 08010200 + .incbin "baserom.gba", 0x010200, 0x0000003 -.include "data/scripts/gUnk_08010203.inc" +gUnk_08010203:: @ 08010203 + .incbin "baserom.gba", 0x010203, 0x0000004 -.include "data/scripts/gUnk_08010207.inc" +gUnk_08010207:: @ 08010207 + .incbin "baserom.gba", 0x010207, 0x0000001 -.include "data/scripts/gUnk_08010208.inc" +gUnk_08010208:: @ 08010208 + .incbin "baserom.gba", 0x010208, 0x0000004 -.include "data/scripts/gUnk_0801020C.inc" +gUnk_0801020C:: @ 0801020C + .incbin "baserom.gba", 0x01020C, 0x0000014 -.include "data/scripts/gUnk_08010220.inc" +gUnk_08010220:: @ 08010220 + .incbin "baserom.gba", 0x010220, 0x0000016 -.include "data/scripts/gUnk_08010236.inc" +gUnk_08010236:: @ 08010236 + .incbin "baserom.gba", 0x010236, 0x000002E -.include "data/scripts/gUnk_08010264.inc" +gUnk_08010264:: @ 08010264 + .incbin "baserom.gba", 0x010264, 0x0000030 -.include "data/scripts/gUnk_08010294.inc" +gUnk_08010294:: @ 08010294 + .incbin "baserom.gba", 0x010294, 0x000004C -.include "data/scripts/gUnk_080102E0.inc" +gUnk_080102E0:: @ 080102E0 + .incbin "baserom.gba", 0x0102E0, 0x000001B -.include "data/scripts/gUnk_080102FB.inc" +gUnk_080102FB:: @ 080102FB + .incbin "baserom.gba", 0x0102FB, 0x0000002 -.include "data/scripts/gUnk_080102FD.inc" +gUnk_080102FD:: @ 080102FD + .incbin "baserom.gba", 0x0102FD, 0x0000001 -.include "data/scripts/gUnk_080102FE.inc" +gUnk_080102FE:: @ 080102FE + .incbin "baserom.gba", 0x0102FE, 0x0000005 -.include "data/scripts/gUnk_08010303.inc" +gUnk_08010303:: @ 08010303 + .incbin "baserom.gba", 0x010303, 0x0000001 -.include "data/scripts/gUnk_08010304.inc" +gUnk_08010304:: @ 08010304 + .incbin "baserom.gba", 0x010304, 0x0000001 -.include "data/scripts/gUnk_08010305.inc" +gUnk_08010305:: @ 08010305 + .incbin "baserom.gba", 0x010305, 0x0000005 -.include "data/scripts/gUnk_0801030A.inc" +gUnk_0801030A:: @ 0801030A + .incbin "baserom.gba", 0x01030A, 0x0000002 -.include "data/scripts/gUnk_0801030C.inc" +gUnk_0801030C:: @ 0801030C + .incbin "baserom.gba", 0x01030C, 0x0000014 -.include "data/scripts/gUnk_08010320.inc" +gUnk_08010320:: @ 08010320 + .incbin "baserom.gba", 0x010320, 0x0000090 -.include "data/scripts/gUnk_080103B0.inc" +gUnk_080103B0:: @ 080103B0 + .incbin "baserom.gba", 0x0103B0, 0x0000020 -.include "data/scripts/gUnk_080103D0.inc" +gUnk_080103D0:: @ 080103D0 + .incbin "baserom.gba", 0x0103D0, 0x0000028 -.include "data/scripts/gUnk_080103F8.inc" +gUnk_080103F8:: @ 080103F8 + .incbin "baserom.gba", 0x0103F8, 0x0000005 -.include "data/scripts/gUnk_080103FD.inc" +gUnk_080103FD:: @ 080103FD + .incbin "baserom.gba", 0x0103FD, 0x0000003 -.include "data/scripts/gUnk_08010400.inc" +gUnk_08010400:: @ 08010400 + .incbin "baserom.gba", 0x010400, 0x0000006 -.include "data/scripts/gUnk_08010406.inc" +gUnk_08010406:: @ 08010406 + .incbin "baserom.gba", 0x010406, 0x0000001 -.include "data/scripts/gUnk_08010407.inc" +gUnk_08010407:: @ 08010407 + .incbin "baserom.gba", 0x010407, 0x0000003 -.include "data/scripts/gUnk_0801040A.inc" +gUnk_0801040A:: @ 0801040A + .incbin "baserom.gba", 0x01040A, 0x000001E -.include "data/scripts/gUnk_08010428.inc" +gUnk_08010428:: @ 08010428 + .incbin "baserom.gba", 0x010428, 0x000002C -.include "data/scripts/gUnk_08010454.inc" +gUnk_08010454:: @ 08010454 + .incbin "baserom.gba", 0x010454, 0x000002C -.include "data/scripts/gUnk_08010480.inc" +gUnk_08010480:: @ 08010480 + .incbin "baserom.gba", 0x010480, 0x0000020 -.include "data/scripts/gUnk_080104A0.inc" +gUnk_080104A0:: @ 080104A0 + .incbin "baserom.gba", 0x0104A0, 0x000004C -.include "data/scripts/gUnk_080104EC.inc" +gUnk_080104EC:: @ 080104EC + .incbin "baserom.gba", 0x0104EC, 0x0000013 -.include "data/scripts/gUnk_080104FF.inc" +gUnk_080104FF:: @ 080104FF + .incbin "baserom.gba", 0x0104FF, 0x0000002 -.include "data/scripts/gUnk_08010501.inc" +gUnk_08010501:: @ 08010501 + .incbin "baserom.gba", 0x010501, 0x0000001 -.include "data/scripts/gUnk_08010502.inc" +gUnk_08010502:: @ 08010502 + .incbin "baserom.gba", 0x010502, 0x0000001 -.include "data/scripts/gUnk_08010503.inc" +gUnk_08010503:: @ 08010503 + .incbin "baserom.gba", 0x010503, 0x0000007 -.include "data/scripts/gUnk_0801050A.inc" +gUnk_0801050A:: @ 0801050A + .incbin "baserom.gba", 0x01050A, 0x0000001 -.include "data/scripts/gUnk_0801050B.inc" +gUnk_0801050B:: @ 0801050B + .incbin "baserom.gba", 0x01050B, 0x000001B -.include "data/scripts/gUnk_08010526.inc" +gUnk_08010526:: @ 08010526 + .incbin "baserom.gba", 0x010526, 0x0000079 -.include "data/scripts/gUnk_0801059F.inc" +gUnk_0801059F:: @ 0801059F + .incbin "baserom.gba", 0x01059F, 0x000002A -.include "data/scripts/gUnk_080105C9.inc" +gUnk_080105C9:: @ 080105C9 + .incbin "baserom.gba", 0x0105C9, 0x0000032 -.include "data/scripts/gUnk_080105FB.inc" +gUnk_080105FB:: @ 080105FB + .incbin "baserom.gba", 0x0105FB, 0x0000004 -.include "data/scripts/gUnk_080105FF.inc" +gUnk_080105FF:: @ 080105FF + .incbin "baserom.gba", 0x0105FF, 0x0000001 -.include "data/scripts/gUnk_08010600.inc" +gUnk_08010600:: @ 08010600 + .incbin "baserom.gba", 0x010600, 0x000000A -.include "data/scripts/gUnk_0801060A.inc" +gUnk_0801060A:: @ 0801060A + .incbin "baserom.gba", 0x01060A, 0x0000003 -.include "data/scripts/gUnk_0801060D.inc" +gUnk_0801060D:: @ 0801060D + .incbin "baserom.gba", 0x01060D, 0x000000A -.include "data/scripts/gUnk_08010617.inc" +gUnk_08010617:: @ 08010617 + .incbin "baserom.gba", 0x010617, 0x0000005 -.include "data/scripts/gUnk_0801061C.inc" +gUnk_0801061C:: @ 0801061C + .incbin "baserom.gba", 0x01061C, 0x0000028 -.include "data/scripts/gUnk_08010644.inc" +gUnk_08010644:: @ 08010644 + .incbin "baserom.gba", 0x010644, 0x000000C -.include "data/scripts/gUnk_08010650.inc" +gUnk_08010650:: @ 08010650 + .incbin "baserom.gba", 0x010650, 0x0000024 -.include "data/scripts/gUnk_08010674.inc" +gUnk_08010674:: @ 08010674 + .incbin "baserom.gba", 0x010674, 0x0000038 -.include "data/scripts/gUnk_080106AC.inc" +gUnk_080106AC:: @ 080106AC + .incbin "baserom.gba", 0x0106AC, 0x0000054 -.include "data/scripts/gUnk_08010700.inc" +gUnk_08010700:: @ 08010700 + .incbin "baserom.gba", 0x010700, 0x0000001 -.include "data/scripts/gUnk_08010701.inc" +gUnk_08010701:: @ 08010701 + .incbin "baserom.gba", 0x010701, 0x0000004 -.include "data/scripts/gUnk_08010705.inc" +gUnk_08010705:: @ 08010705 + .incbin "baserom.gba", 0x010705, 0x0000009 -.include "data/scripts/gUnk_0801070E.inc" +gUnk_0801070E:: @ 0801070E + .incbin "baserom.gba", 0x01070E, 0x0000026 -.include "data/scripts/gUnk_08010734.inc" +gUnk_08010734:: @ 08010734 + .incbin "baserom.gba", 0x010734, 0x0000060 -.include "data/scripts/gUnk_08010794.inc" +gUnk_08010794:: @ 08010794 + .incbin "baserom.gba", 0x010794, 0x000003C -.include "data/scripts/gUnk_080107D0.inc" +gUnk_080107D0:: @ 080107D0 + .incbin "baserom.gba", 0x0107D0, 0x000003A -.include "data/scripts/gUnk_0801080A.inc" +gUnk_0801080A:: @ 0801080A + .incbin "baserom.gba", 0x01080A, 0x0000001 -.include "data/scripts/gUnk_0801080B.inc" +gUnk_0801080B:: @ 0801080B + .incbin "baserom.gba", 0x01080B, 0x000000A -.include "data/scripts/gUnk_08010815.inc" +gUnk_08010815:: @ 08010815 + .incbin "baserom.gba", 0x010815, 0x0000006 -.include "data/scripts/gUnk_0801081B.inc" +gUnk_0801081B:: @ 0801081B + .incbin "baserom.gba", 0x01081B, 0x00000B5 -.include "data/scripts/gUnk_080108D0.inc" +gUnk_080108D0:: @ 080108D0 + .incbin "baserom.gba", 0x0108D0, 0x000002F -.include "data/scripts/gUnk_080108FF.inc" +gUnk_080108FF:: @ 080108FF + .incbin "baserom.gba", 0x0108FF, 0x000000D -.include "data/scripts/gUnk_0801090C.inc" +gUnk_0801090C:: @ 0801090C + .incbin "baserom.gba", 0x01090C, 0x0000003 -.include "data/scripts/gUnk_0801090F.inc" +gUnk_0801090F:: @ 0801090F + .incbin "baserom.gba", 0x01090F, 0x0000008 -.include "data/scripts/gUnk_08010917.inc" +gUnk_08010917:: @ 08010917 + .incbin "baserom.gba", 0x010917, 0x000004D -.include "data/scripts/gUnk_08010964.inc" +gUnk_08010964:: @ 08010964 + .incbin "baserom.gba", 0x010964, 0x000003C -.include "data/scripts/gUnk_080109A0.inc" +gUnk_080109A0:: @ 080109A0 + .incbin "baserom.gba", 0x0109A0, 0x0000050 -.include "data/scripts/gUnk_080109F0.inc" +gUnk_080109F0:: @ 080109F0 + .incbin "baserom.gba", 0x0109F0, 0x0000006 -.include "data/scripts/gUnk_080109F6.inc" +gUnk_080109F6:: @ 080109F6 + .incbin "baserom.gba", 0x0109F6, 0x000001E -.include "data/scripts/gUnk_08010A14.inc" +gUnk_08010A14:: @ 08010A14 + .incbin "baserom.gba", 0x010A14, 0x000000B -.include "data/scripts/gUnk_08010A1F.inc" +gUnk_08010A1F:: @ 08010A1F + .incbin "baserom.gba", 0x010A1F, 0x0000019 -.include "data/scripts/gUnk_08010A38.inc" +gUnk_08010A38:: @ 08010A38 + .incbin "baserom.gba", 0x010A38, 0x0000024 -.include "data/scripts/gUnk_08010A5C.inc" +gUnk_08010A5C:: @ 08010A5C + .incbin "baserom.gba", 0x010A5C, 0x000003C -.include "data/scripts/gUnk_08010A98.inc" +gUnk_08010A98:: @ 08010A98 + .incbin "baserom.gba", 0x010A98, 0x000004C -.include "data/scripts/gUnk_08010AE4.inc" +gUnk_08010AE4:: @ 08010AE4 + .incbin "baserom.gba", 0x010AE4, 0x0000020 -.include "data/scripts/gUnk_08010B04.inc" +gUnk_08010B04:: @ 08010B04 + .incbin "baserom.gba", 0x010B04, 0x0000064 -.include "data/scripts/gUnk_08010B68.inc" +gUnk_08010B68:: @ 08010B68 + .incbin "baserom.gba", 0x010B68, 0x000004C -.include "data/scripts/gUnk_08010BB4.inc" +gUnk_08010BB4:: @ 08010BB4 + .incbin "baserom.gba", 0x010BB4, 0x0000038 -.include "data/scripts/gUnk_08010BEC.inc" +gUnk_08010BEC:: @ 08010BEC + .incbin "baserom.gba", 0x010BEC, 0x000000D -.include "data/scripts/gUnk_08010BF9.inc" +gUnk_08010BF9:: @ 08010BF9 + .incbin "baserom.gba", 0x010BF9, 0x0000005 -.include "data/scripts/gUnk_08010BFE.inc" +gUnk_08010BFE:: @ 08010BFE + .incbin "baserom.gba", 0x010BFE, 0x000001C -.include "data/scripts/gUnk_08010C1A.inc" +gUnk_08010C1A:: @ 08010C1A + .incbin "baserom.gba", 0x010C1A, 0x00000E9 -.include "data/scripts/gUnk_08010D03.inc" +gUnk_08010D03:: @ 08010D03 + .incbin "baserom.gba", 0x010D03, 0x00000FD -.include "data/scripts/gUnk_08010E00.inc" +gUnk_08010E00:: @ 08010E00 + .incbin "baserom.gba", 0x010E00, 0x000000D -.include "data/scripts/gUnk_08010E0D.inc" +gUnk_08010E0D:: @ 08010E0D + .incbin "baserom.gba", 0x010E0D, 0x00000F3 -.include "data/scripts/gUnk_08010F00.inc" +gUnk_08010F00:: @ 08010F00 + .incbin "baserom.gba", 0x010F00, 0x00000FF -.include "data/scripts/gUnk_08010FFF.inc" +gUnk_08010FFF:: @ 08010FFF + .incbin "baserom.gba", 0x010FFF, 0x0000001 -.include "data/scripts/gUnk_08011000.inc" +gUnk_08011000:: @ 08011000 + .incbin "baserom.gba", 0x011000, 0x0000001 -.include "data/scripts/gUnk_08011001.inc" +gUnk_08011001:: @ 08011001 + .incbin "baserom.gba", 0x011001, 0x000001E -.include "data/scripts/gUnk_0801101F.inc" +gUnk_0801101F:: @ 0801101F + .incbin "baserom.gba", 0x01101F, 0x0000055 -.include "data/scripts/gUnk_08011074.inc" +gUnk_08011074:: @ 08011074 + .incbin "baserom.gba", 0x011074, 0x000000F -.include "data/scripts/gUnk_08011083.inc" +gUnk_08011083:: @ 08011083 + .incbin "baserom.gba", 0x011083, 0x0000059 -.include "data/scripts/gUnk_080110DC.inc" +gUnk_080110DC:: @ 080110DC + .incbin "baserom.gba", 0x0110DC, 0x000000C -.include "data/scripts/gUnk_080110E8.inc" +gUnk_080110E8:: @ 080110E8 + .incbin "baserom.gba", 0x0110E8, 0x0000040 -.include "data/scripts/gUnk_08011128.inc" +gUnk_08011128:: @ 08011128 + .incbin "baserom.gba", 0x011128, 0x00000A4 -.include "data/scripts/gUnk_080111CC.inc" +gUnk_080111CC:: @ 080111CC + .incbin "baserom.gba", 0x0111CC, 0x000003C -.include "data/scripts/gUnk_08011208.inc" +gUnk_08011208:: @ 08011208 + .incbin "baserom.gba", 0x011208, 0x0000015 -.include "data/scripts/gUnk_0801121D.inc" +gUnk_0801121D:: @ 0801121D + .incbin "baserom.gba", 0x01121D, 0x00000A7 -.include "data/scripts/gUnk_080112C4.inc" +gUnk_080112C4:: @ 080112C4 + .incbin "baserom.gba", 0x0112C4, 0x000004B -.include "data/scripts/gUnk_0801130F.inc" +gUnk_0801130F:: @ 0801130F + .incbin "baserom.gba", 0x01130F, 0x0000019 -.include "data/scripts/gUnk_08011328.inc" +gUnk_08011328:: @ 08011328 + .incbin "baserom.gba", 0x011328, 0x00000DB -.include "data/scripts/gUnk_08011403.inc" +gUnk_08011403:: @ 08011403 + .incbin "baserom.gba", 0x011403, 0x00001CD -.include "data/scripts/gUnk_080115D0.inc" +gUnk_080115D0:: @ 080115D0 + .incbin "baserom.gba", 0x0115D0, 0x0000038 -.include "data/scripts/gUnk_08011608.inc" +gUnk_08011608:: @ 08011608 + .incbin "baserom.gba", 0x011608, 0x0000038 -.include "data/scripts/gUnk_08011640.inc" +gUnk_08011640:: @ 08011640 + .incbin "baserom.gba", 0x011640, 0x0000068 -.include "data/scripts/gUnk_080116A8.inc" +gUnk_080116A8:: @ 080116A8 + .incbin "baserom.gba", 0x0116A8, 0x0000161 -.include "data/scripts/gUnk_08011809.inc" +gUnk_08011809:: @ 08011809 + .incbin "baserom.gba", 0x011809, 0x0000033 -.include "data/scripts/gUnk_0801183C.inc" +gUnk_0801183C:: @ 0801183C + .incbin "baserom.gba", 0x01183C, 0x0000098 -.include "data/scripts/gUnk_080118D4.inc" +gUnk_080118D4:: @ 080118D4 + .incbin "baserom.gba", 0x0118D4, 0x000005C -.include "data/scripts/gUnk_08011930.inc" +gUnk_08011930:: @ 08011930 + .incbin "baserom.gba", 0x011930, 0x0000010 -.include "data/scripts/gUnk_08011940.inc" +gUnk_08011940:: @ 08011940 + .incbin "baserom.gba", 0x011940, 0x000000C -.include "data/scripts/gUnk_0801194C.inc" +gUnk_0801194C:: @ 0801194C + .incbin "baserom.gba", 0x01194C, 0x000000C -.include "data/scripts/gUnk_08011958.inc" +gUnk_08011958:: @ 08011958 + .incbin "baserom.gba", 0x011958, 0x000000C -.include "data/scripts/gUnk_08011964.inc" +gUnk_08011964:: @ 08011964 + .incbin "baserom.gba", 0x011964, 0x000004C -.include "data/scripts/gUnk_080119B0.inc" +gUnk_080119B0:: @ 080119B0 + .incbin "baserom.gba", 0x0119B0, 0x0000028 -.include "data/scripts/gUnk_080119D8.inc" +gUnk_080119D8:: @ 080119D8 + .incbin "baserom.gba", 0x0119D8, 0x000000C -.include "data/scripts/gUnk_080119E4.inc" +gUnk_080119E4:: @ 080119E4 + .incbin "baserom.gba", 0x0119E4, 0x000000C -.include "data/scripts/gUnk_080119F0.inc" +gUnk_080119F0:: @ 080119F0 + .incbin "baserom.gba", 0x0119F0, 0x0000014 -.include "data/scripts/gUnk_08011A04.inc" +gUnk_08011A04:: @ 08011A04 + .incbin "baserom.gba", 0x011A04, 0x0000028 -.include "data/scripts/gUnk_08011A2C.inc" +gUnk_08011A2C:: @ 08011A2C + .incbin "baserom.gba", 0x011A2C, 0x0000038 -.include "data/scripts/gUnk_08011A64.inc" +gUnk_08011A64:: @ 08011A64 + .incbin "baserom.gba", 0x011A64, 0x0000080 -.include "data/scripts/gUnk_08011AE4.inc" +gUnk_08011AE4:: @ 08011AE4 + .incbin "baserom.gba", 0x011AE4, 0x0000020 -.include "data/scripts/gUnk_08011B04.inc" +gUnk_08011B04:: @ 08011B04 + .incbin "baserom.gba", 0x011B04, 0x000001C -.include "data/scripts/gUnk_08011B20.inc" +gUnk_08011B20:: @ 08011B20 + .incbin "baserom.gba", 0x011B20, 0x0000020 -.include "data/scripts/gUnk_08011B40.inc" +gUnk_08011B40:: @ 08011B40 + .incbin "baserom.gba", 0x011B40, 0x00000A4 -.include "data/scripts/gUnk_08011BE4.inc" +gUnk_08011BE4:: @ 08011BE4 + .incbin "baserom.gba", 0x011BE4, 0x0000020 -.include "data/scripts/gUnk_08011C04.inc" +gUnk_08011C04:: @ 08011C04 + .incbin "baserom.gba", 0x011C04, 0x000004C -.include "data/scripts/gUnk_08011C50.inc" +gUnk_08011C50:: @ 08011C50 + .incbin "baserom.gba", 0x011C50, 0x000002C -.include "data/scripts/gUnk_08011C7C.inc" +gUnk_08011C7C:: @ 08011C7C + .incbin "baserom.gba", 0x011C7C, 0x00000AC -.include "data/scripts/gUnk_08011D28.inc" +gUnk_08011D28:: @ 08011D28 + .incbin "baserom.gba", 0x011D28, 0x00000AC -.include "data/scripts/gUnk_08011DD4.inc" +gUnk_08011DD4:: @ 08011DD4 + .incbin "baserom.gba", 0x011DD4, 0x0000030 -.include "data/scripts/gUnk_08011E04.inc" +gUnk_08011E04:: @ 08011E04 + .incbin "baserom.gba", 0x011E04, 0x000007C -.include "data/scripts/gUnk_08011E80.inc" +gUnk_08011E80:: @ 08011E80 + .incbin "baserom.gba", 0x011E80, 0x000008C -.include "data/scripts/gUnk_08011F0C.inc" +gUnk_08011F0C:: @ 08011F0C + .incbin "baserom.gba", 0x011F0C, 0x000008C -.include "data/scripts/gUnk_08011F98.inc" +gUnk_08011F98:: @ 08011F98 + .incbin "baserom.gba", 0x011F98, 0x000008C -.include "data/scripts/gUnk_08012024.inc" +gUnk_08012024:: @ 08012024 + .incbin "baserom.gba", 0x012024, 0x000006D -.include "data/scripts/gUnk_08012091.inc" +gUnk_08012091:: @ 08012091 + .incbin "baserom.gba", 0x012091, 0x000001F -.include "data/scripts/gUnk_080120B0.inc" +gUnk_080120B0:: @ 080120B0 + .incbin "baserom.gba", 0x0120B0, 0x000003D -.include "data/scripts/gUnk_080120ED.inc" +gUnk_080120ED:: @ 080120ED + .incbin "baserom.gba", 0x0120ED, 0x000000E -.include "data/scripts/gUnk_080120FB.inc" +gUnk_080120FB:: @ 080120FB + .incbin "baserom.gba", 0x0120FB, 0x0000041 -.include "data/scripts/gUnk_0801213C.inc" +gUnk_0801213C:: @ 0801213C + .incbin "baserom.gba", 0x01213C, 0x000008C -.include "data/scripts/gUnk_080121C8.inc" +gUnk_080121C8:: @ 080121C8 + .incbin "baserom.gba", 0x0121C8, 0x0000038 -.include "data/scripts/gUnk_08012200.inc" +gUnk_08012200:: @ 08012200 + .incbin "baserom.gba", 0x012200, 0x0000038 -.include "data/scripts/gUnk_08012238.inc" +gUnk_08012238:: @ 08012238 + .incbin "baserom.gba", 0x012238, 0x0000038 -.include "data/scripts/gUnk_08012270.inc" +gUnk_08012270:: @ 08012270 + .incbin "baserom.gba", 0x012270, 0x00000BC -.include "data/scripts/gUnk_0801232C.inc" +gUnk_0801232C:: @ 0801232C + .incbin "baserom.gba", 0x01232C, 0x0000034 -.include "data/scripts/gUnk_08012360.inc" +gUnk_08012360:: @ 08012360 + .incbin "baserom.gba", 0x012360, 0x00000B0 -.include "data/scripts/gUnk_08012410.inc" +gUnk_08012410:: @ 08012410 + .incbin "baserom.gba", 0x012410, 0x0000020 -.include "data/scripts/gUnk_08012430.inc" +gUnk_08012430:: @ 08012430 + .incbin "baserom.gba", 0x012430, 0x0000050 -.include "data/scripts/gUnk_08012480.inc" +gUnk_08012480:: @ 08012480 + .incbin "baserom.gba", 0x012480, 0x000027C .include "data/scripts/ezlo_angry.inc" -.include "data/scripts/gUnk_08012AB0.inc" +gUnk_08012AB0:: @ 08012AB0 + .incbin "baserom.gba", 0x012AB0, 0x00000F8 -.include "data/scripts/gUnk_08012BA8.inc" +gUnk_08012BA8:: @ 08012BA8 + .incbin "baserom.gba", 0x012BA8, 0x0000050 -.include "data/scripts/gUnk_08012BF8.inc" +gUnk_08012BF8:: @ 08012BF8 + .incbin "baserom.gba", 0x012BF8, 0x0000014 -.include "data/scripts/gUnk_08012C0C.inc" +gUnk_08012C0C:: @ 08012C0C + .incbin "baserom.gba", 0x012C0C, 0x000003C -.include "data/scripts/gUnk_08012C48.inc" +gUnk_08012C48:: @ 08012C48 + .incbin "baserom.gba", 0x012C48, 0x0000050 -.include "data/scripts/gUnk_08012C98.inc" +gUnk_08012C98:: @ 08012C98 + .incbin "baserom.gba", 0x012C98, 0x0000040 -.include "data/scripts/gUnk_08012CD8.inc" +gUnk_08012CD8:: @ 08012CD8 + .incbin "baserom.gba", 0x012CD8, 0x0000040 -.include "data/scripts/gUnk_08012D18.inc" +gUnk_08012D18:: @ 08012D18 + .incbin "baserom.gba", 0x012D18, 0x0000058 -.include "data/scripts/gUnk_08012D70.inc" +gUnk_08012D70:: @ 08012D70 + .incbin "baserom.gba", 0x012D70, 0x0000031 -.include "data/scripts/gUnk_08012DA1.inc" +gUnk_08012DA1:: @ 08012DA1 + .incbin "baserom.gba", 0x012DA1, 0x000000F -.include "data/scripts/gUnk_08012DB0.inc" +gUnk_08012DB0:: @ 08012DB0 + .incbin "baserom.gba", 0x012DB0, 0x0000028 -.include "data/scripts/gUnk_08012DD8.inc" +gUnk_08012DD8:: @ 08012DD8 + .incbin "baserom.gba", 0x012DD8, 0x0000048 -.include "data/scripts/gUnk_08012E20.inc" +gUnk_08012E20:: @ 08012E20 + .incbin "baserom.gba", 0x012E20, 0x0000024 -.include "data/scripts/gUnk_08012E44.inc" +gUnk_08012E44:: @ 08012E44 + .incbin "baserom.gba", 0x012E44, 0x0000044 -.include "data/scripts/gUnk_08012E88.inc" +gUnk_08012E88:: @ 08012E88 + .incbin "baserom.gba", 0x012E88, 0x0000038 -.include "data/scripts/gUnk_08012EC0.inc" +gUnk_08012EC0:: @ 08012EC0 + .incbin "baserom.gba", 0x012EC0, 0x000004C -.include "data/scripts/gUnk_08012F0C.inc" +gUnk_08012F0C:: @ 08012F0C + .incbin "baserom.gba", 0x012F0C, 0x00000F5 -.include "data/scripts/gUnk_08013001.inc" +gUnk_08013001:: @ 08013001 + .incbin "baserom.gba", 0x013001, 0x0000002 -.include "data/scripts/gUnk_08013003.inc" +gUnk_08013003:: @ 08013003 + .incbin "baserom.gba", 0x013003, 0x0000008 -.include "data/scripts/gUnk_0801300B.inc" +gUnk_0801300B:: @ 0801300B + .incbin "baserom.gba", 0x01300B, 0x0000031 -.include "data/scripts/gUnk_0801303C.inc" +gUnk_0801303C:: @ 0801303C + .incbin "baserom.gba", 0x01303C, 0x0000034 -.include "data/scripts/gUnk_08013070.inc" +gUnk_08013070:: @ 08013070 + .incbin "baserom.gba", 0x013070, 0x0000011 -.include "data/scripts/gUnk_08013081.inc" +gUnk_08013081:: @ 08013081 + .incbin "baserom.gba", 0x013081, 0x000000F -.include "data/scripts/gUnk_08013090.inc" +gUnk_08013090:: @ 08013090 + .incbin "baserom.gba", 0x013090, 0x0000084 -.include "data/scripts/gUnk_08013114.inc" +gUnk_08013114:: @ 08013114 + .incbin "baserom.gba", 0x013114, 0x0000074 -.include "data/scripts/gUnk_08013188.inc" +gUnk_08013188:: @ 08013188 + .incbin "baserom.gba", 0x013188, 0x0000024 -.include "data/scripts/gUnk_080131AC.inc" +gUnk_080131AC:: @ 080131AC + .incbin "baserom.gba", 0x0131AC, 0x0000138 -.include "data/scripts/gUnk_080132E4.inc" +gUnk_080132E4:: @ 080132E4 + .incbin "baserom.gba", 0x0132E4, 0x000004C -.include "data/scripts/gUnk_08013330.inc" +gUnk_08013330:: @ 08013330 + .incbin "baserom.gba", 0x013330, 0x000001C -.include "data/scripts/gUnk_0801334C.inc" +gUnk_0801334C:: @ 0801334C + .incbin "baserom.gba", 0x01334C, 0x000002C -.include "data/scripts/gUnk_08013378.inc" +gUnk_08013378:: @ 08013378 + .incbin "baserom.gba", 0x013378, 0x000004C -.include "data/scripts/gUnk_080133C4.inc" +gUnk_080133C4:: @ 080133C4 + .incbin "baserom.gba", 0x0133C4, 0x0000034 -.include "data/scripts/gUnk_080133F8.inc" +gUnk_080133F8:: @ 080133F8 + .incbin "baserom.gba", 0x0133F8, 0x00000E4 -.include "data/scripts/gUnk_080134DC.inc" +gUnk_080134DC:: @ 080134DC + .incbin "baserom.gba", 0x0134DC, 0x00001FC -.include "data/scripts/gUnk_080136D8.inc" +gUnk_080136D8:: @ 080136D8 + .incbin "baserom.gba", 0x0136D8, 0x0000048 -.include "data/scripts/gUnk_08013720.inc" +gUnk_08013720:: @ 08013720 + .incbin "baserom.gba", 0x013720, 0x00000BA -.include "data/scripts/gUnk_080137DA.inc" +gUnk_080137DA:: @ 080137DA + .incbin "baserom.gba", 0x0137DA, 0x00000DA -.include "data/scripts/gUnk_080138B4.inc" +gUnk_080138B4:: @ 080138B4 + .incbin "baserom.gba", 0x0138B4, 0x0000264 -.include "data/scripts/gUnk_08013B18.inc" +gUnk_08013B18:: @ 08013B18 + .incbin "baserom.gba", 0x013B18, 0x0000058 -.include "data/scripts/gUnk_08013B70.inc" +gUnk_08013B70:: @ 08013B70 + .incbin "baserom.gba", 0x013B70, 0x0000038 -.include "data/scripts/gUnk_08013BA8.inc" +gUnk_08013BA8:: @ 08013BA8 + .incbin "baserom.gba", 0x013BA8, 0x0000040 -.include "data/scripts/gUnk_08013BE8.inc" +gUnk_08013BE8:: @ 08013BE8 + .incbin "baserom.gba", 0x013BE8, 0x00000BC -.include "data/scripts/gUnk_08013CA4.inc" +gUnk_08013CA4:: @ 08013CA4 + .incbin "baserom.gba", 0x013CA4, 0x0000160 -.include "data/scripts/gUnk_08013E04.inc" +gUnk_08013E04:: @ 08013E04 + .incbin "baserom.gba", 0x013E04, 0x0000048 -.include "data/scripts/gUnk_08013E4C.inc" +gUnk_08013E4C:: @ 08013E4C + .incbin "baserom.gba", 0x013E4C, 0x0000024 -.include "data/scripts/gUnk_08013E70.inc" +gUnk_08013E70:: @ 08013E70 + .incbin "baserom.gba", 0x013E70, 0x0000024 -.include "data/scripts/gUnk_08013E94.inc" +gUnk_08013E94:: @ 08013E94 + .incbin "baserom.gba", 0x013E94, 0x000001C -.include "data/scripts/gUnk_08013EB0.inc" +gUnk_08013EB0:: @ 08013EB0 + .incbin "baserom.gba", 0x013EB0, 0x000001C -.include "data/scripts/gUnk_08013ECC.inc" +gUnk_08013ECC:: @ 08013ECC + .incbin "baserom.gba", 0x013ECC, 0x000001C -.include "data/scripts/gUnk_08013EE8.inc" +gUnk_08013EE8:: @ 08013EE8 + .incbin "baserom.gba", 0x013EE8, 0x000001C -.include "data/scripts/gUnk_08013F04.inc" +gUnk_08013F04:: @ 08013F04 + .incbin "baserom.gba", 0x013F04, 0x0000030 -.include "data/scripts/gUnk_08013F34.inc" +gUnk_08013F34:: @ 08013F34 + .incbin "baserom.gba", 0x013F34, 0x0000030 -.include "data/scripts/gUnk_08013F64.inc" +gUnk_08013F64:: @ 08013F64 + .incbin "baserom.gba", 0x013F64, 0x0000030 -.include "data/scripts/gUnk_08013F94.inc" +gUnk_08013F94:: @ 08013F94 + .incbin "baserom.gba", 0x013F94, 0x0000054 -.include "data/scripts/gUnk_08013FE8.inc" +gUnk_08013FE8:: @ 08013FE8 + .incbin "baserom.gba", 0x013FE8, 0x000006C -.include "data/scripts/gUnk_08014054.inc" +gUnk_08014054:: @ 08014054 + .incbin "baserom.gba", 0x014054, 0x0000020 -.include "data/scripts/gUnk_08014074.inc" +gUnk_08014074:: @ 08014074 + .incbin "baserom.gba", 0x014074, 0x0000020 -.include "data/scripts/gUnk_08014094.inc" +gUnk_08014094:: @ 08014094 + .incbin "baserom.gba", 0x014094, 0x0000048 -.include "data/scripts/gUnk_080140DC.inc" +gUnk_080140DC:: @ 080140DC + .incbin "baserom.gba", 0x0140DC, 0x000001C -.include "data/scripts/gUnk_080140F8.inc" +gUnk_080140F8:: @ 080140F8 + .incbin "baserom.gba", 0x0140F8, 0x0000020 -.include "data/scripts/gUnk_08014118.inc" +gUnk_08014118:: @ 08014118 + .incbin "baserom.gba", 0x014118, 0x000003C -.include "data/scripts/gUnk_08014154.inc" +gUnk_08014154:: @ 08014154 + .incbin "baserom.gba", 0x014154, 0x0000088 -.include "data/scripts/gUnk_080141DC.inc" +gUnk_080141DC:: @ 080141DC + .incbin "baserom.gba", 0x0141DC, 0x0000034 -.include "data/scripts/gUnk_08014210.inc" +gUnk_08014210:: @ 08014210 + .incbin "baserom.gba", 0x014210, 0x0000064 -.include "data/scripts/gUnk_08014274.inc" +gUnk_08014274:: @ 08014274 + .incbin "baserom.gba", 0x014274, 0x000003C -.include "data/scripts/gUnk_080142B0.inc" +gUnk_080142B0:: @ 080142B0 + .incbin "baserom.gba", 0x0142B0, 0x00000D4 -.include "data/scripts/gUnk_08014384.inc" +gUnk_08014384:: @ 08014384 + .incbin "baserom.gba", 0x014384, 0x000003C -.include "data/scripts/gUnk_080143C0.inc" +gUnk_080143C0:: @ 080143C0 + .incbin "baserom.gba", 0x0143C0, 0x0000042 -.include "data/scripts/gUnk_08014402.inc" +gUnk_08014402:: @ 08014402 + .incbin "baserom.gba", 0x014402, 0x000004E -.include "data/scripts/gUnk_08014450.inc" +gUnk_08014450:: @ 08014450 + .incbin "baserom.gba", 0x014450, 0x00000BC -.include "data/scripts/gUnk_0801450C.inc" +gUnk_0801450C:: @ 0801450C + .incbin "baserom.gba", 0x01450C, 0x000003C -.include "data/scripts/gUnk_08014548.inc" +gUnk_08014548:: @ 08014548 + .incbin "baserom.gba", 0x014548, 0x0000058 -.include "data/scripts/gUnk_080145A0.inc" +gUnk_080145A0:: @ 080145A0 + .incbin "baserom.gba", 0x0145A0, 0x0000010 -.include "data/scripts/gUnk_080145B0.inc" +gUnk_080145B0:: @ 080145B0 + .incbin "baserom.gba", 0x0145B0, 0x0000038 -.include "data/scripts/gUnk_080145E8.inc" +gUnk_080145E8:: @ 080145E8 + .incbin "baserom.gba", 0x0145E8, 0x0000040 -.include "data/scripts/gUnk_08014628.inc" +gUnk_08014628:: @ 08014628 + .incbin "baserom.gba", 0x014628, 0x00001DC -.include "data/scripts/gUnk_08014804.inc" +gUnk_08014804:: @ 08014804 + .incbin "baserom.gba", 0x014804, 0x00000EC -.include "data/scripts/gUnk_080148F0.inc" +gUnk_080148F0:: @ 080148F0 + .incbin "baserom.gba", 0x0148F0, 0x0000068 -.include "data/scripts/gUnk_08014958.inc" +gUnk_08014958:: @ 08014958 + .incbin "baserom.gba", 0x014958, 0x000003C -.include "data/scripts/gUnk_08014994.inc" +gUnk_08014994:: @ 08014994 + .incbin "baserom.gba", 0x014994, 0x0000038 -.include "data/scripts/gUnk_080149CC.inc" +gUnk_080149CC:: @ 080149CC + .incbin "baserom.gba", 0x0149CC, 0x000005C -.include "data/scripts/gUnk_08014A28.inc" +gUnk_08014A28:: @ 08014A28 + .incbin "baserom.gba", 0x014A28, 0x000002C -.include "data/scripts/gUnk_08014A54.inc" +gUnk_08014A54:: @ 08014A54 + .incbin "baserom.gba", 0x014A54, 0x000002C -.include "data/scripts/gUnk_08014A80.inc" +gUnk_08014A80:: @ 08014A80 + .incbin "baserom.gba", 0x014A80, 0x0000044 -.include "data/scripts/gUnk_08014AC4.inc" +gUnk_08014AC4:: @ 08014AC4 + .incbin "baserom.gba", 0x014AC4, 0x0000070 -.include "data/scripts/gUnk_08014B34.inc" +gUnk_08014B34:: @ 08014B34 + .incbin "baserom.gba", 0x014B34, 0x00000F8 -.include "data/scripts/gUnk_08014C2C.inc" +gUnk_08014C2C:: @ 08014C2C + .incbin "baserom.gba", 0x014C2C, 0x0000068 -.include "data/scripts/gUnk_08014C94.inc" +gUnk_08014C94:: @ 08014C94 + .incbin "baserom.gba", 0x014C94, 0x0000048 -.include "data/scripts/gUnk_08014CDC.inc" +gUnk_08014CDC:: @ 08014CDC + .incbin "baserom.gba", 0x014CDC, 0x00000F0 -.include "data/scripts/gUnk_08014DCC.inc" +gUnk_08014DCC:: @ 08014DCC + .incbin "baserom.gba", 0x014DCC, 0x0000048 -.include "data/scripts/gUnk_08014E14.inc" +gUnk_08014E14:: @ 08014E14 + .incbin "baserom.gba", 0x014E14, 0x000003C -.include "data/scripts/gUnk_08014E50.inc" +gUnk_08014E50:: @ 08014E50 + .incbin "baserom.gba", 0x014E50, 0x000007C -.include "data/scripts/gUnk_08014ECC.inc" +gUnk_08014ECC:: @ 08014ECC + .incbin "baserom.gba", 0x014ECC, 0x000002C -.include "data/scripts/gUnk_08014EF8.inc" +gUnk_08014EF8:: @ 08014EF8 + .incbin "baserom.gba", 0x014EF8, 0x0000038 -.include "data/scripts/gUnk_08014F30.inc" +gUnk_08014F30:: @ 08014F30 + .incbin "baserom.gba", 0x014F30, 0x000008C -.include "data/scripts/gUnk_08014FBC.inc" +gUnk_08014FBC:: @ 08014FBC + .incbin "baserom.gba", 0x014FBC, 0x0000045 -.include "data/scripts/gUnk_08015001.inc" +gUnk_08015001:: @ 08015001 + .incbin "baserom.gba", 0x015001, 0x0000086 -.include "data/scripts/gUnk_08015087.inc" +gUnk_08015087:: @ 08015087 + .incbin "baserom.gba", 0x015087, 0x0000068 -.include "data/scripts/gUnk_080150EF.inc" +gUnk_080150EF:: @ 080150EF + .incbin "baserom.gba", 0x0150EF, 0x0000145 -.include "data/scripts/gUnk_08015234.inc" +gUnk_08015234:: @ 08015234 + .incbin "baserom.gba", 0x015234, 0x0000080 -.include "data/scripts/gUnk_080152B4.inc" +gUnk_080152B4:: @ 080152B4 + .incbin "baserom.gba", 0x0152B4, 0x00000DC -.include "data/scripts/gUnk_08015390.inc" +gUnk_08015390:: @ 08015390 + .incbin "baserom.gba", 0x015390, 0x000005C -.include "data/scripts/gUnk_080153EC.inc" +gUnk_080153EC:: @ 080153EC + .incbin "baserom.gba", 0x0153EC, 0x0000120 -.include "data/scripts/gUnk_0801550C.inc" +gUnk_0801550C:: @ 0801550C + .incbin "baserom.gba", 0x01550C, 0x000010C -.include "data/scripts/gUnk_08015618.inc" +gUnk_08015618:: @ 08015618 + .incbin "baserom.gba", 0x015618, 0x000006C -.include "data/scripts/gUnk_08015684.inc" +gUnk_08015684:: @ 08015684 + .incbin "baserom.gba", 0x015684, 0x000001C -.include "data/scripts/gUnk_080156A0.inc" +gUnk_080156A0:: @ 080156A0 + .incbin "baserom.gba", 0x0156A0, 0x00000B4 -.include "data/scripts/gUnk_08015754.inc" +gUnk_08015754:: @ 08015754 + .incbin "baserom.gba", 0x015754, 0x0000058 -.include "data/scripts/gUnk_080157AC.inc" +gUnk_080157AC:: @ 080157AC + .incbin "baserom.gba", 0x0157AC, 0x000014C -.include "data/scripts/gUnk_080158F8.inc" +gUnk_080158F8:: @ 080158F8 + .incbin "baserom.gba", 0x0158F8, 0x0000040 -.include "data/scripts/gUnk_08015938.inc" +gUnk_08015938:: @ 08015938 + .incbin "baserom.gba", 0x015938, 0x0000020 -.include "data/scripts/gUnk_08015958.inc" +gUnk_08015958:: @ 08015958 + .incbin "baserom.gba", 0x015958, 0x000016C -.include "data/scripts/gUnk_08015AC4.inc" +gUnk_08015AC4:: @ 08015AC4 + .incbin "baserom.gba", 0x015AC4, 0x0000050 -.include "data/scripts/gUnk_08015B14.inc" +gUnk_08015B14:: @ 08015B14 + .incbin "baserom.gba", 0x015B14, 0x0000020 -.include "data/scripts/gUnk_08015B34.inc" +gUnk_08015B34:: @ 08015B34 + .incbin "baserom.gba", 0x015B34, 0x0000050 -.include "data/scripts/gUnk_08015B84.inc" +gUnk_08015B84:: @ 08015B84 + .incbin "baserom.gba", 0x015B84, 0x0000024 -.include "data/scripts/gUnk_08015BA8.inc" +gUnk_08015BA8:: @ 08015BA8 + .incbin "baserom.gba", 0x015BA8, 0x0000040 -.include "data/scripts/gUnk_08015BE8.inc" +gUnk_08015BE8:: @ 08015BE8 + .incbin "baserom.gba", 0x015BE8, 0x00000EC -.include "data/scripts/gUnk_08015CD4.inc" +gUnk_08015CD4:: @ 08015CD4 + .incbin "baserom.gba", 0x015CD4, 0x000011C -.include "data/scripts/gUnk_08015DF0.inc" +gUnk_08015DF0:: @ 08015DF0 + .incbin "baserom.gba", 0x015DF0, 0x0000068 -.include "data/scripts/gUnk_08015E58.inc" +gUnk_08015E58:: @ 08015E58 + .incbin "baserom.gba", 0x015E58, 0x00000B0 -.include "data/scripts/gUnk_08015F08.inc" +gUnk_08015F08:: @ 08015F08 + .incbin "baserom.gba", 0x015F08, 0x0000034 -.include "data/scripts/gUnk_08015F3C.inc" +gUnk_08015F3C:: @ 08015F3C + .incbin "baserom.gba", 0x015F3C, 0x0000068 -.include "data/scripts/gUnk_08015FA4.inc" +gUnk_08015FA4:: @ 08015FA4 + .incbin "baserom.gba", 0x015FA4, 0x000001C -.include "data/scripts/gUnk_08015FC0.inc" +gUnk_08015FC0:: @ 08015FC0 + .incbin "baserom.gba", 0x015FC0, 0x0000061 -.include "data/scripts/gUnk_08016021.inc" +gUnk_08016021:: @ 08016021 + .incbin "baserom.gba", 0x016021, 0x000000F .include "data/scripts/npc4e_fusion.inc" -.include "data/scripts/gUnk_0801606C.inc" +gUnk_0801606C:: @ 0801606C + .incbin "baserom.gba", 0x01606C, 0x000003C -.include "data/scripts/gUnk_080160A8.inc" +gUnk_080160A8:: @ 080160A8 + .incbin "baserom.gba", 0x0160A8, 0x0000042 -.include "data/scripts/gUnk_080160EA.inc" +gUnk_080160EA:: @ 080160EA + .incbin "baserom.gba", 0x0160EA, 0x0000052 -.include "data/scripts/gUnk_0801613C.inc" +gUnk_0801613C:: @ 0801613C + .incbin "baserom.gba", 0x01613C, 0x0000054 -.include "data/scripts/gUnk_08016190.inc" +gUnk_08016190:: @ 08016190 + .incbin "baserom.gba", 0x016190, 0x0000058 -.include "data/scripts/gUnk_080161E8.inc" +gUnk_080161E8:: @ 080161E8 + .incbin "baserom.gba", 0x0161E8, 0x0000174 -.include "data/scripts/gUnk_0801635C.inc" +gUnk_0801635C:: @ 0801635C + .incbin "baserom.gba", 0x01635C, 0x0000021 -.include "data/scripts/gUnk_0801637D.inc" +gUnk_0801637D:: @ 0801637D + .incbin "baserom.gba", 0x01637D, 0x0000007 -.include "data/scripts/gUnk_08016384.inc" +gUnk_08016384:: @ 08016384 + .incbin "baserom.gba", 0x016384, 0x0000084 -.include "data/scripts/gUnk_08016408.inc" +gUnk_08016408:: @ 08016408 + .incbin "baserom.gba", 0x016408, 0x00001F0 -.include "data/scripts/gUnk_080165F8.inc" +gUnk_080165F8:: @ 080165F8 + .incbin "baserom.gba", 0x0165F8, 0x0000014 -.include "data/scripts/gUnk_0801660C.inc" +gUnk_0801660C:: @ 0801660C + .incbin "baserom.gba", 0x01660C, 0x000001C -.include "data/scripts/gUnk_08016628.inc" +gUnk_08016628:: @ 08016628 + .incbin "baserom.gba", 0x016628, 0x000001C -.include "data/scripts/gUnk_08016644.inc" +gUnk_08016644:: @ 08016644 + .incbin "baserom.gba", 0x016644, 0x0000028 -.include "data/scripts/gUnk_0801666C.inc" +gUnk_0801666C:: @ 0801666C + .incbin "baserom.gba", 0x01666C, 0x000004C -.include "data/scripts/gUnk_080166B8.inc" +gUnk_080166B8:: @ 080166B8 + .incbin "baserom.gba", 0x0166B8, 0x0000044 -.include "data/scripts/gUnk_080166FC.inc" +gUnk_080166FC:: @ 080166FC + .incbin "baserom.gba", 0x0166FC, 0x000009C -.include "data/scripts/gUnk_08016798.inc" +gUnk_08016798:: @ 08016798 + .incbin "baserom.gba", 0x016798, 0x00000AC -.include "data/scripts/gUnk_08016844.inc" +gUnk_08016844:: @ 08016844 + .incbin "baserom.gba", 0x016844, 0x000009C -.include "data/scripts/gUnk_080168E0.inc" +gUnk_080168E0:: @ 080168E0 + .incbin "baserom.gba", 0x0168E0, 0x0000014 -.include "data/scripts/gUnk_080168F4.inc" +gUnk_080168F4:: @ 080168F4 + .incbin "baserom.gba", 0x0168F4, 0x0000090 diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc index fac9d78b..01270dfa 100644 --- a/data/scripts/ezlo_angry.inc +++ b/data/scripts/ezlo_angry.inc @@ -35,18 +35,18 @@ Call sub_0807F3C8 TextboxNoOverlapFollowPos 0x1106,0x000c _0807EA94 _0807E930 0x001c -Call sub_0806D96C // Ezlo Angry FX +Call sub_0806D96C @ Ezlo Angry FX TextboxNoOverlapFollowPos 0x1107,0x000c _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 -Call sub_0807F3C8 // Ezlo Angry FX +Call sub_0807F3C8 @ Ezlo Angry FX TextboxNoOverlapFollowPos 0x1108,0x000c _0807EA94 _0807E930 0x001c -Call sub_0806D96C// Ezlo Angry FX +Call sub_0806D96C @ Ezlo Angry FX TextboxNoOverlapFollowPos 0x1109,0x000c _0807EA94 _0807E930 0x0020 @@ -61,7 +61,7 @@ CheckEntityInteractType JumpIfNot 0xfff0 StopScript _0807E864 -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1114,0x000c _0807EA94 @@ -78,7 +78,7 @@ WaitForSomething2 0x00000004 _0807EF80 0x000b _0807E5F8 0x00000008 WaitForSomething2 0x00000004 -Call sub_0806D944// Ezlo look at player +Call sub_0806D944 @ Ezlo look at player _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110a,0x000c _0807EA94 @@ -118,7 +118,7 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -137,7 +137,7 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB8C -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110f,0x000c _0807E930 0x0018 @@ -151,7 +151,7 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -170,7 +170,7 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB8C -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1110,0x000c _0807E930 0x0018 @@ -185,7 +185,7 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -206,7 +206,7 @@ Call sub_0807DF28 SoundReq0x80100000 _0807EF80 0x000b _0807EB8C -Call sub_0806D944 // Ezlo look at player +Call sub_0806D944 @ Ezlo look at player _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1111,0x000c _0807E930 0x0018 diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc index d60f2088..72bad7bf 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/gUnk_08008B5C.inc @@ -8,10 +8,127 @@ StopScript _0807E944 _0807E864 _0807E930 0x0004 -Call sub_0807F2D4 -Call sub_0806BBB0 +Call 0x0807f2d5 +Call 0x0806bbb1 _0807EA94 _0807E930 0x0008 _0807E878 Jump 0xffe2 .short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x000a +_0807E930 0x0000 +StopScript +_0807E944 +_0807E864 +_0807E930 0x0004 +Call 0x0807f2d5 +TextboxNoOverlapFollow 0x4912 +_0807EA94 +_0807E930 0x0008 +_0807E878 +Jump 0xffe4 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x000a +_0807E930 0x0000 +StopScript +_0807E944 +_0807E864 +SetGlobalFlag 0x0061 +_0807E930 0x0004 +Call 0x0807f2d5 +_0807EA94 +Call 0x0806ba35 +JumpIfNot 0x0066 +_0807EA94 +CallWithArg +.short 0xbb1d +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f2d5 +CallWithArg +.short 0xbb1d +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +Call 0x0806bb7d +JumpIfNot 0x0048 +TextboxNoOverlap 0x490c +_0807EA94 +LoadRoomEntityList 0x080d6784 +WaitForSomething 0x00000001 +WaitForSomething 0x00000004 +Wait 0x000f +SoundReq 0x0072 +_0807E930 0x0004 +Call 0x0807f2d5 +TextboxNoOverlap 0x4913 +_0807EA94 +_0807E930 0x0008 +Call 0x0807f2d5 +Jump 0x000a +_0807E930 0x0008 +Wait 0x000f +_0807EA94 +_0807E878 +Jump 0xff70 +StartScript +SetEntityPositionRelative 0x00180068 +_0807EF80 0x000f +_0807EB44 0x0004 +_0807E930 0x0004 +SetEntityNonPlanarMovement 0x0300 +SoundReq 0x0121 +StopScript +WaitForSomething 0x00000002 +TextboxNoOverlap 0x490d +_0807EA94 +_0807EF80 0x0007 +Call 0x08064d09 +_0807EDD4 0x0068, 0x0078 +Call 0x08064d11 +Wait 0x000f +_0807EB44 0x0002 +Wait 0x000f +Call 0x08064d09 +_0807EDD4 0x0098, 0x0078 +Call 0x08064d11 +Wait 0x000f +_0807EB44 0x0004 +SoundReq 0x007f +Wait 0x000f +_0807EB44 0x0002 +_0807EDD4 0x00ac, 0x0078 +Wait 0x000f +_0807EB44 0x0004 +SoundReq 0x007f +Wait 0x000f +_0807EB44 0x0002 +_0807EDD4 0x00c0, 0x0078 +Wait 0x000f +_0807EB44 0x0004 +SoundReq 0x007f +Wait 0x000f +_0807EB44 0x0006 +Wait 0x001e +Call 0x08064d09 +_0807EDD4 0x0068, 0x0078 +Call 0x08064d11 +Wait 0x000f +_0807EB44 0x0000 +Wait 0x000f +Call 0x08064d09 +_0807EDD4 0x0068, 0x0018 +Call 0x08064d11 +SoundReq 0x0121 +_0807E5F8 0x00000001 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08008B90.inc b/data/scripts/gUnk_08008B90.inc deleted file mode 100644 index 6466fc32..00000000 --- a/data/scripts/gUnk_08008B90.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08008B90 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -_0807E930 0x0004 -Call sub_0807F2D4 -TextboxNoOverlapFollow 0x4912 -_0807EA94 -_0807E930 0x0008 -_0807E878 -.short 0x0803 -.short 0xffe4 diff --git a/data/scripts/gUnk_08008BC0.inc b/data/scripts/gUnk_08008BC0.inc deleted file mode 100644 index 51a2ba13..00000000 --- a/data/scripts/gUnk_08008BC0.inc +++ /dev/null @@ -1,35 +0,0 @@ -SCRIPT_START gUnk_08008BC0 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -SetGlobalFlag 0x0061 -_0807E930 0x0004 -Call sub_0807F2D4 -_0807EA94 -Call sub_0806BA34 -JumpIfNot 0x0066 -_0807EA94 -CallWithArg sub_0806BB1C, 0x00000000 -Call sub_0807F2D4 -CallWithArg sub_0806BB1C, 0x00000001 -Call sub_0806BB7C -JumpIfNot 0x0048 -TextboxNoOverlap 0x490c -_0807EA94 -LoadRoomEntityList 0x080d6784 -WaitForSomething 0x00000001 -WaitForSomething 0x00000004 -Wait 0x000f -SoundReq 0x0072 -_0807E930 0x0004 -Call sub_0807F2D4 -TextboxNoOverlap 0x4913 -_0807EA94 -_0807E930 0x0008 -.short 0x0c0b -.short 0xf2d5 diff --git a/data/scripts/gUnk_08008C4E.inc b/data/scripts/gUnk_08008C4E.inc deleted file mode 100644 index d3e0563b..00000000 --- a/data/scripts/gUnk_08008C4E.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08008C4E -.short 0x0807 -.short 0x0803 -.short 0x000a -.short 0x0850 -.short 0x0008 -.short 0x0831 -.short 0x000f -.short 0x0459 -.short 0x0444 -.short 0x0803 -.short 0xff70 diff --git a/data/scripts/gUnk_08008C64.inc b/data/scripts/gUnk_08008C64.inc deleted file mode 100644 index fd75474f..00000000 --- a/data/scripts/gUnk_08008C64.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08008C64 -StartScript -SetEntityPositionRelative 0x00180068 -.byte 0x79 diff --git a/data/scripts/gUnk_08008C6D.inc b/data/scripts/gUnk_08008C6D.inc deleted file mode 100644 index 28bd166a..00000000 --- a/data/scripts/gUnk_08008C6D.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_08008C6D -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x3 -.byte 0x7b -.byte 0x8 diff --git a/data/scripts/gUnk_08008C7E.inc b/data/scripts/gUnk_08008C7E.inc deleted file mode 100644 index 022e1d38..00000000 --- a/data/scripts/gUnk_08008C7E.inc +++ /dev/null @@ -1,60 +0,0 @@ -SCRIPT_START gUnk_08008C7E -.byte 0x21 -.byte 0x1 -.byte 0x2 -.byte 0x4 -.byte 0x32 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0xd -.byte 0x49 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x9 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0x68 -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x9 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0x98 diff --git a/data/scripts/gUnk_08008CB9.inc b/data/scripts/gUnk_08008CB9.inc deleted file mode 100644 index 20ff7526..00000000 --- a/data/scripts/gUnk_08008CB9.inc +++ /dev/null @@ -1,152 +0,0 @@ -SCRIPT_START gUnk_08008CB9 -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x7f -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xac -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x7f -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xc0 -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x7f -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x9 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0x68 -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x9 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0x68 -.byte 0x0 -.byte 0x18 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x4d -.byte 0x6 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0x21 -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc index dc7c641f..0cc0f291 100644 --- a/data/scripts/gUnk_08008D8C.inc +++ b/data/scripts/gUnk_08008D8C.inc @@ -1,16 +1,125 @@ SCRIPT_START gUnk_08008D8C StartScript -Call sub_08061FD8 -Call sub_08061E70 +Call 0x08061fd9 +Call 0x08061e71 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_08061FD8 -Call sub_08062048 +Call 0x08061fd9 +Call 0x08062049 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x080643d9 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd2 +StartScript +SetEntityPositionRelative 0x00780088 +StopScript +CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +_0807F0B4 0x0001 +CameraTargetEntity +WaitForPlayerAction0x17 +Wait 0x003c +StartPlayerScript 0x08008f74 +WaitForSomething2 0x00000020 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +Wait 0x003c +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +Wait 0x000f +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +TextboxNoOverlapFollowPos +.short 0x1053 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000020 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807F034 0x0035 +WaitPlayerAction8 +StartPlayerScript 0x08008fc0 +WaitForSomething2 0x00000020 +_0807E8E4_0 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000010 +Wait 0x0078 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807E8E4_1 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807F034 0x0047 +WaitPlayerAction8 +_0807E914 0x00000003 +Call 0x0807f421 +_0807E8E4_0 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +_0807F0B4 0x0004 +CameraTargetPlayer +SetGlobalFlag 0x0015 +Call 0x0806dcc1 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08008DC0.inc b/data/scripts/gUnk_08008DC0.inc deleted file mode 100644 index e00bb2ff..00000000 --- a/data/scripts/gUnk_08008DC0.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08008DC0 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Call sub_080643D8 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -.short 0x0803 -.short 0xffd2 diff --git a/data/scripts/gUnk_08008E08.inc b/data/scripts/gUnk_08008E08.inc deleted file mode 100644 index 62659dc7..00000000 --- a/data/scripts/gUnk_08008E08.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08008E08 -StartScript diff --git a/data/scripts/gUnk_08008E0A.inc b/data/scripts/gUnk_08008E0A.inc deleted file mode 100644 index 7e94dd41..00000000 --- a/data/scripts/gUnk_08008E0A.inc +++ /dev/null @@ -1,51 +0,0 @@ -SCRIPT_START gUnk_08008E0A -SetEntityPositionRelative 0x00780088 -StopScript -CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807F0B4 0x0001 -CameraTargetEntity -WaitForPlayerAction0x17 -Wait 0x003c -StartPlayerScript 0x08008f74 -WaitForSomething2 0x00000020 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Wait 0x003c -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Wait 0x000f -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos 0x1053, 0x000e -_0807EA94 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807F034 0x0035 -WaitPlayerAction8 -StartPlayerScript 0x08008fc0 -WaitForSomething2 0x00000020 -_0807E8E4_0 -_0807E5F8 0x00000080 -.short 0x0c33 diff --git a/data/scripts/gUnk_08008F0C.inc b/data/scripts/gUnk_08008F0C.inc deleted file mode 100644 index a4861020..00000000 --- a/data/scripts/gUnk_08008F0C.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08008F0C -.short 0x0100 -.short 0x0000 -.short 0x0c28 -.short 0x0010 -.short 0x0000 diff --git a/data/scripts/gUnk_08008F16.inc b/data/scripts/gUnk_08008F16.inc deleted file mode 100644 index ad605c23..00000000 --- a/data/scripts/gUnk_08008F16.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08008F16 -Wait 0x0078 -_0807E5F8 0x00000080 -.short 0x0c33 -.short 0x0100 -.short 0x0000 diff --git a/data/scripts/gUnk_08008F26.inc b/data/scripts/gUnk_08008F26.inc deleted file mode 100644 index 3919213d..00000000 --- a/data/scripts/gUnk_08008F26.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_08008F26 -_0807E8E4_1 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807F034 0x0047 -WaitPlayerAction8 -_0807E914 0x00000003 -Call sub_0807F420 -_0807E8E4_0 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807F0B4 0x0004 -CameraTargetPlayer -SetGlobalFlag 0x0015 -Call sub_0806DCC0 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x00b8 -.short 0x0090 -.short 0x0861 -.short 0x0006 -.short 0x0879 -.short 0x0000 -.short 0x0c28 diff --git a/data/scripts/gUnk_08008F74.inc b/data/scripts/gUnk_08008F74.inc new file mode 100644 index 00000000..6f668430 --- /dev/null +++ b/data/scripts/gUnk_08008F74.inc @@ -0,0 +1,19 @@ +SCRIPT_START gUnk_08008F74 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x00b8, 0x0090 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000040 +_0807EF80 0x0001 +_0807EDD4 0x0088, 0x0078 +_0807EB44 0x0000 +_0807EF80 0x0000 +Wait 0x000f +_0807E5F8 0x00000020 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08008F90.inc b/data/scripts/gUnk_08008F90.inc deleted file mode 100644 index 90b432cd..00000000 --- a/data/scripts/gUnk_08008F90.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_08008F90 -.short 0x0020 -.short 0x0000 -.short 0x0c33 -.short 0x0040 -.short 0x0000 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x0088 -.short 0x0078 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0831 -.short 0x000f -.short 0x0c28 -.short 0x0020 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc index 9f53cce2..48226d21 100644 --- a/data/scripts/gUnk_08008FC0.inc +++ b/data/scripts/gUnk_08008FC0.inc @@ -1,4 +1,25 @@ SCRIPT_START gUnk_08008FC0 _0807F078 0x0001, 0x0001 -CallWithArg sub_0807F918, 0x00000001 -.byte 0x7b +CallWithArg +.short 0xf919 +.short 0x0807 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x0109 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x045f +.short 0x0000 +@ End of 4 parameters +Call 0x0807f305 +TextboxNoOverlapFollowPos +.short 0x0501 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000020 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08008FD1.inc b/data/scripts/gUnk_08008FD1.inc deleted file mode 100644 index 91ec5f96..00000000 --- a/data/scripts/gUnk_08008FD1.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START gUnk_08008FD1 -.byte 0x8 -.byte 0x9 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x39 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x5f -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x5 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x5c -.byte 0xc -.byte 0x1 -.byte 0x5 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08008FFC.inc b/data/scripts/gUnk_08008FFC.inc index 975b83e9..e65061c3 100644 --- a/data/scripts/gUnk_08008FFC.inc +++ b/data/scripts/gUnk_08008FFC.inc @@ -3,3 +3,16 @@ StartScript _0807EB44 0x0000 _0807E930 0x0000 StopScript +WaitForSomething 0x00000010 +SoundReq 0x011c +_0807E930 0x0001 +Wait 0x0010 +SoundReq 0x011c +_0807EB44 0x0004 +_0807E930 0x0006 +Wait 0x0010 +_0807EF80 0x000f +SetEntityNonPlanarMovement 0x0200 +_0807ECC4 0x1c20 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009008.inc b/data/scripts/gUnk_08009008.inc deleted file mode 100644 index 073f0128..00000000 --- a/data/scripts/gUnk_08009008.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_08009008 -WaitForSomething 0x00000010 -SoundReq 0x011c -_0807E930 0x0001 -Wait 0x0010 -SoundReq 0x011c -.byte 0x61 diff --git a/data/scripts/gUnk_0800901F.inc b/data/scripts/gUnk_0800901F.inc deleted file mode 100644 index c91d9fc0..00000000 --- a/data/scripts/gUnk_0800901F.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800901F -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x70 -.byte 0x8 -.byte 0x20 -.byte 0x1c -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc index 4ed2438f..09e886c8 100644 --- a/data/scripts/gUnk_0800903C.inc +++ b/data/scripts/gUnk_0800903C.inc @@ -16,3 +16,211 @@ _0807E9D4 _0807EF80 0x000a Jump 0x0202 .short 0x0000 +StartScript +Call 0x0807f349 +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E9D4 +_0807EF80 0x000a +StopScript +WaitForSomething2 0x00000080 +_0807EB44 0x0004 +_0807ECC4 0x0008 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x1050 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x1052 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807EB44 0x0006 +_0807E930 0x0005 +TextboxNoOverlapFollowPos +.short 0x1054 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807EB44 0x0004 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x1056 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x1057 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x1058 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000080 +_0807E930 0x0004 +TextboxNoOverlapFollowPos +.short 0x105c +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806673d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +StartScript +Call 0x0807f349 +_0807EB44 0x0006 +_0807EF80 0x0000 +StopScript +WaitForSomething2 0x00000001 +_0807EB74 +_0807EF80 0x0001 +TextboxNoOverlapFollowPos +.short 0x105b +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EF80 0x0005 +Wait 0x003c +_0807EF80 0x0001 +TextboxNoOverlapFollowPos +.short 0x1051 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EF80 0x0004 +Wait 0x003c +_0807EB74 +_0807EB8C +_0807EF80 0x0001 +TextboxNoOverlapFollowPos +.short 0x1055 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EB74 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0001 +_0807EDD4 0x0098, 0x0078 +_0807EB74 +_0807EF80 0x0000 +_0807EF80 0x0001 +TextboxNoOverlapFollowPos +.short 0x1059 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +StartScript +_0807E9D4 +_0807EF80 0x000a +Jump 0x0042 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +Call 0x080668f1 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08066905 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +.short 0x0000 +StartScript +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E9D4 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x105e +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +Call 0x0806672d +_0807EF80 0x000a +StopScript +Jump 0xfe90 +.short 0x0000 +StartScript +_0807EF80 0x000a +Call 0x08066e39 +_0807E9D4 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x1071 +_0807EA94 +_0807E878 +Jump 0xffec +.short 0x0000 +StartScript +StopScript +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08009080.inc b/data/scripts/gUnk_08009080.inc deleted file mode 100644 index 95ca1475..00000000 --- a/data/scripts/gUnk_08009080.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_08009080 -StartScript -Call sub_0807F348 -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E9D4 -_0807EF80 0x000a -StopScript -WaitForSomething2 0x00000080 -_0807EB44 0x0004 -_0807ECC4 0x0008 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x1050, 0x000e -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x1052, 0x000e -_0807EA94 -_0807EF80 0x0000 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 diff --git a/data/scripts/gUnk_080090DB.inc b/data/scripts/gUnk_080090DB.inc deleted file mode 100644 index c985e235..00000000 --- a/data/scripts/gUnk_080090DB.inc +++ /dev/null @@ -1,190 +0,0 @@ -SCRIPT_START gUnk_080090DB -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x54 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x56 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x57 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x58 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x5c -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0x67 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe6 -.byte 0xff diff --git a/data/scripts/gUnk_08009198.inc b/data/scripts/gUnk_08009198.inc deleted file mode 100644 index d65a60e8..00000000 --- a/data/scripts/gUnk_08009198.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_08009198 -StartScript -Call sub_0807F348 -_0807EB44 0x0006 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000001 -_0807EB74 -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x105b, 0x0000 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EF80 0x0005 -Wait 0x003c -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x1051, 0x0000 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -.byte 0x79 diff --git a/data/scripts/gUnk_08009207.inc b/data/scripts/gUnk_08009207.inc deleted file mode 100644 index bee9bb90..00000000 --- a/data/scripts/gUnk_08009207.inc +++ /dev/null @@ -1,110 +0,0 @@ -SCRIPT_START gUnk_08009207 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x55 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x98 -.byte 0x0 -.byte 0x78 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x59 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x53 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x42 -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08009274.inc b/data/scripts/gUnk_08009274.inc deleted file mode 100644 index 5a45094a..00000000 --- a/data/scripts/gUnk_08009274.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08009274 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_080668F0 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08066904 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 diff --git a/data/scripts/gUnk_080092A8.inc b/data/scripts/gUnk_080092A8.inc deleted file mode 100644 index a0ec8edd..00000000 --- a/data/scripts/gUnk_080092A8.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_080092A8 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x105e -_0807EA94 -Wait 0x000f -_0807E878 -.short 0x0803 -.short 0xffe8 diff --git a/data/scripts/gUnk_080092D4.inc b/data/scripts/gUnk_080092D4.inc deleted file mode 100644 index d12ec231..00000000 --- a/data/scripts/gUnk_080092D4.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080092D4 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0806672C -_0807EF80 0x000a -StopScript -Jump 0xfe90 -.short 0x0000 diff --git a/data/scripts/gUnk_080092F0.inc b/data/scripts/gUnk_080092F0.inc deleted file mode 100644 index 78f1e8c2..00000000 --- a/data/scripts/gUnk_080092F0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080092F0 -StartScript -_0807EF80 0x000a -Call sub_08066E38 -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 diff --git a/data/scripts/gUnk_08009308.inc b/data/scripts/gUnk_08009308.inc deleted file mode 100644 index bd43b0be..00000000 --- a/data/scripts/gUnk_08009308.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_08009308 -_0807EB74 -TextboxNoOverlap 0x1071 -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/gUnk_08009320.inc index 381ac07b..090040a3 100644 --- a/data/scripts/gUnk_08009320.inc +++ b/data/scripts/gUnk_08009320.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009320 StartScript -Call sub_0806D650 +Call 0x0806d651 SetEntityNonPlanarMovement 0x0010 StopScript _0807EEF4 0xfff8, 0x0000 diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/gUnk_08009348.inc index aab9e58c..9ef9c57c 100644 --- a/data/scripts/gUnk_08009348.inc +++ b/data/scripts/gUnk_08009348.inc @@ -5,8 +5,8 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 -Call sub_0806D638 +Call 0x0807df29 +Call 0x0806d639 _0807F0B4 0x0001 CameraTargetEntity CheckGlobalFlag 0x0055 @@ -14,14 +14,12 @@ JumpIf 0x002c TextboxNoOverlap 0x1d01 _0807EA94 _0807EA94 -Call sub_0806D640 +Call 0x0806d641 _0807F0B4 0x0001 CameraTargetPlayer Wait 0x002d _0807F0B4 0x0004 _0807E878 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 +Call 0x0807df51 +Jump 0xffb8 +SCRIPT_END diff --git a/data/scripts/gUnk_08009393.inc b/data/scripts/gUnk_08009393.inc deleted file mode 100644 index 9aa38ba6..00000000 --- a/data/scripts/gUnk_08009393.inc +++ /dev/null @@ -1,35 +0,0 @@ -SCRIPT_START gUnk_08009393 -.short 0x0308 -.short 0xb808 -.short 0xffff -.short 0x12ff -.short 0xae08 -.short 0x0400 -.short 0x9e08 -.short 0x0f00 -.short 0x0d08 -.short 0x0400 -.short 0x1408 -.short 0x0f00 -.short 0x0e08 -.short 0x0400 -.short 0x0c08 -.short 0x5b00 -.short 0x0208 -.short 0x591d -.short 0x0304 -.short 0xbc08 -.short 0x0fff -.short 0x0e08 -.short 0x0500 -.short 0x1808 -.short 0x0b00 -.short 0x890c -.short 0x06d7 -.short 0x5b08 -.short 0x0308 -.short 0x591d -.short 0x0b04 -.short 0x0d0c -.short 0x06d7 -.short 0x0308 diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc new file mode 100644 index 00000000..2ba22ab9 --- /dev/null +++ b/data/scripts/gUnk_0800939A.inc @@ -0,0 +1,51 @@ +SCRIPT_START gUnk_0800939A +CheckLocalFlag 0x00ae +JumpIf 0x009e +CheckInventory1 0x000d +JumpIf 0x0014 +CheckInventory1 0x000e +JumpIf 0x000c +TextboxNoOverlap 0x1d02 +_0807EA94 +Jump 0xffbc +CheckInventory1 0x000e +JumpIfNot 0x0018 +Call 0x0806d789 +TextboxNoOverlap 0x1d03 +_0807EA94 +Call 0x0806d70d +Jump 0xff9e +_0807E914 0x00001d05 +CheckLocalFlag 0x00ad +JumpIf 0x0008 +_0807E914 0x00001d04 +TextboxNoOverlapVar +_0807EA94 +_0807E3E8 +JumpIfNot 0xff80 +Wait 0x001e +TextboxNoOverlap 0x1d08 +_0807EA94 +LoadRoomEntityList 0x080f9c38 +Wait 0x0078 +Call 0x0806d6d1 +Wait 0x00b4 +Call 0x0806d70d +Wait 0x0078 +SetLocalFlag 0x00ae +SetLocalFlag 0x00ad +Call 0x0806d5d5 +_0807EB8C +TextboxNoOverlap 0x1d09 +_0807EA94 +Wait 0x000a +Jump 0xff3a +Call 0x0806d601 +JumpIf 0x000c +TextboxNoOverlap 0x1d0a +_0807EA94 +JumpIfNot 0xff26 +TextboxNoOverlap 0x1d0b +_0807EA94 +Call 0x0806d74d +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_080093D7.inc b/data/scripts/gUnk_080093D7.inc deleted file mode 100644 index af980951..00000000 --- a/data/scripts/gUnk_080093D7.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_080093D7 -.short 0x9e08 -.short 0x4eff -.short 0x050c -.short 0x001d -.short 0x1200 -.short 0xad08 -.short 0x0400 -.short 0x0808 -.short 0x4e00 -.short 0x040c -.short 0x001d -.short 0x5e00 -.short 0x5904 -.short 0x1c04 -.short 0x0504 -.short 0x8008 -.short 0x31ff -.short 0x1e08 -.short 0x5b00 -.short 0x0808 -.short 0x591d -.short 0x0d04 -.short 0x380c -.short 0x0f9c diff --git a/data/scripts/gUnk_08009407.inc b/data/scripts/gUnk_08009407.inc deleted file mode 100644 index 4db8cbf7..00000000 --- a/data/scripts/gUnk_08009407.inc +++ /dev/null @@ -1,128 +0,0 @@ -SCRIPT_START gUnk_08009407 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd1 -.byte 0xd6 -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0xb4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd -.byte 0xd7 -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0xae -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0xad -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd5 -.byte 0xd5 -.byte 0x6 -.byte 0x8 -.byte 0x64 -.byte 0x4 -.byte 0x5b -.byte 0x8 -.byte 0x9 -.byte 0x1d -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x3a -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0x1 -.byte 0xd6 -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x8 -.byte 0xc -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0xa -.byte 0x1d -.byte 0x59 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x26 -.byte 0xff -.byte 0x5b -.byte 0x8 -.byte 0xb -.byte 0x1d -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x4d -.byte 0xd7 -.byte 0x6 -.byte 0x8 -.byte 0x8a -.byte 0xc -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xd -.byte 0xc -.byte 0x58 -.byte 0x9c -.byte 0xf -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd -.byte 0xd7 -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x2c -.byte 0x8 -.byte 0xae -.byte 0x0 diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc new file mode 100644 index 00000000..b3819468 --- /dev/null +++ b/data/scripts/gUnk_08009464.inc @@ -0,0 +1,28 @@ +SCRIPT_START gUnk_08009464 +Wait 0x003c +_0807F0C8 0x0000, 0x0000 +LoadRoomEntityList 0x080f9c58 +Wait 0x003c +Call 0x0806d70d +Wait 0x003c +ClearLocalFlag 0x00ae +Call 0x0806d621 +Wait 0x003c +WaitPlayerAction8 +_0807EB8C +TextboxNoOverlap 0x1d0c +_0807EA94 +Wait 0x000a +Jump 0xfed6 +.short 0x0000 +StartScript +Call 0x0806d7c5 +SetEntityNonPlanarMovement 0x0080 +StopScript +Wait 0x003c +SetEntity0x20 0x00018000 +_0807EE30 +JumpIfNot 0xfffc +Wait 0x003c +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009486.inc b/data/scripts/gUnk_08009486.inc deleted file mode 100644 index 4904ed77..00000000 --- a/data/scripts/gUnk_08009486.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_08009486 -Call sub_0806D620 -Wait 0x003c -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlap 0x1d0c -_0807EA94 -Wait 0x000a -Jump 0xfed6 -.short 0x0000 diff --git a/data/scripts/gUnk_080094A4.inc b/data/scripts/gUnk_080094A4.inc deleted file mode 100644 index db7ed246..00000000 --- a/data/scripts/gUnk_080094A4.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_080094A4 -StartScript -Call sub_0806D7C4 -SetEntityNonPlanarMovement 0x0080 -StopScript -Wait 0x003c -SetEntity0x20 0x00018000 -_0807EE30 -JumpIfNot 0xfffc -Wait 0x003c -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/gUnk_080094CC.inc index d276472a..c5645f6e 100644 --- a/data/scripts/gUnk_080094CC.inc +++ b/data/scripts/gUnk_080094CC.inc @@ -1,6 +1,14 @@ SCRIPT_START gUnk_080094CC StartScript -Call sub_0806D804 -.byte 0x67 -.byte 0x8 -.byte 0x80 +Call 0x0806d805 +SetEntityNonPlanarMovement 0x0180 +StopScript +Wait 0x003c +SetEntity0x20 0x00018000 +Call 0x0806d859 +_0807EE30 +JumpIfNot 0xfffc +Wait 0x001e +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080094D7.inc b/data/scripts/gUnk_080094D7.inc deleted file mode 100644 index f5d95cdd..00000000 --- a/data/scripts/gUnk_080094D7.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_080094D7 -.byte 0x1 -.byte 0x2 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x68 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x1 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0xd8 -.byte 0x6 -.byte 0x8 -.byte 0x75 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/gUnk_080094FC.inc index 4f661dba..74183f6a 100644 --- a/data/scripts/gUnk_080094FC.inc +++ b/data/scripts/gUnk_080094FC.inc @@ -1,7 +1,69 @@ SCRIPT_START gUnk_080094FC StartScript -.byte 0xb -.byte 0xc -.byte 0x1 -.byte 0x71 -.byte 0x6 +Call 0x08067101 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EF80 0x0001 +_0807EB74 +Call 0x080670b5 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0000 +Jump 0xffde +.short 0x0000 +StartScript +Call 0x08067101 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EF80 0x0001 +_0807EB74 +Call 0x080670e5 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0000 +Jump 0xffde +.short 0x0000 +StartScript +Call 0x08067315 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E914 0x00000000 +Call 0x080672b1 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807E914 0x00000004 +Call 0x080672b1 +Call 0x080672c9 +_0807EA94 +Wait 0x000f +_0807E878 +_0807EB44 0x0004 +_0807E914 0x00000000 +Call 0x080672b1 +Jump 0xffca +.short 0x0000 +StartScript +Call 0x0806be3d +_0807EF80 0x000a +_0807EF80 0x0007 +StopScript +Call 0x0806bf45 +JumpIf 0x000c +_0807EF80 0x000b +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009503.inc b/data/scripts/gUnk_08009503.inc deleted file mode 100644 index d3b5e361..00000000 --- a/data/scripts/gUnk_08009503.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08009503 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 diff --git a/data/scripts/gUnk_08009508.inc b/data/scripts/gUnk_08009508.inc deleted file mode 100644 index 307a6777..00000000 --- a/data/scripts/gUnk_08009508.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08009508 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EF80 0x0001 -_0807EB74 -Call sub_080670B4 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 diff --git a/data/scripts/gUnk_08009538.inc b/data/scripts/gUnk_08009538.inc deleted file mode 100644 index 7472c60a..00000000 --- a/data/scripts/gUnk_08009538.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08009538 -StartScript -Call sub_08067100 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EF80 0x0001 -_0807EB74 -Call sub_080670E4 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 diff --git a/data/scripts/gUnk_08009574.inc b/data/scripts/gUnk_08009574.inc deleted file mode 100644 index 3b89e47a..00000000 --- a/data/scripts/gUnk_08009574.inc +++ /dev/null @@ -1,23 +0,0 @@ -SCRIPT_START gUnk_08009574 -StartScript -Call sub_08067314 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_080672B0 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807E914 0x00000004 -Call sub_080672B0 -Call sub_080672C8 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_080672B0 -Jump 0xffca -.short 0x0000 diff --git a/data/scripts/gUnk_080095CC.inc b/data/scripts/gUnk_080095CC.inc deleted file mode 100644 index 2e964cf0..00000000 --- a/data/scripts/gUnk_080095CC.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_080095CC -StartScript -Call sub_0806BE3C -_0807EF80 0x000a -_0807EF80 0x0007 -StopScript -Call sub_0806BF44 -JumpIf 0x000c -_0807EF80 0x000b -_0807EF80 0x0006 -SCRIPT_END -.short 0x0418 -.short 0x0805 -.short 0xffe8 -.short 0x0443 -.short 0x0463 -.short 0x0879 -.short 0x0001 -.short 0x0c0b -.short 0xbe85 -.short 0x0806 -.short 0x0459 -.short 0x0805 -.short 0x0018 -.short 0x087b -.short 0x0109 -.short 0x0886 -.short 0x003c -.short 0x085a -.short 0x053c -.short 0x0434 -.short 0x0459 -.short 0x0c85 -.short 0x003c -.short 0x0001 -.short 0x0444 -.short 0x0879 -.short 0x0000 -.short 0x0803 -.short 0xffb4 diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc new file mode 100644 index 00000000..8caf6bad --- /dev/null +++ b/data/scripts/gUnk_080095F2.inc @@ -0,0 +1,73 @@ +SCRIPT_START gUnk_080095F2 +CheckEntityInteractType +JumpIfNot 0xffe8 +_0807E864 +_0807EB74 +_0807EF80 0x0001 +Call 0x0806be85 +_0807EA94 +JumpIfNot 0x0018 +SoundReq 0x0109 +_0807F088 0x003c +TextboxNoOverlapFollow 0x053c +WaitPlayerAction8 +_0807EA94 +_0807F078 0x003c, 0x0001 +_0807E878 +_0807EF80 0x0000 +Jump 0xffb4 +StartScript +_0807EF80 0x000b +_0807EF80 0x0008 +StopScript +StopScript +StartScript +CheckGlobalFlag 0x0020 +JumpIfNot 0xfff6 +StopScript +Call 0x0806bf45 +JumpIf 0xfff8 +StopScript +Call 0x0806be3d +_0807EF80 0x000a +_0807EF80 0x0007 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0001 +Call 0x0806bec9 +_0807EA94 +JumpIfNot 0x0016 +SoundReq 0x0111 +SoundReq 0x0072 +_0807F078 0x003c, 0x0002 +Call 0x0806befd +_0807E878 +_0807EF80 0x0000 +Jump 0xffca +StartScript +_0807EF80 0x0007 +Jump 0x005c +CheckGlobalFlag 0x0020 +JumpIf 0x0054 +StopScript +CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x08009704 +WaitForSomething2 0x00000001 +SoundReq 0x0111 +_0807EF80 0x0008 +LoadRoomEntityList 0x080d9048 +Wait 0x000f +SoundReq 0x0111 +_0807EF80 0x0007 +CheckGlobalFlag 0x0020 +JumpIfNot 0xfffa +Call 0x0807df51 +_0807E878 +Call 0x0808692d +SCRIPT_END diff --git a/data/scripts/gUnk_0800962C.inc b/data/scripts/gUnk_0800962C.inc deleted file mode 100644 index 2c2ef3fd..00000000 --- a/data/scripts/gUnk_0800962C.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_0800962C -StartScript -_0807EF80 0x000b -_0807EF80 0x0008 -StopScript -StopScript -StartScript -CheckGlobalFlag 0x0020 -JumpIfNot 0xfff6 -StopScript -Call sub_0806BF44 -JumpIf 0xfff8 -StopScript -Call sub_0806BE3C -_0807EF80 0x000a -_0807EF80 0x0007 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806BEC8 -_0807EA94 -JumpIfNot 0x0016 -SoundReq 0x0111 -SoundReq 0x0072 -_0807F078 0x003c, 0x0002 -Call sub_0806BEFC -_0807E878 -_0807EF80 0x0000 -.short 0x0803 -.short 0xffca diff --git a/data/scripts/gUnk_08009698.inc b/data/scripts/gUnk_08009698.inc deleted file mode 100644 index 8af24e88..00000000 --- a/data/scripts/gUnk_08009698.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_08009698 -StartScript -_0807EF80 0x0007 -Jump 0x005c -CheckGlobalFlag 0x0020 -JumpIf 0x0054 -StopScript -CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript 0x08009704 -WaitForSomething2 0x00000001 -SoundReq 0x0111 -_0807EF80 0x0008 -LoadRoomEntityList 0x080d9048 -Wait 0x000f -SoundReq 0x0111 -_0807EF80 0x0007 -CheckGlobalFlag 0x0020 -JumpIfNot 0xfffa -Call sub_0807DF50 -_0807E878 -Call sub_0808692C -SCRIPT_END diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/gUnk_08009704.inc index 6e733e50..715fd5d9 100644 --- a/data/scripts/gUnk_08009704.inc +++ b/data/scripts/gUnk_08009704.inc @@ -1,2 +1,15 @@ SCRIPT_START gUnk_08009704 -.short 0x0867 +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0001 +_0807EDD4 0x01a0, 0x01b0 +_0807EB44 0x0000 +_0807EF80 0x0000 +Wait 0x000a +_0807EF80 0x0004 +Wait 0x003c +_0807E5F8 0x00000001 +_0807EF80 0x000d +SetEntityNonPlanarMovement 0x0100 +_0807ECC4 0x0010 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08009706.inc b/data/scripts/gUnk_08009706.inc deleted file mode 100644 index 4978f927..00000000 --- a/data/scripts/gUnk_08009706.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_08009706 -.short 0x0080 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x01a0 -.short 0x01b0 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0831 -.short 0x000a -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0879 -.short 0x000d -.short 0x0867 -.short 0x0100 -.short 0x0870 -.short 0x0010 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/gUnk_08009740.inc index 71021433..7f7aed61 100644 --- a/data/scripts/gUnk_08009740.inc +++ b/data/scripts/gUnk_08009740.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009740 StartScript -Call sub_08065D00 +Call 0x08065d01 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a @@ -11,8 +11,35 @@ JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0000 -Call sub_08065F64 +Call 0x08065f65 _0807EA94 _0807E878 Jump 0xffe6 .short 0x0000 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +SoundReq 0x01f3 +Call 0x0807f40d +_0807E8E4_1 +Wait 0x000a +_0807E8E4_3 +Wait 0x0032 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +StartPlayerScript 0x0800987c +WaitForSomething2 0x00000040 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000010 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000040 +_0807F078 0x003c, 0x0000 +SetGlobalFlag 0x0020 +_0807E8E4_3 +Wait 0x001e +_0807EB28 0x2809 +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009778.inc b/data/scripts/gUnk_08009778.inc deleted file mode 100644 index ab8d80c6..00000000 --- a/data/scripts/gUnk_08009778.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08009778 -_0807E864 -Call sub_0807F9A4 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 diff --git a/data/scripts/gUnk_08009786.inc b/data/scripts/gUnk_08009786.inc deleted file mode 100644 index 86ce5f88..00000000 --- a/data/scripts/gUnk_08009786.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08009786 -SoundReq 0x01f3 -Call sub_0807F40C -_0807E8E4_1 -Wait 0x000a -_0807E8E4_3 -Wait 0x0032 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_080097A1.inc b/data/scripts/gUnk_080097A1.inc deleted file mode 100644 index 541696f5..00000000 --- a/data/scripts/gUnk_080097A1.inc +++ /dev/null @@ -1,80 +0,0 @@ -SCRIPT_START gUnk_080097A1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0x7c -.byte 0x98 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x85 -.byte 0xc -.byte 0x3c -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2d -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x4c -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x5f -.byte 0x8 -.byte 0x9 -.byte 0x28 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/gUnk_080097F0.inc index a6bab11d..bff642f6 100644 --- a/data/scripts/gUnk_080097F0.inc +++ b/data/scripts/gUnk_080097F0.inc @@ -3,18 +3,18 @@ StartScript _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000002 SoundReq 0x0123 -Call sub_0807F1A0 +Call 0x0807f1a1 StopScript StartScript _0807EE30 JumpIfNot 0xfff8 StopScript _0807E5F8 0x00000004 -Call sub_0807FBD4 +Call 0x0807fbd5 SoundReq 0x01f3 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/gUnk_08009838.inc index 8bb51dfe..0d88acaf 100644 --- a/data/scripts/gUnk_08009838.inc +++ b/data/scripts/gUnk_08009838.inc @@ -3,59 +3,15 @@ StartScript _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000008 -Call sub_0809E0A0 -Call sub_0809E0D4 +Call 0x0809e0a1 +Call 0x0809e0d5 SoundReq 0x01f3 -Call sub_0807FBD4 +Call 0x0807fbd5 SoundReq 0x01f3 _0807E5F8 0x00000010 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x087b -.short 0x007a -.short 0x0861 -.short 0x0004 -.short 0x087b -.short 0x0086 -.short 0x0c0b -.short 0xf36d -.short 0x0807 -.short 0x0867 -.short 0x0400 -.short 0x0871 -.short 0x0004 -.short 0x0c0b -.short 0xf1e9 -.short 0x0807 -.short 0x0831 -.short 0x001e -.short 0x0c28 -.short 0x0040 -.short 0x0000 -.short 0x0c33 -.short 0x0020 -.short 0x0000 -.short 0x087b -.short 0x007c -.short 0x0861 -.short 0x0004 -.short 0x0c0b -.short 0xf211 -.short 0x0807 -.short 0x0c78 -.short 0x0200 -.short 0x0020 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0040 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800987C.inc b/data/scripts/gUnk_0800987C.inc new file mode 100644 index 00000000..dac50ce8 --- /dev/null +++ b/data/scripts/gUnk_0800987C.inc @@ -0,0 +1,20 @@ +SCRIPT_START gUnk_0800987C +SoundReq 0x007a +_0807EB44 0x0004 +SoundReq 0x0086 +Call 0x0807f36d +SetEntityNonPlanarMovement 0x0400 +_0807ECF4 0x0004 +Call 0x0807f1e9 +Wait 0x001e +_0807E5F8 0x00000040 +WaitForSomething2 0x00000020 +SoundReq 0x007c +_0807EB44 0x0004 +Call 0x0807f211 +_0807EF3C 0x0200, 0x0020 +_0807EF80 0x0000 +_0807E5F8 0x00000040 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/gUnk_080098D4.inc index ef2ea423..49891782 100644 --- a/data/scripts/gUnk_080098D4.inc +++ b/data/scripts/gUnk_080098D4.inc @@ -9,11 +9,11 @@ CheckLocalFlag 0x005d JumpIf 0x0022 SetLocalFlag 0x005d _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 _0807EB28 0x280a _0807EA94 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/gUnk_08009918.inc index 9c759fe3..ad958eb6 100644 --- a/data/scripts/gUnk_08009918.inc +++ b/data/scripts/gUnk_08009918.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009918 StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 _0807E5F8 0x00000000 StopScript @@ -8,5 +8,8 @@ WaitFor_2 Wait 0x0078 _0807E5F8 0x00000004 WaitForSomething2 0x00000001 -.short 0x082d -.short 0x001c +SetGlobalFlag 0x001c +Call 0x0807df51 +_0807E878 +Call 0x0807921d +SCRIPT_END diff --git a/data/scripts/gUnk_08009940.inc b/data/scripts/gUnk_08009940.inc deleted file mode 100644 index b94a43d3..00000000 --- a/data/scripts/gUnk_08009940.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08009940 -Call sub_0807DF50 -_0807E878 -Call sub_0807921C -SCRIPT_END diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/gUnk_08009950.inc index c4f64c1e..d7c33754 100644 --- a/data/scripts/gUnk_08009950.inc +++ b/data/scripts/gUnk_08009950.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009950 StartScript -Call sub_0807F348 +Call 0x0807f349 SetEntityNonPlanarMovement 0x0040 _0807EB44 0x0004 _0807E930 0x000c @@ -33,5 +33,5 @@ Wait 0x001e _0807E778 0x0002 DoFade5 WaitFor_2 -Call sub_08053634 +Call 0x08053635 SCRIPT_END diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/gUnk_080099DC.inc index f2aa379b..5b644539 100644 --- a/data/scripts/gUnk_080099DC.inc +++ b/data/scripts/gUnk_080099DC.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_080099DC StartScript -Call sub_0807F348 +Call 0x0807f349 SetEntityNonPlanarMovement 0x00c0 _0807EB44 0x0002 _0807EF80 0x0008 @@ -8,4 +8,16 @@ StopScript WaitForSomething2 0x00000004 _0807EF80 0x0007 _0807EDD4 0x0068, 0x0060 -.short 0x0831 +Wait 0x000f +TextboxNoOverlapFollow 0x1001 +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EF80 0x0001 +TextboxNoOverlapFollow 0x1003 +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08009A04.inc b/data/scripts/gUnk_08009A04.inc deleted file mode 100644 index 017cff95..00000000 --- a/data/scripts/gUnk_08009A04.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08009A04 -.byte 0xf -.byte 0x0 -.byte 0x5a diff --git a/data/scripts/gUnk_08009A07.inc b/data/scripts/gUnk_08009A07.inc deleted file mode 100644 index 0ea8dd36..00000000 --- a/data/scripts/gUnk_08009A07.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_08009A07 -.byte 0x8 -.byte 0x1 -.byte 0x10 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x3 -.byte 0x10 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc diff --git a/data/scripts/gUnk_08009A2C.inc b/data/scripts/gUnk_08009A2C.inc deleted file mode 100644 index 361b494b..00000000 --- a/data/scripts/gUnk_08009A2C.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08009A2C -.short 0x0008 -.short 0x0000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/gUnk_08009A34.inc index cddc151e..1b075e04 100644 --- a/data/scripts/gUnk_08009A34.inc +++ b/data/scripts/gUnk_08009A34.inc @@ -1,8 +1,20 @@ SCRIPT_START gUnk_08009A34 Wait 0x003c -Call sub_08066258 +Call 0x08066259 Wait 0x001e -Call sub_08066258 +Call 0x08066259 Wait 0x005a -.short 0x0803 -.short 0xffea +Jump 0xffea +SetEntityPositionRelative 0x01780240 +CameraTargetEntity +SetEntityNonPlanarMovement 0x0080 +Wait 0x0078 +SoundReq2 0x0036 +_0807E778 0x0002 +DoFade4 +WaitFor_2 +Wait 0x0078 +_0807E5F8 0x00000004 +Call 0x08053649 +_0807EDD4 0x0240, 0x0228 +SCRIPT_END diff --git a/data/scripts/gUnk_08009A50.inc b/data/scripts/gUnk_08009A50.inc deleted file mode 100644 index c41d6a9d..00000000 --- a/data/scripts/gUnk_08009A50.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08009A50 -SetEntityPositionRelative 0x01780240 -CameraTargetEntity -SetEntityNonPlanarMovement 0x0080 -Wait 0x0078 -SoundReq2 0x0036 -_0807E778 0x0002 -DoFade4 -WaitFor_2 -Wait 0x0078 -_0807E5F8 0x00000004 -.byte 0xb diff --git a/data/scripts/gUnk_08009A77.inc b/data/scripts/gUnk_08009A77.inc deleted file mode 100644 index edb32b26..00000000 --- a/data/scripts/gUnk_08009A77.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08009A77 -.short 0x490c -.short 0x0536 -.short 0x7308 -.short 0x400c -.short 0x2802 diff --git a/data/scripts/gUnk_08009A81.inc b/data/scripts/gUnk_08009A81.inc deleted file mode 100644 index eef0be65..00000000 --- a/data/scripts/gUnk_08009A81.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08009A81 -.byte 0x2 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08009A84.inc b/data/scripts/gUnk_08009A84.inc index cd06d4ab..f082bf1f 100644 --- a/data/scripts/gUnk_08009A84.inc +++ b/data/scripts/gUnk_08009A84.inc @@ -11,4 +11,16 @@ _0807EDD4 0x01f8, 0x0218 _0807EDD4 0x0220, 0x0228 _0807EDD4 0x0240, 0x0228 CameraTargetEntity -.byte 0x73 +_0807EDD4 0x0290, 0x0228 +_0807EDD4 0x0290, 0x01f8 +SetEntityNonPlanarMovement 0x0080 +_0807EDD4 0x0290, 0x01c8 +SetEntityNonPlanarMovement 0x00c0 +_0807EDD4 0x0290, 0x0198 +Wait 0x001e +_0807E5F8 0x00000010 +_0807EDD4 0x0290, 0x0190 +_0807EF80 0x0008 +_0807EDD4 0x0290, 0x0188 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08009ABB.inc b/data/scripts/gUnk_08009ABB.inc deleted file mode 100644 index 413a352b..00000000 --- a/data/scripts/gUnk_08009ABB.inc +++ /dev/null @@ -1,62 +0,0 @@ -SCRIPT_START gUnk_08009ABB -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0x28 -.byte 0x2 -.byte 0x73 -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0xf8 -.byte 0x1 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0xc8 -.byte 0x1 -.byte 0x67 -.byte 0x8 -.byte 0xc0 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0x98 -.byte 0x1 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0x90 -.byte 0x1 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x90 -.byte 0x2 -.byte 0x88 -.byte 0x1 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/gUnk_08009AF8.inc index ebcae1d4..d2cdd178 100644 --- a/data/scripts/gUnk_08009AF8.inc +++ b/data/scripts/gUnk_08009AF8.inc @@ -11,6 +11,6 @@ Wait 0x005a _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -Call sub_0805367C +Call 0x0805367d SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/gUnk_08009B30.inc index a4964eca..e24ce455 100644 --- a/data/scripts/gUnk_08009B30.inc +++ b/data/scripts/gUnk_08009B30.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009B30 StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 SetLocalFlag 0x0046 StopScript @@ -9,8 +9,12 @@ Wait 0x001e TextboxNoOverlapFollow 0x1005 _0807EA94 Wait 0x003c -Call sub_0807529C +Call 0x0807529d Wait 0x003c _0807EF80 0x0014 Wait 0x001e -.byte 0xb +Call 0x08053251 +_0807E878 +Call 0x0807df51 +Call 0x080791d1 +SCRIPT_END diff --git a/data/scripts/gUnk_08009B63.inc b/data/scripts/gUnk_08009B63.inc deleted file mode 100644 index 75b26ee3..00000000 --- a/data/scripts/gUnk_08009B63.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_08009B63 -.byte 0xc -.byte 0x51 -.byte 0x32 -.byte 0x5 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xd1 -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc index 5248ef2a..32e85c18 100644 --- a/data/scripts/gUnk_08009B78.inc +++ b/data/scripts/gUnk_08009B78.inc @@ -3,7 +3,7 @@ StartScript _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0080 _0807E9D4 -Call sub_0807F348 +Call 0x0807f349 StopScript CheckGlobalFlag 0x0013 JumpIf 0x00ba @@ -11,14 +11,17 @@ _0807E888 Wait 0x000a _0807E864 StartPlayerScript 0x08009cfc -Call sub_0807DF28 +Call 0x0807df29 WaitForSomething2 0x00000008 _0807EDD4 0x0080, 0x005c _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x000f _0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x1009, 0x0000 +TextboxNoOverlapFollowPos +.short 0x1009 +.short 0x0000 +@ End of 2 parameters _0807E8E4_1 _0807EA94 _0807EF80 0x0000 @@ -26,7 +29,10 @@ _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C _0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x100b, 0x0000 +TextboxNoOverlapFollowPos +.short 0x100b +.short 0x0000 +@ End of 2 parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -40,12 +46,15 @@ _0807EF80 0x000c _0807EF80 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 -Call sub_08053250 +Call 0x08053251 _0807F034 0x0034 WaitPlayerAction8 _0807E8E4_1 _0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x100c, 0x0000 +TextboxNoOverlapFollowPos +.short 0x100c +.short 0x0000 +@ End of 2 parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc index 3b9ae6ae..279008d7 100644 --- a/data/scripts/gUnk_08009C68.inc +++ b/data/scripts/gUnk_08009C68.inc @@ -2,10 +2,44 @@ SCRIPT_START gUnk_08009C68 StartScript _0807EB44 0x0002 SetEntityNonPlanarMovement 0x0100 -Call sub_0807F348 +Call 0x0807f349 StopScript -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 +WaitForSomething2 0x00000004 +_0807EF80 0x0004 +_0807EB74 +WaitForSomething2 0x00000004 +_0807EB74 +WaitForSomething2 0x00000004 +_0807EB74 +_0807EB8C +_0807EF80 0x0001 +TextboxNoOverlapFollowPos +.short 0x100a +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EB8C +_0807EF80 0x0001 +_0807EB8C +_0807EB44 0x0002 +TextboxNoOverlapFollowPos +.short 0x100d +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807EF80 0x0000 +_0807EDD4 0x0028, 0x0060 +_0807EDD4 0x0000, 0x0060 +Call 0x080536a9 +Wait 0x001e +StartScript +SetGlobalFlag 0x0013 +Call 0x0807df51 +Call 0x080791d1 +_0807E878 +StopScript +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08009C7F.inc b/data/scripts/gUnk_08009C7F.inc deleted file mode 100644 index 714700f4..00000000 --- a/data/scripts/gUnk_08009C7F.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_08009C7F -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x5c -.byte 0xc diff --git a/data/scripts/gUnk_08009C9E.inc b/data/scripts/gUnk_08009C9E.inc deleted file mode 100644 index 39d4756f..00000000 --- a/data/scripts/gUnk_08009C9E.inc +++ /dev/null @@ -1,50 +0,0 @@ -SCRIPT_START gUnk_08009C9E -.short 0x100a -.short 0x0000 -.short 0x0459 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0008 -.short 0x0000 -.short 0x0c33 -.short 0x0004 -.short 0x0000 -.short 0x0464 -.short 0x0879 -.short 0x0001 -.short 0x0464 -.short 0x0861 -.short 0x0002 -.short 0x0c5c -.short 0x100d -.short 0x0000 -.short 0x0459 -.short 0x0879 -.short 0x0000 -.short 0x0c73 -.short 0x0028 -.short 0x0060 -.short 0x0c73 -.short 0x0000 -.short 0x0060 -.short 0x0c0b -.short 0x36a9 -.short 0x0805 -.short 0x0831 -.short 0x001e -.short 0x0401 -.short 0x082d -.short 0x0013 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0c0b -.short 0x91d1 -.short 0x0807 -.short 0x0444 -.short 0x0402 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x044a diff --git a/data/scripts/gUnk_08009D00.inc b/data/scripts/gUnk_08009CFC.inc similarity index 89% rename from data/scripts/gUnk_08009D00.inc rename to data/scripts/gUnk_08009CFC.inc index 67476331..a9564043 100644 --- a/data/scripts/gUnk_08009D00.inc +++ b/data/scripts/gUnk_08009CFC.inc @@ -1,4 +1,6 @@ -SCRIPT_START gUnk_08009D00 +SCRIPT_START gUnk_08009CFC +StartScript +_0807E8E4_1 SetEntityNonPlanarMovement 0x00c0 StopScript _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/gUnk_08009D6C.inc index 2fc4629a..9ef086b9 100644 --- a/data/scripts/gUnk_08009D6C.inc +++ b/data/scripts/gUnk_08009D6C.inc @@ -2,4 +2,17 @@ SCRIPT_START gUnk_08009D6C StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0006 -.byte 0x2 +StopScript +_0807EDD4 0x0078, 0x0060 +_0807EDD4 0x0078, 0x007c +Wait 0x001e +Call 0x0805368d +Wait 0x0008 +_0807EDD4 0x0078, 0x0098 +_0807EF80 0x0008 +_0807E778 0x0010 +DoFade5 +WaitFor_2 +Call 0x08053635 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009D77.inc b/data/scripts/gUnk_08009D77.inc deleted file mode 100644 index 2102b98e..00000000 --- a/data/scripts/gUnk_08009D77.inc +++ /dev/null @@ -1,58 +0,0 @@ -SCRIPT_START gUnk_08009D77 -.byte 0x4 -.byte 0x73 -.byte 0xc -.byte 0x78 -.byte 0x0 -.byte 0x60 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x78 -.byte 0x0 -.byte 0x7c -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x8d -.byte 0x36 -.byte 0x5 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x78 -.byte 0x0 -.byte 0x98 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x38 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x3d -.byte 0x4 -.byte 0x37 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x35 -.byte 0x36 -.byte 0x5 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/gUnk_08009DB0.inc index 4789a493..939e5d75 100644 --- a/data/scripts/gUnk_08009DB0.inc +++ b/data/scripts/gUnk_08009DB0.inc @@ -1,17 +1,41 @@ SCRIPT_START gUnk_08009DB0 StartScript -Call sub_0807F348 -Call sub_08066288 -Call sub_08066274 +Call 0x0807f349 +Call 0x08066289 +Call 0x08066275 _0807EF80 0x000a _0807E930 0x000c _0807E908 0x0003 StopScript _0807E944 _0807E908 0x0002 -Call sub_0806622C +Call 0x0806622d _0807EA94 _0807E908 0x0003 _0807E930 0x000c -.short 0x0803 -.short 0xffe8 +Jump 0xffe8 +StartScript +StopScript +CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Wait 0x0008 +_0807EB28 0x3207 +_0807E3E8 +JumpIfNot 0x003e +Call 0x0807df29 +_0807E778 0x0002 +DoFade5 +WaitFor_2 +Call 0x0804e865 +Wait 0x001e +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EB28 0x3209 +Wait 0x000f +_0807EA94 +_0807E878 +Call 0x0807df51 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08009DEC.inc b/data/scripts/gUnk_08009DEC.inc deleted file mode 100644 index c453741e..00000000 --- a/data/scripts/gUnk_08009DEC.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_08009DEC -StartScript -StopScript -CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Wait 0x0008 -_0807EB28 0x3207 -_0807E3E8 -JumpIfNot 0x003e -Call sub_0807DF28 -_0807E778 0x0002 -DoFade5 -WaitFor_2 -Call sub_0804E864 -Wait 0x001e -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -.short 0x085f diff --git a/data/scripts/gUnk_08009E38.inc b/data/scripts/gUnk_08009E38.inc deleted file mode 100644 index df8b734b..00000000 --- a/data/scripts/gUnk_08009E38.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08009E38 -.short 0x3209 -.short 0x0831 -.short 0x000f -.short 0x0459 -.short 0x0444 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0444 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800DB0E.inc b/data/scripts/gUnk_08009E4E.inc similarity index 66% rename from data/scripts/gUnk_0800DB0E.inc rename to data/scripts/gUnk_08009E4E.inc index 7692db5d..9430cdc2 100644 --- a/data/scripts/gUnk_0800DB0E.inc +++ b/data/scripts/gUnk_08009E4E.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DB0E +SCRIPT_START gUnk_08009E4E _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/gUnk_08009E58.inc index 4b923498..630c3001 100644 --- a/data/scripts/gUnk_08009E58.inc +++ b/data/scripts/gUnk_08009E58.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009E58 StartScript -Call sub_0807DF28 +Call 0x0807df29 StopScript WaitForSomething2 0x00000002 _0807E778 0x0002 @@ -10,7 +10,3 @@ _0807EF80 0x0014 Wait 0x001e _0807E5F8 0x00000001 SCRIPT_END -.short 0x0401 -.short 0x0402 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08009318.inc b/data/scripts/gUnk_08009E80.inc similarity index 64% rename from data/scripts/gUnk_08009318.inc rename to data/scripts/gUnk_08009E80.inc index 77ed439b..b79a8e25 100644 --- a/data/scripts/gUnk_08009318.inc +++ b/data/scripts/gUnk_08009E80.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009318 +SCRIPT_START gUnk_08009E80 StartScript StopScript SCRIPT_END diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/gUnk_08009E88.inc index 82fc63fc..4e439873 100644 --- a/data/scripts/gUnk_08009E88.inc +++ b/data/scripts/gUnk_08009E88.inc @@ -1,8 +1,19 @@ SCRIPT_START gUnk_08009E88 StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 SetLocalFlag 0x009f StopScript Wait 0x003c -.short 0x0838 +_0807E778 0x0004 +DoFade4 +WaitFor_2 +Call 0x0807f0d9 +JumpIfNot 0xfff8 +_0807EF80 0x0014 +Wait 0x000a +Call 0x08053251 +_0807E878 +Call 0x0807df51 +Call 0x080791d1 +SCRIPT_END diff --git a/data/scripts/gUnk_08009E9E.inc b/data/scripts/gUnk_08009E9E.inc deleted file mode 100644 index 310e58fc..00000000 --- a/data/scripts/gUnk_08009E9E.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08009E9E -.byte 0x4 -.byte 0x0 -.byte 0x3c -.byte 0x4 -.byte 0x37 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0xf0 -.byte 0x7 diff --git a/data/scripts/gUnk_08009EA9.inc b/data/scripts/gUnk_08009EA9.inc deleted file mode 100644 index e1883ab6..00000000 --- a/data/scripts/gUnk_08009EA9.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_08009EA9 -.short 0x0508 -.short 0xf808 -.short 0x79ff -.short 0x1408 -.short 0x3100 -.short 0x0a08 -.short 0x0b00 diff --git a/data/scripts/gUnk_08009EB7.inc b/data/scripts/gUnk_08009EB7.inc deleted file mode 100644 index 80b0a609..00000000 --- a/data/scripts/gUnk_08009EB7.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_08009EB7 -.byte 0xc -.byte 0x51 -.byte 0x32 -.byte 0x5 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xd1 -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08009EF0.inc b/data/scripts/gUnk_08009EF0.inc index 9468e41d..bc7f644a 100644 --- a/data/scripts/gUnk_08009EF0.inc +++ b/data/scripts/gUnk_08009EF0.inc @@ -5,4 +5,7 @@ _0807EF80 0x0001 StopScript WaitForSomething2 0x00000004 StartScript -.byte 0x4e +_0807E914 0x00000001 +_0807EF80 0x0001 +StopScript +SCRIPT_END diff --git a/data/scripts/gUnk_08009F07.inc b/data/scripts/gUnk_08009F07.inc deleted file mode 100644 index d1f94779..00000000 --- a/data/scripts/gUnk_08009F07.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_08009F07 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc index a456299d..094db364 100644 --- a/data/scripts/gUnk_08009F14.inc +++ b/data/scripts/gUnk_08009F14.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08009F14 StartScript _0807EB44 0x0004 -Call sub_08060090 +Call 0x08060091 _0807EF80 0x000a CheckKinstoneFused 0x001c JumpIf 0x00a8 @@ -9,4 +9,124 @@ CheckInventory1 0x0007 JumpIf 0x0052 StopScript StopScript -.byte 0x1 +StartScript +Call 0x08060159 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +Call 0x0807df29 +_0807EF80 0x000b +StartPlayerScript 0x0800a088 +WaitForSomething2 0x00000002 +Call 0x0806014d +TextboxNoOverlapFollowPos +.short 0x1f01 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +Wait 0x001e +_0807F034 0x0065 +WaitPlayerAction8 +_0807EF80 0x000a +Call 0x0807df51 +_0807E878 +StopScript +StopScript +StartScript +Call 0x08060159 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +Call 0x080602bd +_0807EA94 +CallWithArg +.short 0xf971 +.short 0x0807 +.short 0x1f03 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x0008 +_0807E878 +Jump 0xffd2 +Wait 0x0008 +SoundReq 0x0103 +CallWithArg +.short 0x030d +.short 0x0806 +.short 0x0063 +.short 0x0000 +@ End of 4 parameters +Wait 0x0008 +_0807E878 +Jump 0xffb6 +StopScript +CheckLocalFlag 0x00b0 +JumpIf 0x004a +StopScript +StartScript +Call 0x08060159 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +TextboxNoOverlap 0x1f0e +_0807EA94 +_0807E3E8 +JumpIf 0x0008 +_0807E878 +Jump 0xffdc +Wait 0x0008 +_0807F034 0x0008 +Call 0x08060319 +WaitPlayerAction8 +Wait 0x0008 +_0807EB8C +TextboxNoOverlapFollow 0x1f13 +_0807EA94 +SetLocalFlag 0x00b0 +_0807E878 +StopScript +StartScript +Call 0x08060159 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +CheckInventory1 0x0008 +JumpIf 0x0014 +TextboxNoOverlap 0x1f14 +_0807EA94 +_0807E3E8 +JumpIf 0xffb8 +_0807E878 +Jump 0xffd4 +TextboxNoOverlap 0x1f11 +_0807EA94 +_0807E3E8 +JumpIf 0x0008 +_0807E878 +Jump 0xffc2 +Wait 0x0008 +_0807F034 0x0007 +Call 0x08060319 +WaitPlayerAction8 +Wait 0x0008 +_0807EB8C +TextboxNoOverlapFollow 0x1f10 +_0807EA94 +_0807E878 +Jump 0xffa0 +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807ECC4 0x0010 +_0807EDD4 0x0078, 0x0060 +_0807EB44 0x0000 +Wait 0x000f +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08009F39.inc b/data/scripts/gUnk_08009F39.inc deleted file mode 100644 index 843abe36..00000000 --- a/data/scripts/gUnk_08009F39.inc +++ /dev/null @@ -1,58 +0,0 @@ -SCRIPT_START gUnk_08009F39 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0x1 -.byte 0x6 -.byte 0x8 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xf2 -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xb -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0x88 -.byte 0xa0 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x4d -.byte 0x1 -.byte 0x6 -.byte 0x8 -.byte 0x5c -.byte 0xc -.byte 0x1 -.byte 0x1f -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 diff --git a/data/scripts/gUnk_08009F72.inc b/data/scripts/gUnk_08009F72.inc deleted file mode 100644 index 4691447a..00000000 --- a/data/scripts/gUnk_08009F72.inc +++ /dev/null @@ -1,74 +0,0 @@ -SCRIPT_START gUnk_08009F72 -_0807F034 0x0065 -WaitPlayerAction8 -_0807EF80 0x000a -Call sub_0807DF50 -_0807E878 -StopScript -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -Call sub_080602BC -_0807EA94 -CallWithArg sub_0807F970, 0x00001f03 -JumpIf 0x0008 -_0807E878 -Jump 0xffd2 -Wait 0x0008 -SoundReq 0x0103 -CallWithArg sub_0806030C, 0x00000063 -Wait 0x0008 -_0807E878 -Jump 0xffb6 -StopScript -CheckLocalFlag 0x00b0 -JumpIf 0x004a -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -TextboxNoOverlap 0x1f0e -_0807EA94 -_0807E3E8 -JumpIf 0x0008 -_0807E878 -Jump 0xffdc -Wait 0x0008 -_0807F034 0x0008 -Call sub_08060318 -WaitPlayerAction8 -Wait 0x0008 -_0807EB8C -TextboxNoOverlapFollow 0x1f13 -_0807EA94 -SetLocalFlag 0x00b0 -_0807E878 -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -CheckInventory1 0x0008 -JumpIf 0x0014 -TextboxNoOverlap 0x1f14 -_0807EA94 -_0807E3E8 -JumpIf 0xffb8 -_0807E878 -Jump 0xffd4 -TextboxNoOverlap 0x1f11 -_0807EA94 -_0807E3E8 -JumpIf 0x0008 -_0807E878 -.short 0x0803 -.short 0xffc2 diff --git a/data/scripts/gUnk_0800A064.inc b/data/scripts/gUnk_0800A064.inc deleted file mode 100644 index cf52c09e..00000000 --- a/data/scripts/gUnk_0800A064.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800A064 -Wait 0x0008 -_0807F034 0x0007 -Call sub_08060318 -WaitPlayerAction8 -Wait 0x0008 -_0807EB8C -TextboxNoOverlapFollow 0x1f10 -_0807EA94 -.byte 0x44 diff --git a/data/scripts/gUnk_0800A081.inc b/data/scripts/gUnk_0800A081.inc deleted file mode 100644 index 118f427a..00000000 --- a/data/scripts/gUnk_0800A081.inc +++ /dev/null @@ -1,52 +0,0 @@ -SCRIPT_START gUnk_0800A081 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xa0 -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x2 -.byte 0x4 -.byte 0x70 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x78 -.byte 0x0 -.byte 0x60 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/gUnk_0800A0B4.inc index 92f45a45..f32de8ae 100644 --- a/data/scripts/gUnk_0800A0B4.inc +++ b/data/scripts/gUnk_0800A0B4.inc @@ -2,11 +2,11 @@ SCRIPT_START gUnk_0800A0B4 StartScript SetEntityNonPlanarMovement 0x0140 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StopScript Wait 0x0078 SoundReq2 0x0018 -Call sub_080A0464 +Call 0x080a0465 _0807EE30 JumpIfNot 0xfffc _0807E8E4_0 diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc index 7eb0530e..18dbea9f 100644 --- a/data/scripts/gUnk_0800A0FC.inc +++ b/data/scripts/gUnk_0800A0FC.inc @@ -4,3 +4,36 @@ CheckGlobalFlag 0x0051 JumpIfNot 0xfffa StartScript _0807E864 +Call 0x0807df29 +SoundReq0x80100000 +Call 0x0807fbfd +SetEntityPositionRelative 0x005800b0 +Call 0x0807f845 +_0807E8E4_3 +CallWithArg +.short 0xf75d +.short 0x0807 +.short 0x0060 +.short 0x00d0 +@ End of 4 parameters +CallWithArg +.short 0x4ae9 +.short 0x0809 +.short 0xa160 +.short 0x0800 +@ End of 4 parameters +SoundReq 0x00f7 +_0807E778 0x0002 +DoFade6 +StopScript +WaitFor_2 +WaitForSomething2 0x00000004 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0006 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800A10A.inc b/data/scripts/gUnk_0800A10A.inc deleted file mode 100644 index 17b2b548..00000000 --- a/data/scripts/gUnk_0800A10A.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800A10A -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 diff --git a/data/scripts/gUnk_0800A10F.inc b/data/scripts/gUnk_0800A10F.inc deleted file mode 100644 index 0b89d7e4..00000000 --- a/data/scripts/gUnk_0800A10F.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800A10F -.byte 0x8 -.byte 0x7e -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xfd -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x69 -.byte 0xc -.byte 0xb0 -.byte 0x0 -.byte 0x58 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0xf8 -.byte 0x7 -.byte 0x8 diff --git a/data/scripts/gUnk_0800A124.inc b/data/scripts/gUnk_0800A124.inc deleted file mode 100644 index f7d50aa4..00000000 --- a/data/scripts/gUnk_0800A124.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800A124 -_0807E8E4_3 -CallWithArg sub_0807F75C, 0x00d00060 -.short 0x140c -.short 0x4ae9 diff --git a/data/scripts/gUnk_0800A134.inc b/data/scripts/gUnk_0800A134.inc deleted file mode 100644 index 79b32191..00000000 --- a/data/scripts/gUnk_0800A134.inc +++ /dev/null @@ -1,65 +0,0 @@ -SCRIPT_START gUnk_0800A134 -.short 0x0809 -.short 0xa160 -.short 0x0800 -.short 0x087b -.short 0x00f7 -.short 0x0838 -.short 0x0002 -.short 0x043e -.short 0x0402 -.short 0x0437 -.short 0x0c33 -.short 0x0004 -.short 0x0000 -.short 0x140c -.short 0xda1d -.short 0x0806 -.short 0x0006 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0080 -.short 0x0879 -.short 0x0007 -.short 0x0879 -.short 0x000b -.short 0x0850 -.short 0x0002 -.short 0x0c69 -.short 0x00b0 -.short 0x0080 -.short 0x140c -.short 0xf98d -.short 0x0807 -.short 0x0000 -.short 0xff80 -.short 0x140c -.short 0x60c5 -.short 0x0809 -.short 0xa1b4 -.short 0x0800 -.short 0x0402 -.short 0x087b -.short 0x0142 -.short 0x0c78 -.short 0xff80 -.short 0x0000 -.short 0x087b -.short 0x0143 -.short 0x0850 -.short 0x0004 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc new file mode 100644 index 00000000..de6872cf --- /dev/null +++ b/data/scripts/gUnk_0800A160.inc @@ -0,0 +1,29 @@ +SCRIPT_START gUnk_0800A160 +StartScript +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0007 +_0807EF80 0x000b +_0807E930 0x0002 +SetEntityPositionRelative 0x008000b0 +CallWithArg +.short 0xf98d +.short 0x0807 +.short 0x0000 +.short 0xff80 +@ End of 4 parameters +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa1b4 +.short 0x0800 +@ End of 4 parameters +StopScript +SoundReq 0x0142 +_0807EF3C 0xff80, 0x0000 +SoundReq 0x0143 +_0807E930 0x0004 +_0807E5F8 0x00000002 +Wait 0x003c +_0807E5F8 0x00000004 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc index 6c66905f..6600c6ee 100644 --- a/data/scripts/gUnk_0800A1B4.inc +++ b/data/scripts/gUnk_0800A1B4.inc @@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800A1B4 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfff8 +.short 0x0000 +@ End of 4 parameters StopScript WaitForSomething 0x00000002 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc index ec26a0f2..cc3d8c01 100644 --- a/data/scripts/gUnk_0800A1D8.inc +++ b/data/scripts/gUnk_0800A1D8.inc @@ -1,18 +1,88 @@ SCRIPT_START gUnk_0800A1D8 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x00800088 -Call sub_0807F844 +Call 0x0807f845 _0807E8E4_3 -CallWithArg sub_0807F75C, 0x00a80088 +CallWithArg +.short 0xf75d +.short 0x0807 +.short 0x0088 +.short 0x00a8 +@ End of 4 parameters StopScript Wait 0x003c StartPlayerScript 0x0800a310 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 -TextboxNoOverlapFollowPos 0x1659, 0x0000 +TextboxNoOverlapFollowPos +.short 0x1659 +.short 0x0000 +@ End of 2 parameters _0807EA94 -.short 0x0831 -.short 0x003c +Wait 0x003c +_0807E5F8 0x00000010 +WaitForSomething2 0x00000200 +_0807E5F8 0x00000004 +_0807E8E4_0 +WaitForSomething2 0x00000080 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000200 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000040 +_0807E5F8 0x00000004 +Call 0x0807f3f9 +WaitForSomething2 0x00000080 +TextboxNoOverlapFollowPos +.short 0x165a +.short 0x000e +@ End of 2 parameters +_0807EA94 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x165b +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000040 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000100 +Wait 0x003c +_0807E8E4_3 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000080 +Wait 0x003c +_0807E5F8 0x00000008 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000006 +WaitForSomething2 0x000000c0 +TextboxNoOverlapFollowPos +.short 0x165c +.short 0x000e +@ End of 2 parameters +_0807EA94 +SoundReq0x80100000 +TextboxNoOverlapFollowPos +.short 0x165d +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000006 +WaitForSomething2 0x000000c0 +_0807E5F8 0x00000006 +WaitForSomething2 0x00000080 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000100 +SoundReq2 0x0008 +SoundReq 0x00f7 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0007 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800A224.inc b/data/scripts/gUnk_0800A224.inc deleted file mode 100644 index 9ae17ba9..00000000 --- a/data/scripts/gUnk_0800A224.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START gUnk_0800A224 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000200 -_0807E5F8 0x00000004 -_0807E8E4_0 -WaitForSomething2 0x00000080 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000200 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000040 -_0807E5F8 0x00000004 -.short 0x0c0b -.short 0xf3f9 diff --git a/data/scripts/gUnk_0800A260.inc b/data/scripts/gUnk_0800A260.inc deleted file mode 100644 index 3dd7f1b9..00000000 --- a/data/scripts/gUnk_0800A260.inc +++ /dev/null @@ -1,113 +0,0 @@ -SCRIPT_START gUnk_0800A260 -.short 0x0807 -.short 0x0c33 -.short 0x0080 -.short 0x0000 -.short 0x0c5c -.short 0x165a -.short 0x000e -.short 0x0459 -.short 0x0831 -.short 0x003c -.short 0x0c5c -.short 0x165b -.short 0x000e -.short 0x0459 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c33 -.short 0x0040 -.short 0x0000 -.short 0x0c28 -.short 0x0008 -.short 0x0000 -.short 0x0c33 -.short 0x0100 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x044c -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0080 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0008 -.short 0x0000 -.short 0x0c33 -.short 0x0100 -.short 0x0000 -.short 0x0c28 -.short 0x0006 -.short 0x0000 -.short 0x0c33 -.short 0x00c0 -.short 0x0000 -.short 0x0c5c -.short 0x165c -.short 0x000e -.short 0x0459 -.short 0x047e -.short 0x0c5c -.short 0x165d -.short 0x000e -.short 0x0459 -.short 0x0c28 -.short 0x0006 -.short 0x0000 -.short 0x0c33 -.short 0x00c0 -.short 0x0000 -.short 0x0c28 -.short 0x0006 -.short 0x0000 -.short 0x0c33 -.short 0x0080 -.short 0x0000 -.short 0x0c28 -.short 0x0008 -.short 0x0000 -.short 0x0c33 -.short 0x0100 -.short 0x0000 -.short 0x087c -.short 0x0008 -.short 0x087b -.short 0x00f7 -.short 0x140c -.short 0xda1d -.short 0x0806 -.short 0x0007 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0402 -.short 0x0861 -.short 0x0002 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0006 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0002 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0006 -.short 0x0831 -.short 0x000a -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0x0000 diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc new file mode 100644 index 00000000..817b5248 --- /dev/null +++ b/data/scripts/gUnk_0800A310.inc @@ -0,0 +1,53 @@ +SCRIPT_START gUnk_0800A310 +StopScript +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807E5F8 0x00000001 +Call 0x080791bd +.short 0x0000 +StartScript +_0807EF80 0x0008 +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x000b +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +WaitForSomething2 0x00000002 +_0807E930 0x000e +_0807EF80 0x0007 +Call 0x0807f2d5 +_0807EF80 0x0004 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +_0807E930 0x000c +Call 0x0807f2d5 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +_0807E930 0x000f +Call 0x0807f2d5 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +_0807E930 0x000c +Call 0x0807f2d5 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa680 +.short 0x0800 +@ End of 4 parameters +_0807E5F8 0x00000040 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800A340.inc b/data/scripts/gUnk_0800A340.inc deleted file mode 100644 index c427d35e..00000000 --- a/data/scripts/gUnk_0800A340.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800A340 -StartScript -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000b -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -WaitForSomething2 0x00000002 -_0807E930 0x000e -_0807EF80 0x0007 -Call sub_0807F2D4 -_0807EF80 0x0004 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000002 -_0807E930 0x000c -Call sub_0807F2D4 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000002 -_0807E930 0x000f -Call sub_0807F2D4 -.byte 0x28 diff --git a/data/scripts/gUnk_0800A3A3.inc b/data/scripts/gUnk_0800A3A3.inc deleted file mode 100644 index 952e122c..00000000 --- a/data/scripts/gUnk_0800A3A3.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800A3A3 -.short 0x400c -.short 0x0000 -.short 0x3300 diff --git a/data/scripts/gUnk_0800A3A9.inc b/data/scripts/gUnk_0800A3A9.inc deleted file mode 100644 index 861473df..00000000 --- a/data/scripts/gUnk_0800A3A9.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800A3A9 -.byte 0xc diff --git a/data/scripts/gUnk_0800A3AA.inc b/data/scripts/gUnk_0800A3AA.inc deleted file mode 100644 index b6654ff9..00000000 --- a/data/scripts/gUnk_0800A3AA.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800A3AA -.short 0x0002 -.short 0x0000 -.short 0x0850 -.short 0x000c -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0c28 -.short 0x0040 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x140c -.short 0x60c5 -.short 0x0809 -.short 0xa680 -.short 0x0800 -.short 0x0c28 -.short 0x0040 -.short 0x0000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc index ac087eda..d40d23d2 100644 --- a/data/scripts/gUnk_0800A3D8.inc +++ b/data/scripts/gUnk_0800A3D8.inc @@ -9,7 +9,7 @@ StopScript WaitForSomething2 0x00000004 StartScript _0807EF80 0x0004 -Call sub_0807F3F8 +Call 0x0807f3f9 StopScript Wait 0x003c _0807EC94 0x0010 @@ -28,30 +28,60 @@ WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807EF80 0x0000 SoundReq 0x0142 -CallWithArg sub_080960C4, 0x0800a638 +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa638 +.short 0x0800 +@ End of 4 parameters _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0143 _0807E5F8 0x00001000 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 -Call sub_08066E68 +Call 0x08066e69 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0142 -CallWithArg sub_080960C4, 0x0800a680 +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa680 +.short 0x0800 +@ End of 4 parameters Wait 0x0078 SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 +CallWithArg +.short 0xfadd +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x000f SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 +CallWithArg +.short 0xfadd +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x000f SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 +CallWithArg +.short 0xfadd +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x003c SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000001 +CallWithArg +.short 0xfadd +.short 0x0807 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters SoundReq 0x0143 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc index 0379d003..dc6c9d71 100644 --- a/data/scripts/gUnk_0800A500.inc +++ b/data/scripts/gUnk_0800A500.inc @@ -4,26 +4,31 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0005 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000008 SoundReq 0x0142 _0807E610 0x00000800 -CallWithArg sub_080960C4, 0x0800a65c +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa65c +.short 0x0800 +@ End of 4 parameters _0807E930 0x0002 -Call sub_08094B0C +Call 0x08094b0d _0807EDD4 0x0068, 0x0088 -Call sub_08094B80 +Call 0x08094b81 _0807E5F8 0x00000100 WaitForSomething2 0x00000008 -Call sub_08094B3C +Call 0x08094b3d _0807E930 0x0004 _0807E5F8 0x00000800 SoundReq 0x0143 _0807E5F8 0x00000100 WaitForSomething2 0x00000008 _0807EF80 0x0008 -Call sub_080961B0 +Call 0x080961b1 SoundReq 0x00fa Wait 0x003c _0807E5F8 0x00000100 diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc index df64eb73..98c1b5c3 100644 --- a/data/scripts/gUnk_0800A590.inc +++ b/data/scripts/gUnk_0800A590.inc @@ -4,4 +4,47 @@ SetEntityNonPlanarMovement 0x0080 SetEntity0x20 0x00000000 _0807EF80 0x0008 _0807EB44 0x0000 -.short 0x0c0b +Call 0x0807f715 +MoveEntityToPlayer +CallWithArg +.short 0xf98d +.short 0x0807 +.short 0x0000 +.short 0xfff0 +@ End of 4 parameters +StopScript +_0807E930 0x0023 +WaitForSomething2 0x00000010 +CallWithArg +.short 0xf6e9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0007 +SoundReq 0x0142 +_0807E610 0x00000800 +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xa65c +.short 0x0800 +@ End of 4 parameters +Wait 0x003c +_0807EDD4 0x0088, 0x0068 +Wait 0x0078 +_0807E5F8 0x00000800 +SoundReq 0x0143 +_0807EF3C 0x0000, 0x0020 +_0807E930 0x001f +_0807E5F8 0x00000200 +WaitForSomething2 0x00000010 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x003c +_0807E5F8 0x00000200 +Wait 0x0001 +_0807EF80 0x0008 +WaitForSomething2 0x00000010 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800A5A6.inc b/data/scripts/gUnk_0800A5A6.inc deleted file mode 100644 index 6317298f..00000000 --- a/data/scripts/gUnk_0800A5A6.inc +++ /dev/null @@ -1,92 +0,0 @@ -SCRIPT_START gUnk_0800A5A6 -.short 0xf715 -.short 0x0807 -.short 0x046b -.short 0x140c -.short 0xf98d -.short 0x0807 -.short 0x0000 -.short 0xfff0 -.short 0x0402 -.short 0x0850 -.short 0x0023 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x140c -.short 0xf6e9 -.short 0x0807 -.short 0x0008 -.short 0x0000 -.short 0x0879 -.short 0x0007 -.short 0x087b -.short 0x0142 -.short 0x0c29 -.short 0x0800 -.short 0x0000 -.short 0x140c -.short 0x60c5 -.short 0x0809 -.short 0xa65c -.short 0x0800 -.short 0x0831 -.short 0x003c -.short 0x0c73 -.short 0x0088 -.short 0x0068 -.short 0x0831 -.short 0x0078 -.short 0x0c28 -.short 0x0800 -.short 0x0000 -.short 0x087b -.short 0x0143 -.short 0x0c78 -.short 0x0000 -.short 0x0020 -.short 0x0850 -.short 0x001f -.short 0x0c28 -.short 0x0200 -.short 0x0000 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x0831 -.short 0x0078 -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0200 -.short 0x0000 -.short 0x0831 -.short 0x0001 -.short 0x0879 -.short 0x0008 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0401 -.short 0x0879 -.short 0x0007 -.short 0x0879 -.short 0x000b -.short 0x140c -.short 0xf995 -.short 0x0807 -.short 0xfff8 -.short 0x0000 -.short 0x0402 -.short 0x0c32 -.short 0x1000 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc new file mode 100644 index 00000000..534cd728 --- /dev/null +++ b/data/scripts/gUnk_0800A638.inc @@ -0,0 +1,15 @@ +SCRIPT_START gUnk_0800A638 +StartScript +_0807EF80 0x0007 +_0807EF80 0x000b +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfff8 +.short 0x0000 +@ End of 4 parameters +StopScript +WaitForSomething 0x00001000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc index e724c755..c89dbee5 100644 --- a/data/scripts/gUnk_0800A65C.inc +++ b/data/scripts/gUnk_0800A65C.inc @@ -2,8 +2,14 @@ SCRIPT_START gUnk_0800A65C StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfff8 +.short 0x0000 +@ End of 4 parameters StopScript WaitForSomething 0x00000800 _0807EF80 0x0006 SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800A67E.inc b/data/scripts/gUnk_0800A67E.inc deleted file mode 100644 index cc4eb753..00000000 --- a/data/scripts/gUnk_0800A67E.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800A67E -.short 0x0000 diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc index b065e201..10446b80 100644 --- a/data/scripts/gUnk_0800A680.inc +++ b/data/scripts/gUnk_0800A680.inc @@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800A680 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfff8 +.short 0x0000 +@ End of 4 parameters StopScript WaitForSomething 0x00000020 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc index 6ef55566..f897621c 100644 --- a/data/scripts/gUnk_0800A6A4.inc +++ b/data/scripts/gUnk_0800A6A4.inc @@ -1,6 +1,17 @@ SCRIPT_START gUnk_0800A6A4 StartScript _0807E864 -.byte 0xb -.byte 0xc -.byte 0x29 +Call 0x0807df29 +SetEntityPositionRelative 0x00680088 +Call 0x0807f845 +StopScript +Wait 0x003c +SoundReq 0x00f6 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800A6AB.inc b/data/scripts/gUnk_0800A6AB.inc deleted file mode 100644 index 581b7885..00000000 --- a/data/scripts/gUnk_0800A6AB.inc +++ /dev/null @@ -1,42 +0,0 @@ -SCRIPT_START gUnk_0800A6AB -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x69 -.byte 0xc -.byte 0x88 -.byte 0x0 -.byte 0x68 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xf6 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x1d -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc index 5e8f1277..f0ae3baf 100644 --- a/data/scripts/gUnk_0800A6D4.inc +++ b/data/scripts/gUnk_0800A6D4.inc @@ -1,12 +1,17 @@ SCRIPT_START gUnk_0800A6D4 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x00700088 -Call sub_0807F844 +Call 0x0807f845 SoundReq 0x00f7 StopScript Wait 0x003c -CallWithArg sub_0806DA1C, 0x00000009 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0009 +.short 0x0000 +@ End of 4 parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc index 7fe91929..a4592ef8 100644 --- a/data/scripts/gUnk_0800A704.inc +++ b/data/scripts/gUnk_0800A704.inc @@ -1,12 +1,17 @@ SCRIPT_START gUnk_0800A704 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x01c80198 -Call sub_0807F844 +Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x0000000a +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000a +.short 0x0000 +@ End of 4 parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc index 86e0b3c7..88ff9225 100644 --- a/data/scripts/gUnk_0800A734.inc +++ b/data/scripts/gUnk_0800A734.inc @@ -1,8 +1,17 @@ SCRIPT_START gUnk_0800A734 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x01c800d8 -.short 0x0c0b -.short 0xf845 -.short 0x0807 +Call 0x0807f845 +SoundReq 0x00f7 +StopScript +Wait 0x003c +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000b +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800A74A.inc b/data/scripts/gUnk_0800A74A.inc deleted file mode 100644 index bd50de98..00000000 --- a/data/scripts/gUnk_0800A74A.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800A74A -SoundReq 0x00f7 -StopScript -Wait 0x003c -CallWithArg sub_0806DA1C, 0x0000000b -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc index 8a63af09..1d6be66a 100644 --- a/data/scripts/gUnk_0800A764.inc +++ b/data/scripts/gUnk_0800A764.inc @@ -1,9 +1,9 @@ SCRIPT_START gUnk_0800A764 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x01b800f8 -Call sub_0807F844 +Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 @@ -26,6 +26,11 @@ _0807E5F8 0x00000010 Wait 0x0002 _0807E5F8 0x00000020 Wait 0x0078 -CallWithArg sub_0806DA1C, 0x0000000c +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000c +.short 0x0000 +@ End of 4 parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc index 2ca09744..dad3a8c9 100644 --- a/data/scripts/gUnk_0800A7E4.inc +++ b/data/scripts/gUnk_0800A7E4.inc @@ -1,3 +1,99 @@ SCRIPT_START gUnk_0800A7E4 StartScript -.short 0x0879 +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0010 +StopScript +WaitForSomething 0x00000001 +_0807E930 0x0002 +WaitForSomething2 0x00000002 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0001 +Wait 0x001e +_0807E930 0x0003 +Wait 0x001e +Jump 0xffee +StartScript +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0010 +StopScript +WaitForSomething 0x00000001 +_0807E930 0x0002 +WaitForSomething2 0x00000004 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0001 +Wait 0x0014 +_0807E930 0x0003 +Wait 0x0014 +Jump 0xffee +StartScript +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0010 +StopScript +WaitForSomething 0x00000001 +_0807E930 0x0002 +WaitForSomething2 0x00000008 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0001 +Wait 0x000a +_0807E930 0x0003 +Wait 0x000a +Jump 0xffee +StartScript +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0008 +StopScript +WaitForSomething 0x00000001 +_0807EF80 0x0000 +WaitForSomething2 0x00000010 +_0807EF80 0x0004 +Wait 0x003c +_0807EB44 0x0002 +Wait 0x0019 +_0807EB44 0x0006 +Wait 0x0019 +Jump 0xffee +StartScript +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0008 +StopScript +WaitForSomething 0x00000001 +_0807EF80 0x0000 +WaitForSomething2 0x00000020 +_0807EF80 0x0004 +Wait 0x003c +_0807EB44 0x0002 +Wait 0x000f +_0807EB44 0x0006 +Wait 0x000f +Jump 0xffee +StartScript +_0807E864 +Call 0x0807df29 +SetEntityPositionRelative 0x01780378 +Call 0x0807f845 +StopScript +Wait 0x003c +_0807E5F8 0x00000001 +Wait 0x001e +_0807E5F8 0x00000002 +Wait 0x0014 +_0807E5F8 0x00000004 +Wait 0x000a +_0807E5F8 0x00000008 +Wait 0x003c +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000d +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800A7E8.inc b/data/scripts/gUnk_0800A7E8.inc deleted file mode 100644 index b767904a..00000000 --- a/data/scripts/gUnk_0800A7E8.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800A7E8 -.short 0x0007 -.short 0x0861 -.short 0x0004 -.short 0x0850 -.short 0x0010 -.short 0x0402 -.short 0x0c32 -.short 0x0001 -.short 0x0000 -.short 0x0850 -.short 0x0002 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x0850 -.short 0x0001 -.short 0x0831 -.short 0x001e -.short 0x0850 diff --git a/data/scripts/gUnk_0800A816.inc b/data/scripts/gUnk_0800A816.inc deleted file mode 100644 index 5e9cd87a..00000000 --- a/data/scripts/gUnk_0800A816.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800A816 -.short 0x0003 -.short 0x0831 -.short 0x001e -.short 0x0803 -.short 0xffee diff --git a/data/scripts/gUnk_0800A820.inc b/data/scripts/gUnk_0800A820.inc deleted file mode 100644 index 0b7dfe6e..00000000 --- a/data/scripts/gUnk_0800A820.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800A820 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0010 -StopScript -WaitForSomething 0x00000001 -_0807E930 0x0002 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0001 -Wait 0x0014 -_0807E930 0x0003 -Wait 0x0014 -.short 0x0803 -.short 0xffee diff --git a/data/scripts/gUnk_0800A85C.inc b/data/scripts/gUnk_0800A85C.inc deleted file mode 100644 index ea415c26..00000000 --- a/data/scripts/gUnk_0800A85C.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800A85C -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0010 -StopScript -WaitForSomething 0x00000001 -_0807E930 0x0002 -WaitForSomething2 0x00000008 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -.short 0x0803 -.short 0xffee diff --git a/data/scripts/gUnk_0800A898.inc b/data/scripts/gUnk_0800A898.inc deleted file mode 100644 index d187960a..00000000 --- a/data/scripts/gUnk_0800A898.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800A898 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0008 -StopScript -WaitForSomething 0x00000001 -_0807EF80 0x0000 -WaitForSomething2 0x00000010 -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0002 -Wait 0x0019 -_0807EB44 0x0006 -Wait 0x0019 -.short 0x0803 -.short 0xffee diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc deleted file mode 100644 index bfe1d195..00000000 --- a/data/scripts/gUnk_0800A8D4.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800A8D4 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0008 -StopScript -WaitForSomething 0x00000001 -_0807EF80 0x0000 -WaitForSomething2 0x00000020 -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0002 -Wait 0x000f -.short 0x0861 -.short 0x0006 diff --git a/data/scripts/gUnk_0800A908.inc b/data/scripts/gUnk_0800A908.inc deleted file mode 100644 index c0885233..00000000 --- a/data/scripts/gUnk_0800A908.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800A908 -Wait 0x000f -.short 0x0803 -.short 0xffee diff --git a/data/scripts/gUnk_0800A910.inc b/data/scripts/gUnk_0800A910.inc deleted file mode 100644 index e52eb0b9..00000000 --- a/data/scripts/gUnk_0800A910.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800A910 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01780378 -Call sub_0807F844 -StopScript -Wait 0x003c -_0807E5F8 0x00000001 -Wait 0x001e -_0807E5F8 0x00000002 -Wait 0x0014 -_0807E5F8 0x00000004 -Wait 0x000a -_0807E5F8 0x00000008 -Wait 0x003c -CallWithArg sub_0806DA1C, 0x0000000d -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/gUnk_0800A964.inc index 558fb639..75cd370b 100644 --- a/data/scripts/gUnk_0800A964.inc +++ b/data/scripts/gUnk_0800A964.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0001 StopScript WaitForSomething2 0x00000001 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/gUnk_0800A988.inc index 9773d029..7deff2ff 100644 --- a/data/scripts/gUnk_0800A988.inc +++ b/data/scripts/gUnk_0800A988.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0002 StopScript WaitForSomething2 0x00000002 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/gUnk_0800A9AC.inc index 75aafcd7..aef80139 100644 --- a/data/scripts/gUnk_0800A9AC.inc +++ b/data/scripts/gUnk_0800A9AC.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000004 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/gUnk_0800A9D0.inc index d70c742c..cae4d653 100644 --- a/data/scripts/gUnk_0800A9D0.inc +++ b/data/scripts/gUnk_0800A9D0.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0003 StopScript WaitForSomething2 0x00000008 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc index 595cf338..4f706377 100644 --- a/data/scripts/gUnk_0800A9F4.inc +++ b/data/scripts/gUnk_0800A9F4.inc @@ -1,9 +1,24 @@ SCRIPT_START gUnk_0800A9F4 StartScript _0807E864 -Call sub_0807DF28 -.byte 0x69 -.byte 0xc -.byte 0x28 -.byte 0x1 -.byte 0x58 +Call 0x0807df29 +SetEntityPositionRelative 0x00580128 +Call 0x0807f845 +StopScript +Wait 0x003c +_0807E5F8 0x00000001 +Wait 0x000a +_0807E5F8 0x00000002 +Wait 0x0014 +_0807E5F8 0x00000004 +Wait 0x001e +_0807E5F8 0x00000008 +Wait 0x003c +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000e +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800AA03.inc b/data/scripts/gUnk_0800AA03.inc deleted file mode 100644 index e0dc247d..00000000 --- a/data/scripts/gUnk_0800AA03.inc +++ /dev/null @@ -1,70 +0,0 @@ -SCRIPT_START gUnk_0800AA03 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x1d -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/gUnk_0800AA48.inc index c4e7fb14..75b9c451 100644 --- a/data/scripts/gUnk_0800AA48.inc +++ b/data/scripts/gUnk_0800AA48.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000001 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/gUnk_0800AA6C.inc index d9166bb5..3e64b994 100644 --- a/data/scripts/gUnk_0800AA6C.inc +++ b/data/scripts/gUnk_0800AA6C.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000002 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/gUnk_0800AA90.inc index 3f08f7c6..afce2365 100644 --- a/data/scripts/gUnk_0800AA90.inc +++ b/data/scripts/gUnk_0800AA90.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000004 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/gUnk_0800AAB4.inc index 5af49a63..b2169922 100644 --- a/data/scripts/gUnk_0800AAB4.inc +++ b/data/scripts/gUnk_0800AAB4.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000008 -Call CreateDust +Call 0x080a29bd _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc index 38f1dd36..c2b67154 100644 --- a/data/scripts/gUnk_0800AAD8.inc +++ b/data/scripts/gUnk_0800AAD8.inc @@ -1,12 +1,17 @@ SCRIPT_START gUnk_0800AAD8 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x01480088 -Call sub_0807F844 +Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x0000000f +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x000f +.short 0x0000 +@ End of 4 parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc index e84df154..5e5a5ba4 100644 --- a/data/scripts/gUnk_0800AB08.inc +++ b/data/scripts/gUnk_0800AB08.inc @@ -1,10 +1,42 @@ SCRIPT_START gUnk_0800AB08 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetEntityPositionRelative 0x01480088 -Call sub_0807F844 +Call 0x0807f845 _0807E8E4_3 -.byte 0xc -.byte 0x14 -.byte 0xe9 +CallWithArg +.short 0xf6e9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf75d +.short 0x0807 +.short 0x0088 +.short 0x00a8 +@ End of 4 parameters +SoundReq 0x00f7 +StopScript +Wait 0x0078 +_0807F0B4 0x0001 +SetEntityPositionRelative 0x00780088 +Call 0x0807f5c1 +TextboxNoOverlapFollowPos +.short 0x1664 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +TextboxNoOverlapFollowPos +.short 0x165e +.short 0x000e +@ End of 2 parameters +_0807EA94 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800AB23.inc b/data/scripts/gUnk_0800AB23.inc deleted file mode 100644 index 4cc931cd..00000000 --- a/data/scripts/gUnk_0800AB23.inc +++ /dev/null @@ -1,23 +0,0 @@ -SCRIPT_START gUnk_0800AB23 -.short 0x07f6 -.short 0x0808 -.short 0x0000 -.short 0x0c00 -.short 0x5d14 -.short 0x07f7 -.short 0x8808 -.short 0xa800 -.short 0x7b00 -.short 0xf708 -.short 0x0200 -.short 0x3104 -.short 0x7808 -.short 0x8900 -.short 0x0108 -.short 0x6900 -.short 0x880c -.short 0x7800 -.short 0x0b00 -.short 0xc10c -.short 0x07f5 -.short 0x5c08 diff --git a/data/scripts/gUnk_0800AB4F.inc b/data/scripts/gUnk_0800AB4F.inc deleted file mode 100644 index de5fe07d..00000000 --- a/data/scripts/gUnk_0800AB4F.inc +++ /dev/null @@ -1,162 +0,0 @@ -SCRIPT_START gUnk_0800AB4F -.byte 0xc -.byte 0x64 -.byte 0x16 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x5c -.byte 0xc -.byte 0x5e -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xed -.byte 0xdd -.byte 0x5 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xcd -.byte 0xd2 -.byte 0x8 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x6a -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xe0 -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0xc1 -.byte 0xf5 -.byte 0x7 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x19 -.byte 0xde -.byte 0x5 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x5f -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0xbc -.byte 0xac -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x60 -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x61 -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc new file mode 100644 index 00000000..c38d26b2 --- /dev/null +++ b/data/scripts/gUnk_0800AB6E.inc @@ -0,0 +1,92 @@ +SCRIPT_START gUnk_0800AB6E +Call 0x0808d2cd +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E8E4_0 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000080 +SetEntityPosition 0x0000, 0xffe0 +Call 0x0807f5c1 +Wait 0x003c +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +Wait 0x003c +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x165f +.short 0x000e +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800acbc +WaitForSomething2 0x00000001 +TextboxNoOverlapFollowPos +.short 0x1660 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x1661 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000008 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +SetEntityPosition 0x0000, 0x0020 +Call 0x0807f5c1 +WaitForSomething2 0x00000010 +StartPlayerScript 0x0800ace0 +WaitForSomething2 0x00000001 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1662 +.short 0x000e +@ End of 2 parameters +_0807EA94 +TextboxNoOverlapFollowPos +.short 0x1663 +.short 0x000e +@ End of 2 parameters +_0807EA94 +SetEntityPosition 0x0000, 0xffe0 +Call 0x0807f5c1 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +StartPlayerScript 0x0800ad54 +WaitForSomething2 0x00000001 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1665 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Wait 0x0078 +Call 0x0808d281 +Wait 0x0078 +_0807E778 0x0004 +DoFade5 +WaitFor_2 +Call 0x0807fb95 +MoveEntityToPlayer +Call 0x0807f845 +_0807F0B4 0x0004 +CameraTargetPlayer +_0807E5F8 0x80000000 +DoFade4 +WaitFor_2 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800ABF0.inc b/data/scripts/gUnk_0800ABF0.inc deleted file mode 100644 index 1d5967fe..00000000 --- a/data/scripts/gUnk_0800ABF0.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_0800ABF0 -.short 0x0008 -.short 0x0000 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c33 -.short 0x0004 -.short 0x0000 -.short 0x0c6a -.short 0x0000 -.short 0x0020 -.short 0x0c0b -.short 0xf5c1 -.short 0x0807 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x0c47 -.short 0xace0 -.short 0x0800 -.short 0x0c33 -.short 0x0001 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0c5c diff --git a/data/scripts/gUnk_0800AC24.inc b/data/scripts/gUnk_0800AC24.inc deleted file mode 100644 index 7582ca47..00000000 --- a/data/scripts/gUnk_0800AC24.inc +++ /dev/null @@ -1,74 +0,0 @@ -SCRIPT_START gUnk_0800AC24 -.byte 0x62 -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x5c -.byte 0xc -.byte 0x63 -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x6a -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xe0 -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0xc1 -.byte 0xf5 -.byte 0x7 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0x54 -.byte 0xad -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x65 -.byte 0x16 -.byte 0xe -.byte 0x0 -.byte 0x59 diff --git a/data/scripts/gUnk_0800AC6D.inc b/data/scripts/gUnk_0800AC6D.inc deleted file mode 100644 index 405ae99b..00000000 --- a/data/scripts/gUnk_0800AC6D.inc +++ /dev/null @@ -1,37 +0,0 @@ -SCRIPT_START gUnk_0800AC6D -.short 0x2804 -.short 0x020c -.short 0x0000 -.short 0x3300 -.short 0x040c -.short 0x0000 -.short 0x3100 -.short 0x7808 -.short 0x0b00 -.short 0x810c -.short 0x08d2 -.short 0x3108 -.short 0x7808 -.short 0x3800 -.short 0x0408 -.short 0x3d00 -.short 0x3704 -.short 0x0b04 -.short 0x950c -.short 0x07fb -.short 0x6b08 -.short 0x0b04 -.short 0x450c -.short 0x07f8 -.short 0x8908 -.short 0x0408 -.short 0x8800 -.short 0x2804 -.short 0x000c -.short 0x0000 -.short 0x3c80 -.short 0x3704 -.short 0x0b04 -.short 0x510c -.short 0x07df -.short 0x4408 diff --git a/data/scripts/gUnk_0800ACB5.inc b/data/scripts/gUnk_0800ACB5.inc deleted file mode 100644 index 7079f097..00000000 --- a/data/scripts/gUnk_0800ACB5.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800ACB5 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc index 07f8d2d2..5ed4cc19 100644 --- a/data/scripts/gUnk_0800ACBC.inc +++ b/data/scripts/gUnk_0800ACBC.inc @@ -6,5 +6,138 @@ _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd .short 0x0000 +StartScript +Call 0x08094be1 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x045b +.short 0x0000 +@ End of 4 parameters +SoundReq 0x0109 +StopScript +Call 0x0807f305 +Wait 0x005a +_0807E5F8 0x00000008 +StartScript +CallWithArg +.short 0xf6f9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x08e4 +.short 0x0000 +@ End of 4 parameters +StopScript +Call 0x0807f305 +_0807EB44 0x0004 +_0807EF80 0x0000 +Wait 0x003c +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x0004 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EC64 0x0020 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +StartScript +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0007 +_0807EF80 0x000b +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +WaitForSomething2 0x00000002 +_0807EF80 0x0004 +Wait 0x001e +_0807EB44 0x0002 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x0006 +_0807EB44 0x0000 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EB44 0x0002 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x0014 +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807E930 0x000c +Call 0x0807f2d5 +Call 0x08094b95 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807E930 0x000f +Call 0x0807f2d5 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +CallWithArg +.short 0x60c5 +.short 0x0809 +.short 0xaf18 +.short 0x0800 +@ End of 4 parameters +_0807E930 0x0012 +Call 0x0807f2d5 +Wait 0x001e +_0807E5F8 0x00000020 +SoundReq0x80100000 +Call 0x080a29bd +Call 0x0806305d +Call 0x080630a5 +_0807EF3C 0x0000, 0x0020 +Wait 0x001e +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xfff0 +Wait 0x003c +_0807EEF4 0x0000, 0xfff0 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EDD4 0x0088, 0x0040 +_0807E5F8 0x00000004 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc deleted file mode 100644 index 2035165c..00000000 --- a/data/scripts/gUnk_0800ACE0.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_0800ACE0 -StartScript -Call sub_08094BE0 -CallWithArg sub_0807F238, 0x0000045b -SoundReq 0x0109 -StopScript -Call sub_0807F304 -Wait 0x005a -_0807E5F8 0x00000008 -StartScript -CallWithArg sub_0807F6F8, 0x00000008 -CallWithArg sub_0807F238, 0x000008e4 -StopScript -Call sub_0807F304 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x003c -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x0004 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -.short 0x0000 diff --git a/data/scripts/gUnk_0800AD74.inc b/data/scripts/gUnk_0800AD74.inc deleted file mode 100644 index f2eb830e..00000000 --- a/data/scripts/gUnk_0800AD74.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800AD74 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0004 -Wait 0x001e -_0807EB44 0x0002 -.byte 0xc -.byte 0x14 -.byte 0xd9 diff --git a/data/scripts/gUnk_0800ADA7.inc b/data/scripts/gUnk_0800ADA7.inc deleted file mode 100644 index 0fe40272..00000000 --- a/data/scripts/gUnk_0800ADA7.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800ADA7 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x61 -.byte 0x8 diff --git a/data/scripts/gUnk_0800ADB4.inc b/data/scripts/gUnk_0800ADB4.inc deleted file mode 100644 index b7a6cde0..00000000 --- a/data/scripts/gUnk_0800ADB4.inc +++ /dev/null @@ -1,121 +0,0 @@ -SCRIPT_START gUnk_0800ADB4 -.short 0x0000 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0861 -.short 0x0002 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0831 -.short 0x0014 -.short 0x0861 -.short 0x0004 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0850 -.short 0x000c -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0c0b -.short 0x4b95 -.short 0x0809 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0850 -.short 0x000f -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x140c -.short 0x60c5 -.short 0x0809 -.short 0xaf18 -.short 0x0800 -.short 0x0850 -.short 0x0012 -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0831 -.short 0x001e -.short 0x0c28 -.short 0x0020 -.short 0x0000 -.short 0x047e -.short 0x0c0b -.short 0x29bd -.short 0x080a -.short 0x0c0b -.short 0x305d -.short 0x0806 -.short 0x0c0b -.short 0x30a5 -.short 0x0806 -.short 0x0c78 -.short 0x0000 -.short 0x0020 -.short 0x0831 -.short 0x001e -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0867 -.short 0x0080 -.short 0x0c77 -.short 0x0000 -.short 0xfff0 -.short 0x0831 -.short 0x003c -.short 0x0c77 -.short 0x0000 -.short 0xfff0 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0c73 -.short 0x0088 -.short 0x0040 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/gUnk_0800AEDC.inc index d8650582..16a64ac9 100644 --- a/data/scripts/gUnk_0800AEDC.inc +++ b/data/scripts/gUnk_0800AEDC.inc @@ -6,7 +6,7 @@ _0807EF80 0x000b _0807E930 0x0000 StopScript WaitForSomething2 0x00000008 -Call sub_08094B80 +Call 0x08094b81 _0807EF3C 0x0000, 0x0001 _0807E5F8 0x00000010 WaitForSomething2 0x00000008 diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc index a786d6d5..5ba38181 100644 --- a/data/scripts/gUnk_0800AF18.inc +++ b/data/scripts/gUnk_0800AF18.inc @@ -2,7 +2,12 @@ SCRIPT_START gUnk_0800AF18 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfff8 +.short 0x0000 +@ End of 4 parameters SoundReq 0x0142 StopScript WaitForSomething 0x00000020 diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/gUnk_0800AF44.inc index ebfa32bc..da215c73 100644 --- a/data/scripts/gUnk_0800AF44.inc +++ b/data/scripts/gUnk_0800AF44.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AF44 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807EB28 0x1c01 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0001 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/gUnk_0800AF68.inc index 2b99a066..4209d0f2 100644 --- a/data/scripts/gUnk_0800AF68.inc +++ b/data/scripts/gUnk_0800AF68.inc @@ -1,7 +1,11 @@ SCRIPT_START gUnk_0800AF68 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807EB28 0x1c02 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0002 -.short 0x0c0b +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800AF7E.inc b/data/scripts/gUnk_0800AF7E.inc deleted file mode 100644 index 1a8d0025..00000000 --- a/data/scripts/gUnk_0800AF7E.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800AF7E -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/gUnk_0800AF8C.inc index f0352fce..b1d27fee 100644 --- a/data/scripts/gUnk_0800AF8C.inc +++ b/data/scripts/gUnk_0800AF8C.inc @@ -1,8 +1,11 @@ SCRIPT_START gUnk_0800AF8C _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807EB28 0x1c03 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0003 -Call sub_0807DF50 -.byte 0x44 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800AFA7.inc b/data/scripts/gUnk_0800AFA7.inc deleted file mode 100644 index 0b73b74c..00000000 --- a/data/scripts/gUnk_0800AFA7.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800AFA7 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/gUnk_0800AFB0.inc index 123fb79d..6b836bfc 100644 --- a/data/scripts/gUnk_0800AFB0.inc +++ b/data/scripts/gUnk_0800AFB0.inc @@ -2,15 +2,15 @@ SCRIPT_START gUnk_0800AFB0 _0807E864 StopScript StartScript -Call sub_0807FBB4 +Call 0x0807fbb5 ComparePlayerAction 0x0001 JumpIfNot 0xfff0 StopScript -Call sub_0807DF28 +Call 0x0807df29 _0807EB28 0x1c04 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0004 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/gUnk_0800AFE8.inc index c150d8e0..ec04570c 100644 --- a/data/scripts/gUnk_0800AFE8.inc +++ b/data/scripts/gUnk_0800AFE8.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AFE8 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807EB28 0x1c05 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0005 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/gUnk_0800B00C.inc index 8bc5453a..a752472c 100644 --- a/data/scripts/gUnk_0800B00C.inc +++ b/data/scripts/gUnk_0800B00C.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800B00C StartScript -Call sub_0807F934 -Call sub_080A2124 +Call 0x0807f935 +Call 0x080a2125 _0807EF80 0x000a _0807EF80 0x0007 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 +Call 0x0807df29 CheckGlobalFlag 0x0052 JumpIf 0x004a CheckGlobalFlag 0x0053 @@ -16,7 +16,7 @@ JumpIf 0x0024 TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call Windcrest_Unlock +Call 0x080a2139 Wait 0x003c _0807EB28 0x0b5c _0807EA94 @@ -25,7 +25,7 @@ Jump 0x003a TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call Windcrest_Unlock +Call 0x080a2139 Wait 0x003c _0807EB28 0x0b5d _0807EA94 @@ -33,11 +33,11 @@ Jump 0x001c TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call Windcrest_Unlock +Call 0x080a2139 Wait 0x003c _0807EB28 0x0b5e _0807EA94 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/gUnk_0800B0AC.inc index 93f58f77..6048d180 100644 --- a/data/scripts/gUnk_0800B0AC.inc +++ b/data/scripts/gUnk_0800B0AC.inc @@ -1,3 +1,11 @@ SCRIPT_START gUnk_0800B0AC StopScript _0807E864 +Call 0x0807fa41 +Call 0x0807df29 +_0807EB28 0x0b5f +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B0B0.inc b/data/scripts/gUnk_0800B0B0.inc deleted file mode 100644 index 60cdd0bb..00000000 --- a/data/scripts/gUnk_0800B0B0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800B0B0 -Call sub_0807FA40 -Call sub_0807DF28 -_0807EB28 0x0b5f -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc index b6d85120..87034e69 100644 --- a/data/scripts/gUnk_0800B0D0.inc +++ b/data/scripts/gUnk_0800B0D0.inc @@ -1,144 +1,81 @@ SCRIPT_START gUnk_0800B0D0 StartScript -Call sub_0806BCD4 +Call 0x0806bcd5 _0807EF80 0x000a -CallWithArg sub_0806BC94, 0x00000000 +CallWithArg +.short 0xbc95 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters StopScript -Call sub_0807F434 -.byte 0x6 -.byte 0x10 -.byte 0xf8 -.byte 0xff -.byte 0x4 -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xd5 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x95 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xe9 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xb9 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x95 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xb6 -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xd5 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x95 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xf6 -.byte 0x7 -.byte 0x8 -.byte 0x56 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xc1 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xb9 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x95 -.byte 0xbc -.byte 0x6 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 +Call 0x0807f435 +_0807E078 +.short 0xfff8 +.short 0x0004 +.short 0x0040 +@ End of 3 parameters +_0807E864 +Call 0x0807df29 +Call 0x0807f2d5 +_0807EB74 +CallWithArg +.short 0xbc95 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x0806bce9 +_0807EA94 +Call 0x0807df51 +_0807E878 +Call 0x0806bcb9 +CallWithArg +.short 0xbc95 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffb6 +_0807E864 +Call 0x0807df29 +Call 0x0807f2d5 +_0807EB74 +CallWithArg +.short 0xbc95 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f651 +_0807E9F0 +JumpIfNot 0x0008 +Call 0x0806bcc1 +Call 0x0807df51 +_0807E878 +Call 0x0806bcb9 +CallWithArg +.short 0xbc95 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xff6e +StartScript +Call 0x0807df29 +SetLocalFlag 0x0039 +_0807E864 +StopScript +WaitForPlayerAction0x17 +StartPlayerScript 0x0800b1c0 +Wait 0x0018 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +SetRoomFlag 0x0000 +Wait 0x0010 +SoundReq2 0x002d +_0807EB28 0x2701 +_0807E878 +Call 0x0807df51 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800B177.inc b/data/scripts/gUnk_0800B177.inc deleted file mode 100644 index 15e5d732..00000000 --- a/data/scripts/gUnk_0800B177.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800B177 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x6e -.byte 0xff diff --git a/data/scripts/gUnk_0800B17C.inc b/data/scripts/gUnk_0800B17C.inc deleted file mode 100644 index 1c3c36a4..00000000 --- a/data/scripts/gUnk_0800B17C.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800B17C -StartScript -Call sub_0807DF28 -SetLocalFlag 0x0039 -_0807E864 -StopScript -WaitForPlayerAction0x17 -StartPlayerScript 0x0800b1c0 -Wait 0x0018 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetRoomFlag 0x0000 -Wait 0x0010 -SoundReq2 0x002d -_0807EB28 0x2701 -_0807E878 -Call sub_0807DF50 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc index e5ef8a57..7a1a152e 100644 --- a/data/scripts/gUnk_0800B1C0.inc +++ b/data/scripts/gUnk_0800B1C0.inc @@ -12,5 +12,5 @@ Wait 0x002c LoadRoomEntityList 0x080da260 Wait 0x001e _0807E5F8 0x00000001 -Call sub_0807921C +Call 0x0807921d SCRIPT_END diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/gUnk_0800B200.inc index 8d16d2c1..66d9a626 100644 --- a/data/scripts/gUnk_0800B200.inc +++ b/data/scripts/gUnk_0800B200.inc @@ -6,13 +6,13 @@ JumpIf 0x0044 SetEntityNonPlanarMovement 0x00c0 StopScript WaitForSomething2 0x00000001 -Call sub_0807DF28 +Call 0x0807df29 MoveEntityToPlayer CameraTargetEntity _0807EDD4 0x0068, 0x0380 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 -Call sub_0807DF50 +Call 0x0807df51 Wait 0x000c CameraTargetPlayer Wait 0x0008 diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/gUnk_0800B254.inc index 8354b1c8..f6f8fe08 100644 --- a/data/scripts/gUnk_0800B254.inc +++ b/data/scripts/gUnk_0800B254.inc @@ -10,7 +10,46 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0006 JumpIf 0x006e -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffe8 .short 0x0000 +StartScript +CheckKinstoneFused 0x0007 +JumpIf 0x0076 +_0807EA88 0x0007 +_0807EB44 0x0002 +StopScript +_0807EA4C +_0807E9F0 +_0807E864 +CheckKinstoneFused 0x0007 +JumpIf 0x003e +Call 0x0807df51 +_0807E878 +Jump 0xffe8 +.short 0x0000 +StartScript +CheckKinstoneFused 0x0008 +JumpIf 0x0046 +_0807EA88 0x0008 +_0807EB44 0x0002 +StopScript +_0807EA4C +_0807E9F0 +_0807E864 +CheckKinstoneFused 0x0008 +JumpIf 0x000e +Call 0x0807df51 +_0807E878 +Jump 0xffe8 +_0807EF80 0x0013 +_0807EB44 0x0004 +_0807E9DC +Call 0x080676e1 +Call 0x08067535 +_0807EF80 0x0012 +_0807E5F8 0x00000001 +StopScript +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800B284.inc b/data/scripts/gUnk_0800B284.inc deleted file mode 100644 index 9b1da0f5..00000000 --- a/data/scripts/gUnk_0800B284.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_0800B284 -StartScript -CheckKinstoneFused 0x0007 -JumpIf 0x0076 -_0807EA88 0x0007 -_0807EB44 0x0002 -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0007 -JumpIf 0x003e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -.short 0x0000 diff --git a/data/scripts/gUnk_0800B2B4.inc b/data/scripts/gUnk_0800B2B4.inc deleted file mode 100644 index c149985a..00000000 --- a/data/scripts/gUnk_0800B2B4.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_0800B2B4 -StartScript -CheckKinstoneFused 0x0008 -JumpIf 0x0046 -_0807EA88 0x0008 -_0807EB44 0x0002 -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0008 -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -_0807EF80 0x0013 -_0807EB44 0x0004 -_0807E9DC -Call sub_080676E0 -Call sub_08067534 -_0807EF80 0x0012 -_0807E5F8 0x00000001 -StopScript -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/gUnk_0800B308.inc index 28e72dba..382aa451 100644 --- a/data/scripts/gUnk_0800B308.inc +++ b/data/scripts/gUnk_0800B308.inc @@ -5,5 +5,35 @@ JumpIf 0x008c _0807EF80 0x0001 SetEntityNonPlanarMovement 0x0040 SetEntityDirection 0x0010 -.short 0x081d -.short 0x0006 +CheckKinstoneFused 0x0006 +JumpIfNot 0x0008 +Call 0x080676d9 +CheckKinstoneFused 0x0007 +JumpIfNot 0x0008 +Call 0x080676d9 +CheckKinstoneFused 0x0008 +JumpIfNot 0x0008 +Call 0x080676d9 +StopScript +Call 0x0806757d +StopScript +WaitForSomething2 0x00000002 +SoundReq 0x00fd +Call 0x080676d9 +Call 0x0806757d +Call 0x080675d5 +Wait 0x0014 +StartScript +_0807E5F8 0x00000001 +CheckKinstoneFused 0x0006 +JumpIfNot 0xffd0 +CheckKinstoneFused 0x0007 +JumpIfNot 0xffc8 +CheckKinstoneFused 0x0008 +JumpIfNot 0xffc0 +StopScript +SetLocalFlag 0x001d +SoundReq 0x0072 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800B322.inc b/data/scripts/gUnk_0800B322.inc deleted file mode 100644 index ad122e94..00000000 --- a/data/scripts/gUnk_0800B322.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800B322 -JumpIfNot 0x0008 -.byte 0xb -.byte 0xc -.byte 0xd9 diff --git a/data/scripts/gUnk_0800B329.inc b/data/scripts/gUnk_0800B329.inc deleted file mode 100644 index 8e545d3b..00000000 --- a/data/scripts/gUnk_0800B329.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_0800B329 -.byte 0x76 -.byte 0x6 -.byte 0x8 -.byte 0x1d -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0x76 -.byte 0x6 -.byte 0x8 -.byte 0x1d -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0x76 -.byte 0x6 -.byte 0x8 diff --git a/data/scripts/gUnk_0800B348.inc b/data/scripts/gUnk_0800B348.inc deleted file mode 100644 index 63a72982..00000000 --- a/data/scripts/gUnk_0800B348.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800B348 -StopScript -Call sub_0806757C -StopScript -WaitForSomething2 0x00000002 -.short 0x087b -.short 0x00fd diff --git a/data/scripts/gUnk_0800B35C.inc b/data/scripts/gUnk_0800B35C.inc deleted file mode 100644 index eef552e6..00000000 --- a/data/scripts/gUnk_0800B35C.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800B35C -Call sub_080676D8 -Call sub_0806757C -Call sub_080675D4 -Wait 0x0014 -StartScript diff --git a/data/scripts/gUnk_0800B374.inc b/data/scripts/gUnk_0800B374.inc deleted file mode 100644 index aab431ab..00000000 --- a/data/scripts/gUnk_0800B374.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800B374 -_0807E5F8 0x00000001 -CheckKinstoneFused 0x0006 -JumpIfNot 0xffd0 -CheckKinstoneFused 0x0007 -JumpIfNot 0xffc8 -CheckKinstoneFused 0x0008 -JumpIfNot 0xffc0 -StopScript -SetLocalFlag 0x001d -SoundReq 0x0072 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc index cfb8bc0b..79a61350 100644 --- a/data/scripts/gUnk_0800B3A4.inc +++ b/data/scripts/gUnk_0800B3A4.inc @@ -1,24 +1,62 @@ SCRIPT_START gUnk_0800B3A4 StartScript _0807EF80 0x000a -Call sub_0807F158 +Call 0x0807f159 SetEntityNonPlanarMovement 0x0120 _0807EB44 0x0004 _0807E908 0x0002 _0807E914 0x0000200a StopScript _0807EDD4 0x0158, 0x0290 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 _0807EDD4 0x0128, 0x0290 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -.byte 0xb -.byte 0xc -.byte 0x81 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Call 0x08065781 +Jump 0xffaa + +.globl gUnk_0800B41C +gUnk_0800B41C: +StartScript +SetEntityNonPlanarMovement 0x00c0 +_0807E908 0x0001 +_0807EF80 0x000b +_0807E864 +Call 0x0807fbc5 +StopScript +Wait 0x000a +_0807EF80 0x0004 +_0807E5F8 0x00000008 +StartPlayerScript 0x0800b54c +_0807EDD4 0x0140, 0x0298 +_0807EB74 +WaitForSomething2 0x00000004 +_0807EB74 +Wait 0x003c +SoundReq 0x00cd +_0807F088 0x0037 +WaitPlayerAction8 +_0807EB8C +TextboxNoOverlapFollow 0x200c +_0807EA94 +Wait 0x0014 +_0807EDD4 0x0158, 0x0290 +Wait 0x000a +_0807EDD4 0x0158, 0x0288 +Wait 0x0014 +_0807E5F8 0x00000010 +_0807EDD4 0x0158, 0x0280 +Wait 0x000a +_0807EF80 0x0008 +_0807E5F8 0x00000010 +_0807E5F8 0x00000008 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B40F.inc b/data/scripts/gUnk_0800B40F.inc deleted file mode 100644 index b71aa529..00000000 --- a/data/scripts/gUnk_0800B40F.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800B40F -.byte 0x57 -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x81 -.byte 0x57 -.byte 0x6 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0xaa -.byte 0xff diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc deleted file mode 100644 index 394408ff..00000000 --- a/data/scripts/gUnk_0800B41C.inc +++ /dev/null @@ -1,36 +0,0 @@ -SCRIPT_START gUnk_0800B41C -StartScript -SetEntityNonPlanarMovement 0x00c0 -_0807E908 0x0001 -_0807EF80 0x000b -_0807E864 -Call sub_0807FBC4 -StopScript -Wait 0x000a -_0807EF80 0x0004 -_0807E5F8 0x00000008 -StartPlayerScript 0x0800b54c -_0807EDD4 0x0140, 0x0298 -_0807EB74 -WaitForSomething2 0x00000004 -_0807EB74 -Wait 0x003c -SoundReq 0x00cd -_0807F088 0x0037 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlapFollow 0x200c -_0807EA94 -Wait 0x0014 -_0807EDD4 0x0158, 0x0290 -Wait 0x000a -_0807EDD4 0x0158, 0x0288 -Wait 0x0014 -_0807E5F8 0x00000010 -_0807EDD4 0x0158, 0x0280 -Wait 0x000a -_0807EF80 0x0008 -_0807E5F8 0x00000010 -_0807E5F8 0x00000008 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/gUnk_0800B4AC.inc index 5ebfe39b..8fac7d8b 100644 --- a/data/scripts/gUnk_0800B4AC.inc +++ b/data/scripts/gUnk_0800B4AC.inc @@ -24,6 +24,20 @@ StopScript _0807E610 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 -.short 0x0c33 -.short 0x0008 -.short 0x0000 +WaitForSomething2 0x00000008 +TextboxNoOverlapFollow 0x2016 +_0807EA94 +_0807EDD4 0x0158, 0x0288 +_0807EF80 0x0000 +_0807EB44 0x0000 +Wait 0x000a +_0807E5F8 0x00000010 +_0807EF80 0x0008 +Wait 0x001e +_0807E5F8 0x00000010 +SetGlobalFlag 0x001d +Call 0x0807921d +_0807E878 +Call 0x0807fbcd +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B508.inc b/data/scripts/gUnk_0800B508.inc deleted file mode 100644 index 30af8b50..00000000 --- a/data/scripts/gUnk_0800B508.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800B508 -TextboxNoOverlapFollow 0x2016 -_0807EA94 -.byte 0x73 diff --git a/data/scripts/gUnk_0800B50F.inc b/data/scripts/gUnk_0800B50F.inc deleted file mode 100644 index 956ec942..00000000 --- a/data/scripts/gUnk_0800B50F.inc +++ /dev/null @@ -1,62 +0,0 @@ -SCRIPT_START gUnk_0800B50F -.byte 0xc -.byte 0x58 -.byte 0x1 -.byte 0x88 -.byte 0x2 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2d -.byte 0x8 -.byte 0x1d -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x1d -.byte 0x92 -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xcd -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/gUnk_0800B574.inc index c63c2a13..c07603ba 100644 --- a/data/scripts/gUnk_0800B574.inc +++ b/data/scripts/gUnk_0800B574.inc @@ -16,5 +16,5 @@ SoundReq 0x0111 WaitForSomething2 0x00000010 _0807EF80 0x0007 SoundReq 0x0111 -Call sub_0808692C +Call 0x0808692d SCRIPT_END diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/gUnk_0800B5C4.inc index e834cb3c..18eb145d 100644 --- a/data/scripts/gUnk_0800B5C4.inc +++ b/data/scripts/gUnk_0800B5C4.inc @@ -7,6 +7,6 @@ Wait 0x001e SoundReq 0x00d1 _0807EDD4 0x008a, 0x005a Wait 0x000a -Call sub_08069EE8 +Call 0x08069ee9 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc index fbbd3b35..dcf2a704 100644 --- a/data/scripts/gUnk_0800B5EC.inc +++ b/data/scripts/gUnk_0800B5EC.inc @@ -12,5 +12,60 @@ TextboxNoOverlap 0x2009 _0807EA94 _0807E878 _0807EB44 0x0004 -.short 0x0803 -.short 0xffe8 +Jump 0xffe8 +StartScript +StopScript +CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 +JumpIfNot 0xfff6 +Call 0x08079185 +_0807E864 +Call 0x0807f9a5 +StartPlayerScript 0x0800b7c4 +WaitForSomething2 0x00000004 +SetRoomFlag 0x0000 +WaitForSomething2 0x00000004 +CheckLocalFlag 0x009e +JumpIf 0x0154 +TextboxNoOverlap 0x0583 +_0807EA94 +_0807E3E8 +JumpIfNot 0x002a +Wait 0x000f +TextboxNoOverlap 0x0584 +CallWithArg +.short 0xf971 +.short 0x0807 +.short 0x058b +.short 0x0000 +@ End of 4 parameters +JumpIf 0x001e +CallWithArg +.short 0x7425 +.short 0x0808 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x00b4 +Jump 0x0024 +TextboxNoOverlap 0x057d +_0807EA94 +Jump 0x001a +_0807EA94 +SetLocalFlag 0x009e +_0807F034 0x0066 +WaitPlayerAction8 +_0807EB8C +Wait 0x001e +TextboxNoOverlap 0x057f +_0807EA94 +_0807E778 0x0004 +DoFade7 +WaitFor_2 +Call 0x080873fd +DoFade6 +WaitFor_2 +CameraTargetPlayer +Wait 0x001e +Call 0x0807df51 +_0807E878 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B614.inc b/data/scripts/gUnk_0800B614.inc deleted file mode 100644 index 5a4caed2..00000000 --- a/data/scripts/gUnk_0800B614.inc +++ /dev/null @@ -1,47 +0,0 @@ -SCRIPT_START gUnk_0800B614 -StartScript -StopScript -CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 -JumpIfNot 0xfff6 -Call sub_08079184 -_0807E864 -Call sub_0807F9A4 -StartPlayerScript 0x0800b7c4 -WaitForSomething2 0x00000004 -SetRoomFlag 0x0000 -WaitForSomething2 0x00000004 -CheckLocalFlag 0x009e -JumpIf 0x0154 -TextboxNoOverlap 0x0583 -_0807EA94 -_0807E3E8 -JumpIfNot 0x002a -Wait 0x000f -TextboxNoOverlap 0x0584 -CallWithArg sub_0807F970, 0x0000058b -JumpIf 0x001e -CallWithArg sub_08087424, 0x00000000 -Wait 0x00b4 -Jump 0x0024 -TextboxNoOverlap 0x057d -_0807EA94 -Jump 0x001a -_0807EA94 -SetLocalFlag 0x009e -_0807F034 0x0066 -WaitPlayerAction8 -_0807EB8C -Wait 0x001e -TextboxNoOverlap 0x057f -_0807EA94 -_0807E778 0x0004 -DoFade7 -WaitFor_2 -Call sub_080873FC -DoFade6 -WaitFor_2 -CameraTargetPlayer -Wait 0x001e -Call sub_0807DF50 -_0807E878 -SCRIPT_END diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc index 4959b7fa..0f76ab54 100644 --- a/data/scripts/gUnk_0800B6C8.inc +++ b/data/scripts/gUnk_0800B6C8.inc @@ -5,12 +5,99 @@ HasRupees 0x0001 JumpIfNot 0xfffa CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot 0xfff6 -Call sub_08079184 +Call 0x08079185 _0807E864 -Call sub_0807F9A4 +Call 0x0807f9a5 StartPlayerScript 0x0800b7c4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 -.short 0x0812 -.short 0x009f +CheckLocalFlag 0x009f +JumpIf 0x0098 +TextboxNoOverlap 0x057b +_0807EA94 +CallWithArg +.short 0xf971 +.short 0x0807 +.short 0x057d +.short 0x0000 +@ End of 4 parameters +JumpIf 0xff88 +_0807EA94 +SetLocalFlag 0x009f +_0807F034 0x0064 +Jump 0xff6c +.short 0x0000 +StartScript +StopScript +Call 0x0808747d +JumpIfNot 0xfff8 +Call 0x08079185 +_0807E864 +Wait 0x000a +Call 0x0807f9a5 +StartPlayerScript 0x0800b7c4 +WaitForSomething2 0x00000004 +SetRoomFlag 0x0000 +WaitForSomething2 0x00000004 +CheckLocalFlag 0x00a0 +JumpIf 0x0036 +TextboxNoOverlap 0x0580 +_0807EA94 +CallWithArg +.short 0xf971 +.short 0x0807 +.short 0x0582 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x0014 +CallWithArg +.short 0x7425 +.short 0x0808 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +Wait 0x00b4 +Jump 0xff14 +_0807EA94 +SetLocalFlag 0x00a0 +_0807F034 0x0065 +Jump 0xfef8 +TextboxNoOverlap 0x0590 +_0807EA94 +_0807E778 0x0010 +DoFade7 +WaitFor_2 +ModHealth 0x00a0 +DoFade6 +WaitFor_2 +TextboxNoOverlap 0x057f +_0807EA94 +Jump 0xfee6 +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x0090 +.short 0x0000 +@ End of 4 parameters +JumpIfNot 0x0024 +CallWithArg +.short 0xf465 +.short 0x0807 +.short 0x0078 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0090 +.short 0x0000 +@ End of 4 parameters +_0807E8E4_0 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B708.inc b/data/scripts/gUnk_0800B708.inc deleted file mode 100644 index f1eed151..00000000 --- a/data/scripts/gUnk_0800B708.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800B708 -JumpIf 0x0098 -TextboxNoOverlap 0x057b -_0807EA94 -CallWithArg sub_0807F970, 0x0000057d -.byte 0x4 -.byte 0x8 -.byte 0x88 diff --git a/data/scripts/gUnk_0800B71F.inc b/data/scripts/gUnk_0800B71F.inc deleted file mode 100644 index 1a53d93b..00000000 --- a/data/scripts/gUnk_0800B71F.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800B71F -.byte 0xff -.byte 0x59 -.byte 0x4 -.byte 0x2a -.byte 0x8 -.byte 0x9f -.byte 0x0 -.byte 0x82 -.byte 0x8 -.byte 0x64 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x6c -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800B730.inc b/data/scripts/gUnk_0800B730.inc deleted file mode 100644 index 8455f72a..00000000 --- a/data/scripts/gUnk_0800B730.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_0800B730 -StartScript -StopScript -Call sub_0808747C -JumpIfNot 0xfff8 -Call sub_08079184 -_0807E864 -Wait 0x000a -Call sub_0807F9A4 -StartPlayerScript 0x0800b7c4 -WaitForSomething2 0x00000004 -SetRoomFlag 0x0000 -WaitForSomething2 0x00000004 -CheckLocalFlag 0x00a0 -JumpIf 0x0036 -TextboxNoOverlap 0x0580 -_0807EA94 -CallWithArg sub_0807F970, 0x00000582 -JumpIf 0x0014 -CallWithArg sub_08087424, 0x00000001 -Wait 0x00b4 -Jump 0xff14 -_0807EA94 -SetLocalFlag 0x00a0 -_0807F034 0x0065 -Jump 0xfef8 -TextboxNoOverlap 0x0590 -_0807EA94 -_0807E778 0x0010 -DoFade7 -WaitFor_2 -ModHealth 0x00a0 -DoFade6 -WaitFor_2 -TextboxNoOverlap 0x057f -_0807EA94 -Jump 0xfee6 -.short 0x0000 diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc deleted file mode 100644 index 577b81e0..00000000 --- a/data/scripts/gUnk_0800B7C4.inc +++ /dev/null @@ -1,95 +0,0 @@ -SCRIPT_START gUnk_0800B7C4 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -CallWithArg sub_0807F6B4, 0x00000090 -JumpIfNot 0x0024 -CallWithArg sub_0807F464, 0x00000078 -CallWithArg sub_0807F4F8, 0x00000090 -_0807E8E4_0 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -SCRIPT_END -.byte 0xc -.byte 0x14 -.byte 0xf9 -.byte 0xf4 -.byte 0x7 -.byte 0x8 -.byte 0x90 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x65 -.byte 0xf4 -.byte 0x7 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xdc -.byte 0xff -.byte 0x1 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x53 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x51 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x1 -.byte 0xa -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xee -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x53 diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc new file mode 100644 index 00000000..669aca86 --- /dev/null +++ b/data/scripts/gUnk_0800B7FC.inc @@ -0,0 +1,21 @@ +SCRIPT_START gUnk_0800B7FC +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0090 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf465 +.short 0x0807 +.short 0x0078 +.short 0x0000 +@ End of 4 parameters +Jump 0xffdc +StartScript +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x0000 +StopScript +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc new file mode 100644 index 00000000..3d432666 --- /dev/null +++ b/data/scripts/gUnk_0800B828.inc @@ -0,0 +1,128 @@ +SCRIPT_START gUnk_0800B828 +StartScript +_0807E9D4 +_0807EB44 0x0000 +_0807EF80 0x000a +StopScript +_0807E944 +_0807E864 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffee +.short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +Wait 0x003c +Call 0x080646a5 +Jump 0xfff4 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807E930 0x0000 +_0807EF80 0x000a +StopScript +Wait 0x003c +Call 0x0806407d +Jump 0xfff4 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +CallWithArg +.short 0x4645 +.short 0x0806 +.short 0x464d +.short 0x0806 +@ End of 4 parameters +StopScript +Wait 0x003c +Call 0x080646a5 +Jump 0xfff4 +.short 0x0000 +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0004 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +Jump 0xffe4 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +CheckLocalFlag 0x005f +JumpIf 0x001c +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlapFollow 0x3f19 +_0807EA94 +SetLocalFlag 0x005f +_0807E878 +Jump 0xffe8 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlapFollow 0x3f1a +_0807EA94 +_0807E878 +Jump 0xffec +StartScript +_0807EF80 0x000b +_0807EF80 0x0008 +Call 0x0806daad +JumpIf 0x0036 +Call 0x0806dad1 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0005 +.short 0x0000 +@ End of 4 parameters +StopScript +_0807EA4C +_0807E9F0 +JumpIf 0x000e +Call 0x0807df51 +_0807E878 +Jump 0xffee +Call 0x0806f189 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800B84F.inc b/data/scripts/gUnk_0800B84F.inc deleted file mode 100644 index 88b7b333..00000000 --- a/data/scripts/gUnk_0800B84F.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800B84F -.short 0x6104 -.short 0x0408 -.short 0x7900 -.short 0x0008 -.short 0x7900 -.short 0x0a08 -.short 0x0200 -.short 0x3104 -.short 0x3c08 diff --git a/data/scripts/gUnk_0800B861.inc b/data/scripts/gUnk_0800B861.inc deleted file mode 100644 index e39093e6..00000000 --- a/data/scripts/gUnk_0800B861.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800B861 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0x46 -.byte 0x6 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0xf4 -.byte 0xff -.byte 0x1 -.byte 0x4 -.byte 0x53 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x7d -.byte 0x40 -.byte 0x6 -.byte 0x8 diff --git a/data/scripts/gUnk_0800B888.inc b/data/scripts/gUnk_0800B888.inc deleted file mode 100644 index cfa4f625..00000000 --- a/data/scripts/gUnk_0800B888.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800B888 -Jump 0xfff4 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -CheckEntityInteractType diff --git a/data/scripts/gUnk_0800B8A0.inc b/data/scripts/gUnk_0800B8A0.inc deleted file mode 100644 index 20de8560..00000000 --- a/data/scripts/gUnk_0800B8A0.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800B8A0 -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -.short 0x0803 -.short 0xffe8 diff --git a/data/scripts/gUnk_0800B8B8.inc b/data/scripts/gUnk_0800B8B8.inc deleted file mode 100644 index 83c890d6..00000000 --- a/data/scripts/gUnk_0800B8B8.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800B8B8 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -CallWithArg sub_08064644, 0x0806464d -StopScript -Wait 0x003c -Call sub_080646A4 -Jump 0xfff4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800B8E4.inc b/data/scripts/gUnk_0800B8E4.inc deleted file mode 100644 index f9072d93..00000000 --- a/data/scripts/gUnk_0800B8E4.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800B8E4 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 diff --git a/data/scripts/gUnk_0800B906.inc b/data/scripts/gUnk_0800B906.inc deleted file mode 100644 index c33d8c11..00000000 --- a/data/scripts/gUnk_0800B906.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800B906 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800B91C.inc b/data/scripts/gUnk_0800B91C.inc deleted file mode 100644 index 9f8a5c8b..00000000 --- a/data/scripts/gUnk_0800B91C.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800B91C -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -CheckLocalFlag 0x005f -JumpIf 0x001c -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x3f19 -_0807EA94 -SetLocalFlag 0x005f -_0807E878 -Jump 0xffe8 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x3f1a -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffec diff --git a/data/scripts/gUnk_0800B964.inc b/data/scripts/gUnk_0800B964.inc deleted file mode 100644 index 50ab5cd7..00000000 --- a/data/scripts/gUnk_0800B964.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_0800B964 -StartScript -_0807EF80 0x000b -_0807EF80 0x0008 -Call sub_0806DAAC -JumpIf 0x0036 -Call sub_0806DAD0 -CallWithArg sub_0806DA04, 0x00000005 -StopScript -_0807EA4C -_0807E9F0 -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffee -Call sub_0806F188 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc index 7813aa0b..1f5db32c 100644 --- a/data/scripts/gUnk_0800B9B4.inc +++ b/data/scripts/gUnk_0800B9B4.inc @@ -1,62 +1,79 @@ SCRIPT_START gUnk_0800B9B4 StartScript _0807E9D4 -Call sub_080694EC +Call 0x080694ed _0807EF80 0x000a -Call sub_080694B0 +Call 0x080694b1 StopScript -Call sub_0807F434 -.short 0x1006 +Call 0x0807f435 +_0807E078 .short 0xfff8 .short 0x0004 .short 0x001e -.short 0x0443 -.short 0x0463 -.short 0x0879 -.short 0x0000 -.short 0x0c0b -.short 0x94d9 -.short 0x0806 -.short 0x0459 -.short 0x0c0b -.short 0x94ed -.short 0x0806 -.short 0x0444 -.short 0x0803 -.short 0xffd8 -.short 0x0443 -.short 0x0463 -.short 0x0879 -.short 0x0000 -.short 0x0c0b -.short 0xf651 -.short 0x0807 -.short 0x0456 -.short 0x0443 -.short 0x0c0b -.short 0x948d -.short 0x0806 -.short 0x0804 -.short 0x0016 -.short 0x0459 -.short 0x0c0b -.short 0x94ed -.short 0x0806 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0803 -.short 0xffa8 -.short 0x0459 -.short 0x0454 -.short 0x0453 -.short 0x0c0b -.short 0x94ed -.short 0x0806 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0803 -.short 0xff90 +@ End of 3 parameters +_0807E864 +_0807EB74 +_0807EF80 0x0000 +Call 0x080694d9 +_0807EA94 +Call 0x080694ed +_0807E878 +Jump 0xffd8 +_0807E864 +_0807EB74 +_0807EF80 0x0000 +Call 0x0807f651 +_0807E9F0 +_0807E864 +Call 0x0806948d +JumpIf 0x0016 +_0807EA94 +Call 0x080694ed +Call 0x0807df51 +_0807E878 +Jump 0xffa8 +_0807EA94 +_0807E9DC +_0807E9D4 +Call 0x080694ed +Call 0x0807df51 +_0807E878 +Jump 0xff90 +StartScript +Call 0x0807f935 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807df29 +TextboxNoOverlapFollow 0x3301 +_0807EA94 +_0807E3E8 +JumpIfNot 0x000e +SoundReq0x80100000 +Call 0x0806e965 +SoundReq2 0xffff +Call 0x0807df51 +_0807E878 +Jump 0xffd0 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +SetEntityNonPlanarMovement 0x0040 +Call 0x0807f349 +StopScript +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807EDD4 0x02f8, 0x0350 +Wait 0x001e +_0807EF80 0x0004 +Wait 0x003c +_0807EB44 0x0006 +Wait 0x001e +_0807EDD4 0x02f0, 0x0350 +Wait 0x001e +TextboxNoOverlap 0x0e00 +_0807EA94 +Wait 0x0078 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BA3C.inc b/data/scripts/gUnk_0800BA3C.inc deleted file mode 100644 index 706dbff6..00000000 --- a/data/scripts/gUnk_0800BA3C.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800BA3C -StartScript -Call sub_0807F934 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollow 0x3301 -_0807EA94 -_0807E3E8 -JumpIfNot 0x000e -SoundReq0x80100000 -Call sub_0806E964 -SoundReq2 0xffff -Call sub_0807DF50 -_0807E878 -.short 0x0803 -.short 0xffd0 diff --git a/data/scripts/gUnk_0800BA78.inc b/data/scripts/gUnk_0800BA78.inc deleted file mode 100644 index a1b5cda4..00000000 --- a/data/scripts/gUnk_0800BA78.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800BA78 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0040 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EDD4 0x02f8, 0x0350 -Wait 0x001e -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0006 -Wait 0x001e -_0807EDD4 0x02f0, 0x0350 -Wait 0x001e -TextboxNoOverlap 0x0e00 -_0807EA94 -Wait 0x0078 -Call sub_08054968 -SCRIPT_END diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/gUnk_0800BACC.inc index 6272a549..5142d095 100644 --- a/data/scripts/gUnk_0800BACC.inc +++ b/data/scripts/gUnk_0800BACC.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BACC StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call sub_0807F348 +Call 0x0807f349 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -11,5 +11,5 @@ Wait 0x003c TextboxNoOverlap 0x0e01 _0807EA94 Wait 0x0078 -Call sub_08054968 +Call 0x08054969 SCRIPT_END diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/gUnk_0800BB00.inc index 2adf9e53..b273117b 100644 --- a/data/scripts/gUnk_0800BB00.inc +++ b/data/scripts/gUnk_0800BB00.inc @@ -1,5 +1,15 @@ SCRIPT_START gUnk_0800BB00 StartScript StopScript -.short 0x0815 -.short 0x00ff +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e02 +_0807EA94 +Wait 0x003c +_0807EF80 0x000f +Wait 0x00b4 +Call 0x08054969 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800BB08.inc b/data/scripts/gUnk_0800BB08.inc deleted file mode 100644 index 6a6a69ba..00000000 --- a/data/scripts/gUnk_0800BB08.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800BB08 -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e02 -_0807EA94 diff --git a/data/scripts/gUnk_0800BB1A.inc b/data/scripts/gUnk_0800BB1A.inc deleted file mode 100644 index df3681ff..00000000 --- a/data/scripts/gUnk_0800BB1A.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800BB1A -Wait 0x003c -_0807EF80 0x000f -Wait 0x00b4 -Call sub_08054968 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/gUnk_0800BB30.inc index 75b33cd3..e10efaf7 100644 --- a/data/scripts/gUnk_0800BB30.inc +++ b/data/scripts/gUnk_0800BB30.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BB30 StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call sub_0807F348 +Call 0x0807f349 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -11,5 +11,5 @@ Wait 0x003c TextboxNoOverlap 0x0e05 _0807EA94 Wait 0x0078 -Call sub_08054968 +Call 0x08054969 SCRIPT_END diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/gUnk_0800BB64.inc index c2c7ed3d..4ce57307 100644 --- a/data/scripts/gUnk_0800BB64.inc +++ b/data/scripts/gUnk_0800BB64.inc @@ -3,4 +3,15 @@ StartScript _0807EB44 0x0006 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0040 -.short 0x0c0b +Call 0x0807f349 +StopScript +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807EDD4 0x03a0, 0x00f8 +Wait 0x001e +TextboxNoOverlap 0x0e06 +_0807EA94 +Wait 0x000f +_0807EDD4 0x0380, 0x00f8 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BB74.inc b/data/scripts/gUnk_0800BB74.inc deleted file mode 100644 index 5c978df5..00000000 --- a/data/scripts/gUnk_0800BB74.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_0800BB74 -.short 0xf349 -.short 0x0807 -.short 0x0402 -.short 0x0815 -.short 0x00ff -.short 0x0805 -.short 0xfffa -.short 0x0c73 -.short 0x03a0 -.short 0x00f8 -.short 0x0831 -.short 0x001e -.short 0x085b -.short 0x0e06 -.short 0x0459 -.short 0x0831 -.short 0x000f -.short 0x0c73 -.short 0x0380 -.short 0x00f8 -.short 0x0c0b -.short 0x4969 -.short 0x0805 -.short 0xffff diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/gUnk_0800BBA4.inc index d482264a..e76223a7 100644 --- a/data/scripts/gUnk_0800BBA4.inc +++ b/data/scripts/gUnk_0800BBA4.inc @@ -3,7 +3,7 @@ StartScript _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 -Call sub_0807F348 +Call 0x0807f349 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -12,5 +12,5 @@ Wait 0x003c TextboxNoOverlap 0x0e04 _0807EA94 Wait 0x0078 -Call sub_08054968 -.byte 0xff +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BBDB.inc b/data/scripts/gUnk_0800BBDB.inc deleted file mode 100644 index 24df52e9..00000000 --- a/data/scripts/gUnk_0800BBDB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800BBDB -.byte 0xff diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/gUnk_0800BBDC.inc index 1ddfba44..df713c93 100644 --- a/data/scripts/gUnk_0800BBDC.inc +++ b/data/scripts/gUnk_0800BBDC.inc @@ -9,6 +9,6 @@ Wait 0x003c TextboxNoOverlap 0x0e03 _0807EA94 Wait 0x0078 -Call sub_08054968 +Call 0x08054969 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/gUnk_0800BC08.inc index eb93a51d..eae03d7c 100644 --- a/data/scripts/gUnk_0800BC08.inc +++ b/data/scripts/gUnk_0800BC08.inc @@ -6,4 +6,16 @@ _0807EF80 0x0000 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa -.short 0x0879 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e07 +_0807EA94 +StartScript +_0807EB44 0x0000 +_0807E930 0x0004 +StopScript +Wait 0x003c +Call 0x08065ccd +Wait 0x0078 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BC22.inc b/data/scripts/gUnk_0800BC22.inc deleted file mode 100644 index 04efcba5..00000000 --- a/data/scripts/gUnk_0800BC22.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800BC22 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x085b -.short 0x0e07 -.short 0x0459 -.short 0x0401 -.short 0x0861 -.short 0x0000 -.short 0x0850 -.short 0x0004 -.short 0x0402 -.short 0x0831 -.short 0x003c -.short 0x0c0b -.short 0x5ccd -.short 0x0806 -.short 0x0831 -.short 0x0078 -.short 0x0c0b -.short 0x4969 -.short 0x0805 -.short 0xffff diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc index d6604a70..c882f9fb 100644 --- a/data/scripts/gUnk_0800BC50.inc +++ b/data/scripts/gUnk_0800BC50.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BC50 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_08054EB8 +Call 0x08054eb9 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -15,10 +15,33 @@ _0807EA94 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 -Call sub_08054EFC +Call 0x08054efd _0807EB44 0x0000 _0807E930 0x0000 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000d -CallWithArg sub_0807F4F8, 0x00000378 -.short 0x0831 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0378 +.short 0x0000 +@ End of 4 parameters +Wait 0x003c +_0807EF80 0x000c +Wait 0x003c +TextboxNoOverlap 0x0e09 +_0807EA94 +Call 0x0807f159 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x035c +.short 0x0000 +@ End of 4 parameters +Wait 0x001e +SoundReq 0x0188 +_0807EF80 0x0008 +Wait 0x0078 +Call 0x08054969 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800BCAE.inc b/data/scripts/gUnk_0800BCAE.inc deleted file mode 100644 index 24fa0f31..00000000 --- a/data/scripts/gUnk_0800BCAE.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800BCAE -.byte 0x3c -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xc -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c diff --git a/data/scripts/gUnk_0800BCB7.inc b/data/scripts/gUnk_0800BCB7.inc deleted file mode 100644 index 2b8b3603..00000000 --- a/data/scripts/gUnk_0800BCB7.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800BCB7 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x9 -.byte 0xe -.byte 0x59 -.byte 0x4 diff --git a/data/scripts/gUnk_0800BCBE.inc b/data/scripts/gUnk_0800BCBE.inc deleted file mode 100644 index 7e9644b6..00000000 --- a/data/scripts/gUnk_0800BCBE.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800BCBE -Call sub_0807F158 -CallWithArg sub_0807F4F8, 0x0000035c -Wait 0x001e -SoundReq 0x0188 -_0807EF80 0x0008 -Wait 0x0078 -Call sub_08054968 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/gUnk_0800BCE8.inc index 821120f8..ae6fa3dc 100644 --- a/data/scripts/gUnk_0800BCE8.inc +++ b/data/scripts/gUnk_0800BCE8.inc @@ -2,10 +2,35 @@ SCRIPT_START gUnk_0800BCE8 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitFor_2 Wait 0x00f0 _0807E930 0x0000 -.short 0x0831 -.short 0x003c +Wait 0x003c +TextboxNoOverlap 0x0e0a +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +_0807E5F8 0x00000001 +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E930 0x0000 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e0c +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x0168 +_0807E930 0x0000 +Wait 0x003c +_0807EB44 0x0002 +WaitForSomething2 0x00000004 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BD08.inc b/data/scripts/gUnk_0800BD08.inc deleted file mode 100644 index c7002b4d..00000000 --- a/data/scripts/gUnk_0800BD08.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800BD08 -TextboxNoOverlap 0x0e0a -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e0c -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x0168 -_0807E930 0x0000 -Wait 0x003c -_0807EB44 0x0002 -WaitForSomething2 0x00000004 -.short 0x0867 -.short 0x0080 diff --git a/data/scripts/gUnk_0800BD70.inc b/data/scripts/gUnk_0800BD70.inc deleted file mode 100644 index b78fa5cf..00000000 --- a/data/scripts/gUnk_0800BD70.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800BD70 -_0807EEF4 0x0000, 0xffe0 -SCRIPT_END diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc index 5b8a2b22..3f21250d 100644 --- a/data/scripts/gUnk_0800BD78.inc +++ b/data/scripts/gUnk_0800BD78.inc @@ -4,10 +4,47 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x00000270 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0270 +.short 0x0000 +@ End of 4 parameters Wait 0x001e -.short 0x085b +TextboxNoOverlap 0x0e0b +_0807EA94 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0088, 0x0228 +Wait 0x000f +_0807E5F8 0x00000004 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +_0807EB44 0x0004 +_0807E930 0x0000 +Wait 0x003c +_0807EB44 0x0006 +_0807E5F8 0x00000004 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BDAC.inc b/data/scripts/gUnk_0800BDAC.inc deleted file mode 100644 index f534b72d..00000000 --- a/data/scripts/gUnk_0800BDAC.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START gUnk_0800BDAC -.short 0x0e0b -.short 0x0459 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0867 -.short 0x0100 -.short 0x0c73 -.short 0x0088 diff --git a/data/scripts/gUnk_0800BDC4.inc b/data/scripts/gUnk_0800BDC4.inc deleted file mode 100644 index 067ea5bb..00000000 --- a/data/scripts/gUnk_0800BDC4.inc +++ /dev/null @@ -1,45 +0,0 @@ -SCRIPT_START gUnk_0800BDC4 -.short 0x0228 -.short 0x0831 -.short 0x000f -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0879 -.short 0x000f -.short 0x0850 -.short 0x0008 -.short 0x0831 -.short 0x00b4 -.short 0x140c -.short 0xbf39 -.short 0x0804 -.short 0x0000 -.short 0x0000 -.short 0x0831 -.short 0x00b4 -.short 0x140c -.short 0xbf39 -.short 0x0804 -.short 0x0003 -.short 0x0000 -.short 0x0861 -.short 0x0004 -.short 0x0850 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0861 -.short 0x0006 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0867 -.short 0x0080 -.short 0x0c77 -.short 0x0000 -.short 0xffe0 -.short 0x0c0b -.short 0x4969 -.short 0x0805 -.short 0xffff diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/gUnk_0800BE1C.inc index 6b2b425d..b69f18e9 100644 --- a/data/scripts/gUnk_0800BE1C.inc +++ b/data/scripts/gUnk_0800BE1C.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BE1C StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitFor_2 Wait 0x00f0 @@ -15,3 +15,33 @@ _0807E930 0x0008 Wait 0x003c Jump 0x0038 .short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0008 +Call 0x0807f349 +StopScript +WaitFor_2 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0006 +Wait 0x003c +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +_0807E5F8 0x00000001 +_0807EB44 0x0004 +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807E930 0x0000 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e0f +_0807EA94 +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00f0 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BE54.inc b/data/scripts/gUnk_0800BE54.inc deleted file mode 100644 index 42dc4998..00000000 --- a/data/scripts/gUnk_0800BE54.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_0800BE54 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e0f -_0807EA94 -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 -SCRIPT_END diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc index 28a6b12a..798e02bd 100644 --- a/data/scripts/gUnk_0800BECC.inc +++ b/data/scripts/gUnk_0800BECC.inc @@ -4,15 +4,27 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x000001b8 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x01b8 +.short 0x0000 +@ End of 4 parameters Wait 0x001e TextboxNoOverlap 0x0e0e _0807EA94 _0807E5F8 0x0000000c WaitForSomething2 0x00000002 -.short 0x0867 -.short 0x0100 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0088, 0x0178 +Wait 0x000f +_0807E5F8 0x0000000c +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00f0 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BF14.inc b/data/scripts/gUnk_0800BF14.inc deleted file mode 100644 index 5b723169..00000000 --- a/data/scripts/gUnk_0800BF14.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800BF14 -_0807EDD4 0x0088, 0x0178 -Wait 0x000f -_0807E5F8 0x0000000c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 -Call sub_08054968 -SCRIPT_END diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/gUnk_0800BF38.inc index e303ed9b..1d1fb1b8 100644 --- a/data/scripts/gUnk_0800BF38.inc +++ b/data/scripts/gUnk_0800BF38.inc @@ -2,5 +2,52 @@ SCRIPT_START gUnk_0800BF38 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0807F348 +Call 0x0807f349 StopScript +WaitFor_2 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0002 +Wait 0x003c +TextboxNoOverlap 0x0e10 +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +Jump 0x0038 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0008 +Call 0x0807f349 +StopScript +WaitFor_2 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0006 +Wait 0x003c +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +_0807E5F8 0x00000001 +_0807EB44 0x0004 +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807E930 0x0000 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e12 +_0807EA94 +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x0168 +_0807EB44 0x0004 +_0807E930 0x0000 +Wait 0x003c +Call 0x08054f65 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +SCRIPT_END diff --git a/data/scripts/gUnk_0800BF4A.inc b/data/scripts/gUnk_0800BF4A.inc deleted file mode 100644 index ddf24f2c..00000000 --- a/data/scripts/gUnk_0800BF4A.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800BF4A -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0002 -Wait 0x003c -TextboxNoOverlap 0x0e10 -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -Jump 0x0038 -.short 0x0000 diff --git a/data/scripts/gUnk_0800BF70.inc b/data/scripts/gUnk_0800BF70.inc deleted file mode 100644 index 408ef7b0..00000000 --- a/data/scripts/gUnk_0800BF70.inc +++ /dev/null @@ -1,23 +0,0 @@ -SCRIPT_START gUnk_0800BF70 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -.byte 0x50 -.byte 0x8 -.byte 0x0 diff --git a/data/scripts/gUnk_0800BFBF.inc b/data/scripts/gUnk_0800BFBF.inc deleted file mode 100644 index a8c6bbcc..00000000 --- a/data/scripts/gUnk_0800BFBF.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800BFBF -.short 0x7900 -.short 0x0408 -.short 0x3100 -.short 0x3c08 -.short 0x5b00 -.short 0x1208 -.short 0x590e -.short 0x2804 -.short 0x020c -.short 0x0000 -.short 0x0b00 -.short 0x650c -.short 0x054f -.short 0x7908 -.short 0x0f08 -.short 0x5000 -.short 0x0808 diff --git a/data/scripts/gUnk_0800BFE1.inc b/data/scripts/gUnk_0800BFE1.inc deleted file mode 100644 index 2d042c6e..00000000 --- a/data/scripts/gUnk_0800BFE1.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800BFE1 -.short 0x3100 diff --git a/data/scripts/gUnk_0800BFE3.inc b/data/scripts/gUnk_0800BFE3.inc deleted file mode 100644 index b017f9dc..00000000 --- a/data/scripts/gUnk_0800BFE3.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_0800BFE3 -.byte 0x8 -.byte 0x68 -.byte 0x1 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x65 -.byte 0x4f -.byte 0x5 -.byte 0x8 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xe0 -.byte 0xff -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc index 5dec75b5..601bb052 100644 --- a/data/scripts/gUnk_0800C004.inc +++ b/data/scripts/gUnk_0800C004.inc @@ -1,3 +1,51 @@ SCRIPT_START gUnk_0800C004 StartScript -.byte 0x61 +_0807EB44 0x0000 +_0807E930 0x0000 +_0807EF80 0x0008 +SetEntityNonPlanarMovement 0x0080 +Call 0x0807f349 +StopScript +WaitForSomething2 0x00000002 +_0807EF80 0x0007 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x01b8 +.short 0x0000 +@ End of 4 parameters +Wait 0x001e +TextboxNoOverlap 0x0e11 +_0807EA94 +_0807E5F8 0x0000001c +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0088, 0x0188 +_0807EDD4 0x00a8, 0x0188 +_0807EDD4 0x00a8, 0x0178 +Wait 0x000f +_0807E5F8 0x0000001c +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807EB44 0x0004 +_0807E930 0x0000 +Wait 0x003c +_0807E5F8 0x0000001c +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C007.inc b/data/scripts/gUnk_0800C007.inc deleted file mode 100644 index 93a41138..00000000 --- a/data/scripts/gUnk_0800C007.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800C007 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x49 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800C024.inc b/data/scripts/gUnk_0800C024.inc deleted file mode 100644 index bd53a68a..00000000 --- a/data/scripts/gUnk_0800C024.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800C024 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x000001b8 -Wait 0x001e -TextboxNoOverlap 0x0e11 -_0807EA94 -_0807E5F8 0x0000001c -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0088, 0x0188 -_0807EDD4 0x00a8, 0x0188 -_0807EDD4 0x00a8, 0x0178 -Wait 0x000f -_0807E5F8 0x0000001c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00b4 -.byte 0xc -.byte 0x14 -.byte 0x39 -.byte 0xbf -.byte 0x4 -.byte 0x8 -.byte 0x1 diff --git a/data/scripts/gUnk_0800C07B.inc b/data/scripts/gUnk_0800C07B.inc deleted file mode 100644 index a4a862a0..00000000 --- a/data/scripts/gUnk_0800C07B.inc +++ /dev/null @@ -1,54 +0,0 @@ -SCRIPT_START gUnk_0800C07B -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xb4 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x39 -.byte 0xbf -.byte 0x4 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1c -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xe0 -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0x69 -.byte 0x49 -.byte 0x5 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/gUnk_0800C0B0.inc index 15a249fa..c76513b8 100644 --- a/data/scripts/gUnk_0800C0B0.inc +++ b/data/scripts/gUnk_0800C0B0.inc @@ -2,9 +2,46 @@ SCRIPT_START gUnk_0800C0B0 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitFor_2 -.byte 0x31 -.byte 0x8 -.byte 0xf0 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0002 +Wait 0x003c +TextboxNoOverlap 0x0e13 +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +Jump 0x0038 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0008 +Call 0x0807f349 +StopScript +WaitFor_2 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0006 +Wait 0x003c +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +_0807E5F8 0x00000001 +_0807EB44 0x0004 +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807E930 0x0000 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e15 +_0807EA94 +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00f0 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C0C7.inc b/data/scripts/gUnk_0800C0C7.inc deleted file mode 100644 index e61e836e..00000000 --- a/data/scripts/gUnk_0800C0C7.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800C0C7 -.short 0x5000 -.short 0x0008 -.short 0x6100 -.short 0x0208 -.short 0x3100 -.short 0x3c08 diff --git a/data/scripts/gUnk_0800C0D3.inc b/data/scripts/gUnk_0800C0D3.inc deleted file mode 100644 index 618999db..00000000 --- a/data/scripts/gUnk_0800C0D3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800C0D3 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x13 -.byte 0xe -.byte 0x59 -.byte 0x4 -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x38 -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800C0E8.inc b/data/scripts/gUnk_0800C0E8.inc deleted file mode 100644 index 3a9d782b..00000000 --- a/data/scripts/gUnk_0800C0E8.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800C0E8 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -.byte 0x31 diff --git a/data/scripts/gUnk_0800C113.inc b/data/scripts/gUnk_0800C113.inc deleted file mode 100644 index 84c4b088..00000000 --- a/data/scripts/gUnk_0800C113.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_0800C113 -.short 0x3c08 -.short 0x2800 -.short 0x010c -.short 0x0000 -.short 0x6100 -.short 0x0408 -.short 0x1500 -.short 0xff08 -.short 0x0500 -.short 0xfa08 -.short 0x28ff -.short 0x020c -.short 0x0000 -.short 0x0b00 -.short 0x650c -.short 0x054f -.short 0x5008 -.short 0x0008 -.short 0x7900 -.short 0x0408 -.short 0x3100 -.short 0x3c08 -.short 0x5b00 -.short 0x1508 -.short 0x590e -.short 0x2804 diff --git a/data/scripts/gUnk_0800C147.inc b/data/scripts/gUnk_0800C147.inc deleted file mode 100644 index b0009dae..00000000 --- a/data/scripts/gUnk_0800C147.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800C147 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x65 -.byte 0x4f -.byte 0x5 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf0 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc index 640e28e1..00822a1e 100644 --- a/data/scripts/gUnk_0800C160.inc +++ b/data/scripts/gUnk_0800C160.inc @@ -4,11 +4,16 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x00000128 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0128 +.short 0x0000 +@ End of 4 parameters Wait 0x001e TextboxNoOverlap 0x0e14 _0807EA94 @@ -23,5 +28,5 @@ _0807E5F8 0x0000003c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 -Call sub_08054968 +Call 0x08054969 SCRIPT_END diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/gUnk_0800C1D8.inc index e1cfa5ce..42c3c426 100644 --- a/data/scripts/gUnk_0800C1D8.inc +++ b/data/scripts/gUnk_0800C1D8.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C1D8 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0807F348 +Call 0x0807f349 StopScript WaitFor_2 Wait 0x00f0 @@ -11,4 +11,43 @@ _0807EB44 0x0002 Wait 0x003c TextboxNoOverlap 0x0e16 _0807EA94 -.short 0x0850 +_0807E930 0x0008 +Wait 0x003c +Jump 0x0038 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0008 +Call 0x0807f349 +StopScript +WaitFor_2 +Wait 0x00f0 +_0807E930 0x0000 +_0807EB44 0x0006 +Wait 0x003c +_0807EA94 +_0807E930 0x0008 +Wait 0x003c +_0807E5F8 0x00000001 +_0807EB44 0x0004 +CheckRoomFlag 0x00ff +JumpIfNot 0xfffa +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807E930 0x0000 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x0e18 +_0807EA94 +_0807E5F8 0x00000002 +Call 0x08054f65 +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x0168 +_0807EB44 0x0004 +_0807E930 0x0000 +Wait 0x003c +Call 0x08054f65 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C204.inc b/data/scripts/gUnk_0800C204.inc deleted file mode 100644 index 09738cda..00000000 --- a/data/scripts/gUnk_0800C204.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800C204 -.byte 0x8 -.byte 0x0 -.byte 0x31 diff --git a/data/scripts/gUnk_0800C207.inc b/data/scripts/gUnk_0800C207.inc deleted file mode 100644 index a5784088..00000000 --- a/data/scripts/gUnk_0800C207.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800C207 -.byte 0x8 diff --git a/data/scripts/gUnk_0800C208.inc b/data/scripts/gUnk_0800C208.inc deleted file mode 100644 index 8ee04842..00000000 --- a/data/scripts/gUnk_0800C208.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800C208 -.short 0x003c -.short 0x0803 -.short 0x0038 -.short 0x0000 diff --git a/data/scripts/gUnk_0800C210.inc b/data/scripts/gUnk_0800C210.inc deleted file mode 100644 index 8910ab47..00000000 --- a/data/scripts/gUnk_0800C210.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800C210 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -.byte 0x79 -.byte 0x8 -.byte 0x4 diff --git a/data/scripts/gUnk_0800C263.inc b/data/scripts/gUnk_0800C263.inc deleted file mode 100644 index b240a0a8..00000000 --- a/data/scripts/gUnk_0800C263.inc +++ /dev/null @@ -1,66 +0,0 @@ -SCRIPT_START gUnk_0800C263 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x18 -.byte 0xe -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x65 -.byte 0x4f -.byte 0x5 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x68 -.byte 0x1 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x65 -.byte 0x4f -.byte 0x5 -.byte 0x8 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xe0 -.byte 0xff -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc index 0b5e3f88..a70e1354 100644 --- a/data/scripts/gUnk_0800C2A4.inc +++ b/data/scripts/gUnk_0800C2A4.inc @@ -1,3 +1,51 @@ SCRIPT_START gUnk_0800C2A4 StartScript -.byte 0x61 +_0807EB44 0x0000 +_0807E930 0x0000 +_0807EF80 0x0008 +SetEntityNonPlanarMovement 0x0080 +Call 0x0807f349 +StopScript +WaitForSomething2 0x00000002 +_0807EF80 0x0007 +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0128 +.short 0x0000 +@ End of 4 parameters +Wait 0x001e +TextboxNoOverlap 0x0e17 +_0807EA94 +_0807E5F8 0x0000007c +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0098, 0x00e8 +_0807EDD4 0x00c8, 0x00e8 +_0807EDD4 0x00c8, 0x00d8 +Wait 0x000f +_0807E5F8 0x0000007c +_0807EF80 0x000f +_0807E930 0x0008 +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +Wait 0x00b4 +CallWithArg +.short 0xbf39 +.short 0x0804 +.short 0x0005 +.short 0x0000 +@ End of 4 parameters +_0807EB44 0x0004 +_0807E930 0x0000 +Wait 0x003c +_0807E5F8 0x0000007c +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xffe0 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C2A7.inc b/data/scripts/gUnk_0800C2A7.inc deleted file mode 100644 index af14966b..00000000 --- a/data/scripts/gUnk_0800C2A7.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800C2A7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x49 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0xf9 -.byte 0xf4 -.byte 0x7 -.byte 0x8 diff --git a/data/scripts/gUnk_0800C2CE.inc b/data/scripts/gUnk_0800C2CE.inc deleted file mode 100644 index e3998876..00000000 --- a/data/scripts/gUnk_0800C2CE.inc +++ /dev/null @@ -1,66 +0,0 @@ -SCRIPT_START gUnk_0800C2CE -.short 0x0128 -.short 0x0000 -.short 0x0831 -.short 0x001e -.short 0x085b -.short 0x0e17 -.short 0x0459 -.short 0x0c28 -.short 0x007c -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0867 -.short 0x0100 -.short 0x0c73 -.short 0x0098 -.short 0x00e8 -.short 0x0c73 -.short 0x00c8 -.short 0x00e8 -.short 0x0c73 -.short 0x00c8 -.short 0x00d8 -.short 0x0831 -.short 0x000f -.short 0x0c28 -.short 0x007c -.short 0x0000 -.short 0x0879 -.short 0x000f -.short 0x0850 -.short 0x0008 -.short 0x0831 -.short 0x00b4 -.short 0x140c -.short 0xbf39 -.short 0x0804 -.short 0x0002 -.short 0x0000 -.short 0x0831 -.short 0x00b4 -.short 0x140c -.short 0xbf39 -.short 0x0804 -.short 0x0005 -.short 0x0000 -.short 0x0861 -.short 0x0004 -.short 0x0850 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x007c -.short 0x0000 -.short 0x0867 -.short 0x0080 -.short 0x0c77 -.short 0x0000 -.short 0xffe0 -.short 0x0c0b -.short 0x4969 -.short 0x0805 -.short 0xffff diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc index 1e6ef99c..09f24bd4 100644 --- a/data/scripts/gUnk_0800C350.inc +++ b/data/scripts/gUnk_0800C350.inc @@ -1,15 +1,13 @@ SCRIPT_START gUnk_0800C350 StartScript -CallWithArg sub_0806D658, 0x00000003 +CallWithArg +.short 0xd659 +.short 0x0806 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters SetEntityNonPlanarMovement 0x0200 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa _0807F0C8 0xffff, 0x0000 -_0807EEF4 0xfff8, 0x0000 -_0807EEF4 0x0010, 0x0000 -_0807EEF4 0xfff0, 0x0000 -_0807EEF4 0x0010, 0x0000 -_0807EEF4 0xfff8, 0x0000 -_0807F0C8 0x0000, 0x0000 -.short 0x0831 diff --git a/data/scripts/gUnk_0800C370.inc b/data/scripts/gUnk_0800C370.inc new file mode 100644 index 00000000..fd5fa9a1 --- /dev/null +++ b/data/scripts/gUnk_0800C370.inc @@ -0,0 +1,13 @@ +SCRIPT_START gUnk_0800C370 +_0807EEF4 0xfff8, 0x0000 +_0807EEF4 0x0010, 0x0000 +_0807EEF4 0xfff0, 0x0000 +_0807EEF4 0x0010, 0x0000 +_0807EEF4 0xfff8, 0x0000 +_0807F0C8 0x0000, 0x0000 +Wait 0x001e +TextboxNoOverlap 0x1d00 +_0807EA94 +_0807E5F8 0x00000006 +WaitForSomething2 0x00000001 +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800C396.inc b/data/scripts/gUnk_0800C396.inc deleted file mode 100644 index 7dec0c3d..00000000 --- a/data/scripts/gUnk_0800C396.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_0800C396 -.short 0x001e -.short 0x085b -.short 0x1d00 -.short 0x0459 -.short 0x0c28 -.short 0x0006 -.short 0x0000 -.short 0x0c33 -.short 0x0001 -.short 0x0000 -.short 0x0c8a -.short 0xffff -.short 0x0000 -.short 0x0867 -.short 0x0080 -.short 0x0c77 -.short 0x0000 -.short 0xff30 -.short 0x0c8a -.short 0x0000 -.short 0x0000 -.short 0x0831 -.short 0x00b4 -.short 0x0c0b -.short 0x4969 -.short 0x0805 -.short 0xffff diff --git a/data/scripts/gUnk_0800C3B0.inc b/data/scripts/gUnk_0800C3B0.inc new file mode 100644 index 00000000..1f3baa88 --- /dev/null +++ b/data/scripts/gUnk_0800C3B0.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800C3B0 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xff30 +_0807F0C8 0x0000, 0x0000 +Wait 0x00b4 +Call 0x08054969 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc index d87deb67..eed6a726 100644 --- a/data/scripts/gUnk_0800C3CC.inc +++ b/data/scripts/gUnk_0800C3CC.inc @@ -1,13 +1,24 @@ SCRIPT_START gUnk_0800C3CC StartScript -Call sub_0806D660 +Call 0x0806d661 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000002 -CallWithArg sub_0807F4F8, 0x00000048 -Call sub_0806D66C +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0048 +.short 0x0000 +@ End of 4 parameters +Call 0x0806d66d Wait 0x000f -CallWithArg sub_0807F4F8, 0x00000068 -Call sub_0806D67C -.short 0x0c8a -.short 0x001e +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0068 +.short 0x0000 +@ End of 4 parameters +Call 0x0806d67d +_0807F0C8 0x001e, 0x0000 +SoundReq 0x010b +SCRIPT_END diff --git a/data/scripts/gUnk_0800C408.inc b/data/scripts/gUnk_0800C408.inc deleted file mode 100644 index 137a4b9a..00000000 --- a/data/scripts/gUnk_0800C408.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800C408 -.short 0x0000 -.short 0x087b -.short 0x010b -.short 0xffff diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc index f3ddc136..765f1946 100644 --- a/data/scripts/gUnk_0800C410.inc +++ b/data/scripts/gUnk_0800C410.inc @@ -1,14 +1,24 @@ SCRIPT_START gUnk_0800C410 StartScript -Call sub_0806D660 +Call 0x0806d661 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000004 -CallWithArg sub_0807F4F8, 0x00000048 -Call sub_0806D66C +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0048 +.short 0x0000 +@ End of 4 parameters +Call 0x0806d66d Wait 0x000f -CallWithArg sub_0807F4F8, 0x00000068 -Call sub_0806D67C +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x0068 +.short 0x0000 +@ End of 4 parameters +Call 0x0806d67d _0807F0C8 0x001e, 0x0000 SoundReq 0x010b _0807E5F8 0x00000001 diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/gUnk_0800C45C.inc index 64c371f7..c8521d8a 100644 --- a/data/scripts/gUnk_0800C45C.inc +++ b/data/scripts/gUnk_0800C45C.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C45C StartScript SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 -Call sub_080A0B28 +Call 0x080a0b29 StopScript Wait 0x000a _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800C4D0.inc b/data/scripts/gUnk_0800C4D0.inc index 8e8f296b..e7a1fff9 100644 --- a/data/scripts/gUnk_0800C4D0.inc +++ b/data/scripts/gUnk_0800C4D0.inc @@ -2,4 +2,16 @@ SCRIPT_START gUnk_0800C4D0 StartScript SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 -.byte 0x2 +StopScript +Wait 0x000a +_0807EF80 0x0007 +SoundReq 0x0136 +_0807EEF4 0x00c0, 0x0000 +Wait 0x001e +_0807EEF4 0x0070, 0x0000 +Wait 0x003c +SetRoomFlag 0x00ff +_0807E930 0x0005 +Wait 0x000f +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800C4DB.inc b/data/scripts/gUnk_0800C4DB.inc deleted file mode 100644 index da705f95..00000000 --- a/data/scripts/gUnk_0800C4DB.inc +++ /dev/null @@ -1,50 +0,0 @@ -SCRIPT_START gUnk_0800C4DB -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x36 -.byte 0x1 -.byte 0x77 -.byte 0xc -.byte 0xc0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x70 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x2f -.byte 0x8 -.byte 0xff -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800C50C.inc b/data/scripts/gUnk_0800C50C.inc index 5ca23758..74c33a3a 100644 --- a/data/scripts/gUnk_0800C50C.inc +++ b/data/scripts/gUnk_0800C50C.inc @@ -4,8 +4,15 @@ SetEntityNonPlanarMovement 0x0100 _0807E930 0x0004 _0807EF80 0x0008 StopScript -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 +WaitForSomething2 0x00000001 +Wait 0x000a +_0807EF80 0x0007 +SoundReq 0x0136 +_0807EEF4 0x0000, 0x0060 +Wait 0x003c +_0807EEF4 0x0000, 0x0060 +Wait 0x001e +SetRoomFlag 0x00ff +_0807E930 0x0005 +Wait 0x000f +SCRIPT_END diff --git a/data/scripts/gUnk_0800C521.inc b/data/scripts/gUnk_0800C521.inc deleted file mode 100644 index 2f6c09a3..00000000 --- a/data/scripts/gUnk_0800C521.inc +++ /dev/null @@ -1,48 +0,0 @@ -SCRIPT_START gUnk_0800C521 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x36 -.byte 0x1 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x60 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x60 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x2f -.byte 0x8 -.byte 0xff -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/gUnk_0800C550.inc index 7a0f8f86..ccbc8d09 100644 --- a/data/scripts/gUnk_0800C550.inc +++ b/data/scripts/gUnk_0800C550.inc @@ -1,4 +1,253 @@ SCRIPT_START gUnk_0800C550 StartScript -.short 0x0c0b -.short 0x0091 +Call 0x08060091 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x08060159 +StopScript +Jump 0xffee +StopScript +_0807E864 +Call 0x08060209 +_0807EA94 +_0807E878 +Jump 0xffdc +StartScript +Call 0x08060091 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x08060159 +StopScript +Jump 0xffee +StopScript +_0807E864 +CheckInventory1 0x0067 +JumpIfNot 0x000c +Call 0x08060209 +Jump 0x0006 +TextboxNoOverlap 0x4710 +_0807EA94 +_0807E878 +Jump 0xffcc +StartScript +Call 0x08060091 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x08060159 +StopScript +Jump 0xffee +StopScript +_0807E864 +Call 0x08060271 +_0807EA94 +_0807E878 +Jump 0xffdc +StartScript +Call 0x08060091 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x08060159 +StopScript +Jump 0xffee +StopScript +_0807E864 +Call 0x0806021d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffd8 +StartScript +_0807EF80 0x000a +SetEntityNonPlanarMovement 0x0080 +_0807EB44 0x0004 +CheckLocalFlag 0x0082 +JumpIfNot 0x0008 +SetEntityPosition 0x0010, 0x0000 +StopScript +_0807E944 +_0807E864 +Call 0x0807df29 +CheckLocalFlag 0x0082 +JumpIf 0x0022 +CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 +JumpIfNot 0x0006 +_0807EF80 0x000b +StartPlayerScript 0x0800c8c8 +WaitForSomething2 0x00000001 +_0807EF80 0x000a +CheckInventory1 0x0040 +JumpIf 0x00a6 +CheckInventory1 0x005b +JumpIf 0x0024 +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f16 +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +SetLocalFlag 0x0080 +Call 0x0807df51 +_0807E878 +Jump 0xff9e +CheckLocalFlag 0x0081 +JumpIf 0x0020 +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f1b +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +Call 0x0807df51 +_0807E878 +Jump 0xff78 +CheckLocalFlag 0x0082 +JumpIf 0x0030 +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f17 +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +_0807EB44 0x0002 +_0807EF80 0x0001 +_0807EC94 0x0020 +_0807EB44 0x0004 +Wait 0x000f +SoundReq 0x0072 +SetLocalFlag 0x0082 +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f18 +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +Call 0x0807df51 +_0807E878 +Jump 0xff24 +CheckLocalFlag 0x0083 +JumpIf 0x0020 +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f19 +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +Call 0x0807df51 +_0807E878 +Jump 0xfefe +_0807EF80 0x0002 +TextboxNoOverlapFollow 0x1f1a +_0807EA94 +_0807EF80 0x0015 +Wait 0x000a +Call 0x0807df51 +_0807E878 +Jump 0xfee0 +StartScript +_0807EF80 0x000a +_0807EB44 0x0004 +StopScript +_0807E944 +_0807E864 +Call 0x0807df29 +StartPlayerScript 0x0800c8f0 +WaitForSomething2 0x00000001 +CheckInventory1 0x0040 +JumpIf 0x0088 +CheckInventory1 0x005b +JumpIf 0x001c +_0807E930 0x0008 +TextboxNoOverlapFollow 0x2122 +_0807EA94 +_0807EF80 0x0000 +Call 0x0807df51 +_0807E878 +Jump 0xffc2 +_0807E930 0x0008 +CheckLocalFlag 0x0081 +JumpIf 0x0040 +TextboxNoOverlapFollow 0x1130 +_0807EA94 +_0807EB28 0x1131 +_0807EA94 +_0807EB8C +TextboxNoOverlapFollow 0x1132 +_0807EA94 +_0807E914 0x00000103 +Call 0x0807f421 +TextboxNoOverlapFollow 0x1133 +_0807EA94 +Wait 0x000a +_0807EF80 0x0000 +SetLocalFlag 0x0081 +Call 0x0807df51 +_0807E878 +Jump 0xff78 +TextboxNoOverlapFollow 0x1133 +_0807EA94 +Wait 0x000a +_0807E930 0x0000 +Call 0x0807df51 +_0807E878 +Jump 0xff5e +_0807E930 0x0008 +CheckLocalFlag 0x0083 +JumpIf 0x0080 +TextboxNoOverlapFollow 0x1135 +_0807EA94 +SetEntityNonPlanarMovement 0x0040 +_0807EDD4 0x0038, 0x0044 +_0807EF80 0x0000 +Wait 0x000f +SetLocalFlag 0x0083 +Wait 0x003c +SoundReq 0x0072 +Wait 0x003c +_0807EB74 +_0807EB8C +TextboxNoOverlapFollow 0x1136 +_0807EA94 +_0807EB28 0x1137 +_0807EA94 +Wait 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +Call 0x0807df51 +_0807E878 +_0807E944 +_0807E864 +Call 0x0807df29 +_0807EB74 +_0807E914 0x00000008 +Call 0x0807f3d9 +TextboxNoOverlapFollow 0x1136 +_0807EA94 +Wait 0x000a +_0807EF80 0x0000 +Call 0x0807df51 +_0807E878 +Jump 0xffd0 +TextboxNoOverlapFollow 0x1136 +_0807EA94 +Wait 0x000a +_0807EF80 0x0000 +Call 0x0807df51 +_0807E878 +Jump 0xfeba +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x00e8, 0x0068 +_0807EB44 0x0000 +Wait 0x000f +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800C556.inc b/data/scripts/gUnk_0800C556.inc deleted file mode 100644 index 5a8ed43c..00000000 --- a/data/scripts/gUnk_0800C556.inc +++ /dev/null @@ -1,23 +0,0 @@ -SCRIPT_START gUnk_0800C556 -_0807E078 0x0879 -.short 0x000a -.short 0x0402 -.short 0x0401 -.short 0x0418 -.short 0x0804 -.short 0x000e -.short 0x0c0b -.short 0x0159 -.short 0x0806 -.short 0x0402 -.short 0x0803 -.short 0xffee -.short 0x0402 -.short 0x0443 -.short 0x0c0b -.short 0x0209 -.short 0x0806 -.short 0x0459 -.short 0x0444 -.short 0x0803 -.short 0xffdc diff --git a/data/scripts/gUnk_0800C584.inc b/data/scripts/gUnk_0800C584.inc deleted file mode 100644 index 59348d00..00000000 --- a/data/scripts/gUnk_0800C584.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800C584 -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -.short 0x0804 -.short 0x000e diff --git a/data/scripts/gUnk_0800C59A.inc b/data/scripts/gUnk_0800C59A.inc deleted file mode 100644 index a49738d8..00000000 --- a/data/scripts/gUnk_0800C59A.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800C59A -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -CheckInventory1 0x0067 -JumpIfNot 0x000c -Call sub_08060208 -Jump 0x0006 -TextboxNoOverlap 0x4710 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffcc diff --git a/data/scripts/gUnk_0800C5C8.inc b/data/scripts/gUnk_0800C5C8.inc deleted file mode 100644 index a6b4ea0b..00000000 --- a/data/scripts/gUnk_0800C5C8.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800C5C8 -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08060270 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffdc diff --git a/data/scripts/gUnk_0800C5FC.inc b/data/scripts/gUnk_0800C5FC.inc deleted file mode 100644 index 5b7a5d0c..00000000 --- a/data/scripts/gUnk_0800C5FC.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800C5FC -StartScript -.short 0x0c0b diff --git a/data/scripts/gUnk_0800C600.inc b/data/scripts/gUnk_0800C600.inc deleted file mode 100644 index bb7b571a..00000000 --- a/data/scripts/gUnk_0800C600.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800C600 -.byte 0x91 -.byte 0x0 -.byte 0x6 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xa diff --git a/data/scripts/gUnk_0800C607.inc b/data/scripts/gUnk_0800C607.inc deleted file mode 100644 index 4fb7cc8b..00000000 --- a/data/scripts/gUnk_0800C607.inc +++ /dev/null @@ -1,46 +0,0 @@ -SCRIPT_START gUnk_0800C607 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x4 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0x1 -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xee -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x1d -.byte 0x2 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd8 -.byte 0xff diff --git a/data/scripts/gUnk_0800C634.inc b/data/scripts/gUnk_0800C634.inc deleted file mode 100644 index e338ca4d..00000000 --- a/data/scripts/gUnk_0800C634.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_0800C634 -StartScript -_0807EF80 0x000a -SetEntityNonPlanarMovement 0x0080 -_0807EB44 0x0004 -CheckLocalFlag 0x0082 -JumpIfNot 0x0008 -SetEntityPosition 0x0010, 0x0000 -StopScript -_0807E944 -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x0082 -JumpIf 0x0022 -CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 -JumpIfNot 0x0006 -_0807EF80 0x000b -StartPlayerScript 0x0800c8c8 -WaitForSomething2 0x00000001 -_0807EF80 0x000a -CheckInventory1 0x0040 -JumpIf 0x00a6 -CheckInventory1 0x005b -JumpIf 0x0024 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f16 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -SetLocalFlag 0x0080 -Call sub_0807DF50 -_0807E878 -Jump 0xff9e -CheckLocalFlag 0x0081 -JumpIf 0x0020 -_0807EF80 0x0002 -.short 0x085a -.short 0x1f1b diff --git a/data/scripts/gUnk_0800C6C6.inc b/data/scripts/gUnk_0800C6C6.inc deleted file mode 100644 index ac56f554..00000000 --- a/data/scripts/gUnk_0800C6C6.inc +++ /dev/null @@ -1,48 +0,0 @@ -SCRIPT_START gUnk_0800C6C6 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xff78 -CheckLocalFlag 0x0082 -JumpIf 0x0030 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f17 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EC94 0x0020 -_0807EB44 0x0004 -Wait 0x000f -SoundReq 0x0072 -SetLocalFlag 0x0082 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f18 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xff24 -CheckLocalFlag 0x0083 -JumpIf 0x0020 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f19 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xfefe -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f1a -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -.short 0x0803 -.short 0xfee0 diff --git a/data/scripts/gUnk_0800C774.inc b/data/scripts/gUnk_0800C774.inc deleted file mode 100644 index d22d801d..00000000 --- a/data/scripts/gUnk_0800C774.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800C774 -StartScript -.byte 0x79 -.byte 0x8 -.byte 0xa diff --git a/data/scripts/gUnk_0800C779.inc b/data/scripts/gUnk_0800C779.inc deleted file mode 100644 index b1a24810..00000000 --- a/data/scripts/gUnk_0800C779.inc +++ /dev/null @@ -1,144 +0,0 @@ -SCRIPT_START gUnk_0800C779 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x51 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x47 -.byte 0xc -.byte 0xf0 -.byte 0xc8 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xf -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x88 -.byte 0x0 -.byte 0xf -.byte 0x8 -.byte 0x5b -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x1c -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x22 -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xc2 -.byte 0xff -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x12 -.byte 0x8 -.byte 0x81 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x30 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x5f -.byte 0x8 -.byte 0x31 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x32 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x4e -.byte 0xc -.byte 0x3 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x21 -.byte 0xf4 -.byte 0x7 -.byte 0x8 -.byte 0x5a -.byte 0x8 -.byte 0x33 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0x81 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 diff --git a/data/scripts/gUnk_0800C808.inc b/data/scripts/gUnk_0800C808.inc deleted file mode 100644 index 4e4b50ab..00000000 --- a/data/scripts/gUnk_0800C808.inc +++ /dev/null @@ -1,90 +0,0 @@ -SCRIPT_START gUnk_0800C808 -.byte 0x78 -.byte 0xff -.byte 0x5a -.byte 0x8 -.byte 0x33 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x5e -.byte 0xff -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x12 -.byte 0x8 -.byte 0x83 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x80 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x35 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x38 -.byte 0x0 -.byte 0x44 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0x83 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x72 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x36 -.byte 0x11 -.byte 0x59 diff --git a/data/scripts/gUnk_0800C861.inc b/data/scripts/gUnk_0800C861.inc deleted file mode 100644 index ee142128..00000000 --- a/data/scripts/gUnk_0800C861.inc +++ /dev/null @@ -1,80 +0,0 @@ -SCRIPT_START gUnk_0800C861 -.byte 0x4 -.byte 0x5f -.byte 0x8 -.byte 0x37 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x51 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0x4e -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x5a -.byte 0x8 -.byte 0x36 -.byte 0x11 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd0 -.byte 0xff -.byte 0x5a -.byte 0x8 diff --git a/data/scripts/gUnk_0800C8B0.inc b/data/scripts/gUnk_0800C8B0.inc deleted file mode 100644 index bfde9edf..00000000 --- a/data/scripts/gUnk_0800C8B0.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800C8B0 -.short 0x1136 -.short 0x0459 -.short 0x0831 -.short 0x000a -.short 0x0879 -.short 0x0000 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0803 -.short 0xfeba -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0c73 -.short 0x00e8 -.short 0x0068 -.short 0x0861 -.short 0x0000 diff --git a/data/scripts/gUnk_0800C8DA.inc b/data/scripts/gUnk_0800C8DA.inc deleted file mode 100644 index c8c32cdf..00000000 --- a/data/scripts/gUnk_0800C8DA.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800C8DA -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/gUnk_0800C8F0.inc index fb281a40..2627062e 100644 --- a/data/scripts/gUnk_0800C8F0.inc +++ b/data/scripts/gUnk_0800C8F0.inc @@ -8,5 +8,5 @@ _0807EB44 0x0000 Wait 0x000f _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/gUnk_0800C91C.inc index 34b1e63d..d4379853 100644 --- a/data/scripts/gUnk_0800C91C.inc +++ b/data/scripts/gUnk_0800C91C.inc @@ -4,4 +4,78 @@ _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0300 StopScript CheckPlayerInRegion 0x0208, 0x0360, 0x2040 -.byte 0x5 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x0800ca8c +WaitForSomething2 0x00000002 +Wait 0x003c +_0807EB28 0x1125 +_0807EA94 +_0807E5F8 0x00000800 +_0807E8E4_3 +Wait 0x003c +_0807E5F8 0x00000200 +_0807E8E4_0 +Wait 0x001e +_0807E5F8 0x00002000 +_0807E8E4_1 +Wait 0x0014 +_0807E5F8 0x00020000 +_0807E8E4_1 +Wait 0x000a +_0807E5F8 0x00008000 +_0807E8E4_3 +Wait 0x001e +WaitForSomething2 0x00000400 +WaitForSomething2 0x00001000 +WaitForSomething2 0x00004000 +WaitForSomething2 0x00010000 +WaitForSomething2 0x00040000 +_0807E8E4_0 +Wait 0x003c +_0807E5F8 0x00000200 +WaitForSomething2 0x00000400 +_0807E8E4_0 +TextboxNoOverlapFollow 0x1126 +Call 0x0807f40d +_0807EA94 +_0807E5F8 0x00000200 +_0807E5F8 0x00000800 +_0807E5F8 0x00002000 +_0807E5F8 0x00008000 +_0807E5F8 0x00020000 +WaitForSomething2 0x00000400 +WaitForSomething2 0x00001000 +WaitForSomething2 0x00004000 +WaitForSomething2 0x00010000 +WaitForSomething2 0x00040000 +_0807E5F8 0x00008000 +WaitForSomething2 0x00010000 +_0807E8E4_3 +TextboxNoOverlapFollow 0x1127 +_0807EA94 +_0807E5F8 0x00002000 +WaitForSomething2 0x00004000 +_0807E8E4_1 +TextboxNoOverlapFollow 0x1128 +_0807EA94 +_0807E5F8 0x00000200 +_0807E5F8 0x00000800 +_0807E5F8 0x00002000 +_0807E5F8 0x00008000 +_0807E5F8 0x00020000 +WaitForSomething2 0x00000400 +WaitForSomething2 0x00001000 +WaitForSomething2 0x00004000 +WaitForSomething2 0x00010000 +WaitForSomething2 0x00040000 +_0807E8E4_0 +_0807EB28 0x1129 +_0807EA94 +SetLocalFlag 0x008d +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800C931.inc b/data/scripts/gUnk_0800C931.inc deleted file mode 100644 index 3c9d52b4..00000000 --- a/data/scripts/gUnk_0800C931.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800C931 -.short 0xf608 -.short 0x43ff -.short 0x0b04 -.short 0xa50c -.short 0x07f9 -.short 0x0b08 -.short 0x290c -.short 0x07df -.short 0x4708 -.short 0x8c0c -.short 0x00ca -.short 0x3308 -.short 0x020c -.short 0x0000 -.short 0x3100 -.short 0x3c08 -.short 0x5f00 -.short 0x2508 -.short 0x5911 -.short 0x2804 -.short 0x000c -.short 0x0008 -.short 0x4c00 -.short 0x3104 -.short 0x3c08 diff --git a/data/scripts/gUnk_0800C963.inc b/data/scripts/gUnk_0800C963.inc deleted file mode 100644 index 50750035..00000000 --- a/data/scripts/gUnk_0800C963.inc +++ /dev/null @@ -1,166 +0,0 @@ -SCRIPT_START gUnk_0800C963 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x4a -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x4a -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x4c -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x26 -.byte 0x11 -.byte 0xb -.byte 0xc -.byte 0xd -.byte 0xf4 -.byte 0x7 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CA08.inc b/data/scripts/gUnk_0800CA08.inc deleted file mode 100644 index f49ccebe..00000000 --- a/data/scripts/gUnk_0800CA08.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800CA08 -WaitForSomething2 0x00040000 -_0807E5F8 0x00008000 -WaitForSomething2 0x00010000 -_0807E8E4_3 -TextboxNoOverlapFollow 0x1127 -_0807EA94 -_0807E5F8 0x00002000 -WaitForSomething2 0x00004000 -_0807E8E4_1 -TextboxNoOverlapFollow 0x1128 -_0807EA94 -_0807E5F8 0x00000200 -_0807E5F8 0x00000800 -_0807E5F8 0x00002000 -_0807E5F8 0x00008000 -_0807E5F8 0x00020000 -WaitForSomething2 0x00000400 -WaitForSomething2 0x00001000 -WaitForSomething2 0x00004000 -WaitForSomething2 0x00010000 -WaitForSomething2 0x00040000 -_0807E8E4_0 -_0807EB28 0x1129 -_0807EA94 -SetLocalFlag 0x008d -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/gUnk_0800CA8C.inc index 30ecb797..70295047 100644 --- a/data/scripts/gUnk_0800CA8C.inc +++ b/data/scripts/gUnk_0800CA8C.inc @@ -6,4 +6,8 @@ _0807EF80 0x0001 _0807EDD4 0x0208, 0x0358 SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x0208, 0x0340 -.short 0x0879 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CAAA.inc b/data/scripts/gUnk_0800CAAA.inc deleted file mode 100644 index 7e8e4cff..00000000 --- a/data/scripts/gUnk_0800CAAA.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800CAAA -.short 0x0000 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/gUnk_0800CABC.inc index 7827c502..168b926f 100644 --- a/data/scripts/gUnk_0800CABC.inc +++ b/data/scripts/gUnk_0800CABC.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00000200 _0807EF80 0x0007 @@ -15,6 +15,20 @@ _0807E5F8 0x00000400 WaitForSomething2 0x00000200 SoundReq 0x007c _0807EF3C 0x0180, 0x0030 -.byte 0x7b -.byte 0x8 -.byte 0x7c +SoundReq 0x007c +_0807EF3C 0x0180, 0x0030 +_0807E5F8 0x00000400 +WaitForSomething2 0x00000200 +SetEntityNonPlanarMovement 0x0200 +_0807EF80 0x000f +_0807EDD4 0x0208, 0x0328 +_0807EF80 0x0000 +_0807E5F8 0x00000400 +WaitForSomething2 0x00000200 +SetEntityNonPlanarMovement 0x0300 +_0807EF80 0x000f +_0807EDD4 0x0208, 0x02b0 +_0807E5F8 0x00000400 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CB07.inc b/data/scripts/gUnk_0800CB07.inc deleted file mode 100644 index 2c35bb6d..00000000 --- a/data/scripts/gUnk_0800CB07.inc +++ /dev/null @@ -1,78 +0,0 @@ -SCRIPT_START gUnk_0800CB07 -.byte 0x0 -.byte 0x78 -.byte 0xc -.byte 0x80 -.byte 0x1 -.byte 0x30 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x8 -.byte 0x2 -.byte 0x28 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x8 -.byte 0x2 -.byte 0xb0 -.byte 0x2 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/gUnk_0800CB54.inc index 08bcac45..284146b8 100644 --- a/data/scripts/gUnk_0800CB54.inc +++ b/data/scripts/gUnk_0800CB54.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00000800 _0807EF80 0x0007 @@ -17,4 +17,14 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00000800 SetEntityNonPlanarMovement 0x0200 _0807EF80 0x000f -.byte 0x73 +_0807EDD4 0x01f8, 0x0348 +_0807EF80 0x0000 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +SetEntityNonPlanarMovement 0x0300 +_0807EF80 0x000f +_0807EDD4 0x0178, 0x0328 +_0807E5F8 0x00001000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CBA3.inc b/data/scripts/gUnk_0800CBA3.inc deleted file mode 100644 index 2fc60cdf..00000000 --- a/data/scripts/gUnk_0800CBA3.inc +++ /dev/null @@ -1,50 +0,0 @@ -SCRIPT_START gUnk_0800CBA3 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x48 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x78 -.byte 0x1 -.byte 0x28 -.byte 0x3 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/gUnk_0800CBD4.inc index fa24f49b..d1f62aa0 100644 --- a/data/scripts/gUnk_0800CBD4.inc +++ b/data/scripts/gUnk_0800CBD4.inc @@ -4,11 +4,31 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00002000 _0807EF80 0x0007 _0807EDD4 0x0258, 0x0330 _0807EB44 0x0006 _0807EF80 0x0000 -.short 0x0c28 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +SetEntityNonPlanarMovement 0x0200 +_0807EF80 0x000f +_0807EDD4 0x0218, 0x0340 +_0807EF80 0x0000 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +SoundReq 0x007c +_0807EF3C 0x0180, 0x0030 +SoundReq 0x007c +_0807EF3C 0x0180, 0x0030 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +SetEntityNonPlanarMovement 0x0300 +_0807EF80 0x000f +_0807EDD4 0x0288, 0x02d8 +_0807E5F8 0x00004000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CC08.inc b/data/scripts/gUnk_0800CC08.inc deleted file mode 100644 index 773e3acd..00000000 --- a/data/scripts/gUnk_0800CC08.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800CC08 -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 diff --git a/data/scripts/gUnk_0800CC0D.inc b/data/scripts/gUnk_0800CC0D.inc deleted file mode 100644 index 5e4e8ef3..00000000 --- a/data/scripts/gUnk_0800CC0D.inc +++ /dev/null @@ -1,54 +0,0 @@ -SCRIPT_START gUnk_0800CC0D -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x18 -.byte 0x2 -.byte 0x40 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x7c -.byte 0x0 -.byte 0x78 -.byte 0xc -.byte 0x80 -.byte 0x1 -.byte 0x30 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x7c -.byte 0x0 -.byte 0x78 -.byte 0xc -.byte 0x80 -.byte 0x1 diff --git a/data/scripts/gUnk_0800CC42.inc b/data/scripts/gUnk_0800CC42.inc deleted file mode 100644 index 21feeeaf..00000000 --- a/data/scripts/gUnk_0800CC42.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800CC42 -.short 0x0030 -.short 0x0c28 -.short 0x4000 -.short 0x0000 -.short 0x0c33 -.short 0x2000 -.short 0x0000 -.short 0x0867 -.short 0x0300 -.short 0x0879 -.short 0x000f -.short 0x0c73 -.short 0x0288 -.short 0x02d8 -.short 0x0c28 -.short 0x4000 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/gUnk_0800CC6C.inc index c734ddcd..23266276 100644 --- a/data/scripts/gUnk_0800CC6C.inc +++ b/data/scripts/gUnk_0800CC6C.inc @@ -4,7 +4,7 @@ _0807EF80 0x0008 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00008000 _0807EF80 0x0007 @@ -20,4 +20,15 @@ _0807EF80 0x0000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 SoundReq 0x007c -.byte 0x78 +_0807EF3C 0x0180, 0x0030 +SoundReq 0x007c +_0807EF3C 0x0180, 0x0030 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +SetEntityNonPlanarMovement 0x0300 +_0807EF80 0x000f +_0807EDD4 0x0188, 0x02d8 +_0807E5F8 0x00010000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CCCD.inc b/data/scripts/gUnk_0800CCCD.inc deleted file mode 100644 index 8c9f8152..00000000 --- a/data/scripts/gUnk_0800CCCD.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800CCCD -.short 0x800c -.short 0x3001 -.short 0x7b00 -.short 0x7c08 -.short 0x7800 -.short 0x800c -.short 0x3001 -.short 0x2800 diff --git a/data/scripts/gUnk_0800CCDD.inc b/data/scripts/gUnk_0800CCDD.inc deleted file mode 100644 index 67703de9..00000000 --- a/data/scripts/gUnk_0800CCDD.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800CCDD -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x88 -.byte 0x1 -.byte 0xd8 -.byte 0x2 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/gUnk_0800CD04.inc index 32d7371d..a911d324 100644 --- a/data/scripts/gUnk_0800CD04.inc +++ b/data/scripts/gUnk_0800CD04.inc @@ -1,3 +1,28 @@ SCRIPT_START gUnk_0800CD04 StartScript -.short 0x0879 +_0807EF80 0x0000 +_0807EF80 0x0008 +SetEntityNonPlanarMovement 0x0100 +_0807EF80 0x000f +Call 0x0807f339 +StopScript +WaitForSomething2 0x00020000 +_0807EF80 0x0007 +_0807EDD4 0x0268, 0x0338 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +SetEntityNonPlanarMovement 0x0200 +_0807EF80 0x000f +_0807EDD4 0x0218, 0x0350 +_0807EF80 0x0000 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +SetEntityNonPlanarMovement 0x0300 +_0807EF80 0x000f +_0807EDD4 0x02a8, 0x0328 +_0807E5F8 0x00040000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800CD08.inc b/data/scripts/gUnk_0800CD08.inc deleted file mode 100644 index 43438760..00000000 --- a/data/scripts/gUnk_0800CD08.inc +++ /dev/null @@ -1,96 +0,0 @@ -SCRIPT_START gUnk_0800CD08 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x39 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x68 -.byte 0x2 -.byte 0x38 -.byte 0x3 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x79 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x18 -.byte 0x2 -.byte 0x50 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x3 -.byte 0x79 -.byte 0x8 -.byte 0xf diff --git a/data/scripts/gUnk_0800CD67.inc b/data/scripts/gUnk_0800CD67.inc deleted file mode 100644 index 5ca8eadd..00000000 --- a/data/scripts/gUnk_0800CD67.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800CD67 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xa8 -.byte 0x2 -.byte 0x28 -.byte 0x3 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc index 3ce3b7ed..3c4413b3 100644 --- a/data/scripts/gUnk_0800CD7C.inc +++ b/data/scripts/gUnk_0800CD7C.inc @@ -2,18 +2,18 @@ SCRIPT_START gUnk_0800CD7C StartScript CheckInventory1 0x005b JumpIfNot 0xf87a -Call sub_08060090 +Call 0x08060091 _0807EF80 0x000a StopScript StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call sub_08060158 +Call 0x08060159 Jump 0xffee StopScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 CheckLocalFlag 0x009d JumpIf 0x000e SetLocalFlag 0x009d @@ -37,4 +37,254 @@ TextboxNoOverlap 0x214b _0807EA94 _0807E3E8 JumpIfNot 0x013c -.byte 0x7b +SoundReq 0x00cd +_0807F088 0x0023 +WaitPlayerAction8 +Jump 0x0020 +_0807E48C 0x0022 +JumpIfNot 0x0126 +TextboxNoOverlap 0x214b +_0807EA94 +_0807E3E8 +JumpIfNot 0x011a +SoundReq 0x00cd +_0807F088 0x0022 +WaitPlayerAction8 +_0807EB8C +SetGlobalFlag 0x0054 +Call 0x08060341 +TextboxNoOverlap 0x213f +Jump 0x00be +CheckGlobalFlag 0x003c +JumpIf 0x005a +CheckGlobalFlag 0x0054 +JumpIfNot 0x001a +CheckRoomFlag 0x0000 +JumpIfNot 0x00ce +SetGlobalFlag 0x003c +ClearGlobalFlag 0x0054 +TextboxNoOverlap 0x2145 +Jump 0x00d4 +TextboxNoOverlap 0x2142 +_0807EA94 +_0807E48C 0x0027 +JumpIfNot 0x00c6 +TextboxNoOverlap 0x214c +_0807EA94 +_0807E3E8 +JumpIfNot 0x00ba +SoundReq 0x00cd +_0807F088 0x0027 +WaitPlayerAction8 +_0807EB8C +SetGlobalFlag 0x0054 +Call 0x08060341 +TextboxNoOverlap 0x2143 +Jump 0x005e +CheckGlobalFlag 0x003d +JumpIf 0x0090 +CheckGlobalFlag 0x0054 +JumpIfNot 0x001a +CheckRoomFlag 0x0000 +JumpIfNot 0x006e +SetGlobalFlag 0x003d +ClearGlobalFlag 0x0054 +TextboxNoOverlap 0x2149 +Jump 0x0074 +TextboxNoOverlap 0x2146 +_0807EA94 +_0807E48C 0x0024 +JumpIfNot 0x0066 +TextboxNoOverlap 0x214d +_0807EA94 +_0807E3E8 +JumpIfNot 0x005a +SoundReq 0x00cd +_0807F088 0x0024 +WaitPlayerAction8 +_0807EB8C +SetGlobalFlag 0x0054 +Call 0x08060341 +TextboxNoOverlap 0x2147 +_0807EA94 +Call 0x0807df51 +_0807E878 +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000c +Call 0x08060159 +Jump 0xffee +StopScript +_0807E864 +Call 0x0807df29 +TextboxNoOverlap 0x2140 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xffd2 +TextboxNoOverlap 0x214a +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xfe46 +.short 0x0000 +StartScript +Call 0x08068105 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x0806811d +StopScript +Jump 0xffee +StopScript +_0807E864 +Call 0x08068191 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffd8 +StartScript +Call 0x08068105 +_0807EF80 0x000a +StopScript +_0807E944 +_0807E864 +Call 0x08068191 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffec +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0000 +StopScript +CheckInventory1 0x0041 +JumpIf 0x000e +CheckLocalFlag 0x007e +JumpIfNot 0x0006 +_0807E930 0x0008 +CheckInventory1 0x0002 +JumpIf 0x0022 +CheckInventory1 0x0041 +JumpIfNot 0x000c +_0807E5F8 0x00000020 +Jump 0x0010 +CheckLocalFlag 0x007e +JumpIfNot 0x0008 +_0807E5F8 0x00000010 +StopScript +StartScript +Call 0x08068911 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +Call 0x0807df29 +CheckInventory1 0x0002 +JumpIfNot 0x0018 +_0807EB74 +_0807E914 0x00000000 +Call 0x0806c029 +TextboxNoOverlap 0x1219 +Jump 0x014c +CheckInventory1 0x0041 +JumpIfNot 0x0060 +StartPlayerScript 0x0800d190 +WaitForSomething2 0x00000008 +_0807EB74 +_0807E914 0x00000000 +Call 0x0806c029 +TextboxNoOverlapFollowPos +.short 0x125c +.short 0x0002 +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800d1b4 +WaitForSomething2 0x00000008 +_0807EB44 0x0002 +_0807E914 0x00000000 +Call 0x0806c029 +Wait 0x000f +_0807E5F8 0x00000020 +StartPlayerScript 0x0800d1e0 +WaitForSomething2 0x00000008 +TextboxNoOverlapFollowPos +.short 0x125d +.short 0x0002 +@ End of 2 parameters +Jump 0x00e6 +CheckLocalFlag 0x007e +JumpIfNot 0x000a +TextboxNoOverlapFollow 0x123e +Jump 0x00d6 +StartPlayerScript 0x0800d190 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000004 +_0807EB74 +_0807E914 0x00000000 +Call 0x0806c029 +TextboxNoOverlapFollowPos +.short 0x123d +.short 0x0002 +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800d1b4 +WaitForSomething2 0x00000008 +_0807EB44 0x0002 +_0807E914 0x00000000 +Call 0x0806c029 +SoundReq 0x00cd +Call 0x08068965 +ComparePlayerAction 0x0008 +JumpIf 0xfffa +SoundReq 0x00f8 +_0807E5F8 0x00000010 +SetLocalFlag 0x007e +TextboxNoOverlapFollowPos +.short 0x123e +.short 0x0002 +@ End of 2 parameters +_0807EA94 +Wait 0x000f +_0807E930 0x0009 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Wait 0x001e +TextboxNoOverlapFollowPos +.short 0x123f +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000004 +_0807E930 0x0008 +Wait 0x003c +Call 0x08095165 +_0807EB28 0x1240 +_0807EA94 +Wait 0x000f +_0807E878 +Call 0x0807df51 +Jump 0xfe6e +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x0170, 0x0140 +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800CE07.inc b/data/scripts/gUnk_0800CE07.inc deleted file mode 100644 index 6f712e3f..00000000 --- a/data/scripts/gUnk_0800CE07.inc +++ /dev/null @@ -1,254 +0,0 @@ -SCRIPT_START gUnk_0800CE07 -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x86 -.byte 0x8 -.byte 0x23 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x1f -.byte 0x8 -.byte 0x22 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x26 -.byte 0x1 -.byte 0x5b -.byte 0x8 -.byte 0x4b -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x1a -.byte 0x1 -.byte 0x7b -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x86 -.byte 0x8 -.byte 0x22 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x2d -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x41 -.byte 0x3 -.byte 0x6 -.byte 0x8 -.byte 0x5b -.byte 0x8 -.byte 0x3f -.byte 0x21 -.byte 0x3 -.byte 0x8 -.byte 0xbe -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x5a -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x1a -.byte 0x0 -.byte 0x15 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xce -.byte 0x0 -.byte 0x2d -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x2e -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x45 -.byte 0x21 -.byte 0x3 -.byte 0x8 -.byte 0xd4 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x42 -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x1f -.byte 0x8 -.byte 0x27 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xc6 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x4c -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xba -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x86 -.byte 0x8 -.byte 0x27 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x2d -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x41 -.byte 0x3 -.byte 0x6 -.byte 0x8 -.byte 0x5b -.byte 0x8 -.byte 0x43 -.byte 0x21 -.byte 0x3 -.byte 0x8 -.byte 0x5e -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x3d -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x90 -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x1a -.byte 0x0 -.byte 0x15 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x6e -.byte 0x0 -.byte 0x2d -.byte 0x8 -.byte 0x3d -.byte 0x0 -.byte 0x2e -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x49 -.byte 0x21 -.byte 0x3 -.byte 0x8 -.byte 0x74 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x46 -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x1f -.byte 0x8 -.byte 0x24 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x66 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x4d -.byte 0x21 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x5a -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x86 -.byte 0x8 -.byte 0x24 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x2d -.byte 0x8 -.byte 0x54 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x41 -.byte 0x3 -.byte 0x6 -.byte 0x8 -.byte 0x5b -.byte 0x8 -.byte 0x47 -.byte 0x21 -.byte 0x59 -.byte 0x4 diff --git a/data/scripts/gUnk_0800CF04.inc b/data/scripts/gUnk_0800CF04.inc deleted file mode 100644 index 6ba23d4d..00000000 --- a/data/scripts/gUnk_0800CF04.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800CF04 -Call sub_0807DF50 -_0807E878 -StopScript -StartScript -CheckEntityInteractType -.short 0x0804 -.short 0x000c diff --git a/data/scripts/gUnk_0800CF16.inc b/data/scripts/gUnk_0800CF16.inc deleted file mode 100644 index febff378..00000000 --- a/data/scripts/gUnk_0800CF16.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_0800CF16 -Call sub_08060158 -Jump 0xffee -StopScript -_0807E864 -Call sub_0807DF28 -TextboxNoOverlap 0x2140 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffd2 -TextboxNoOverlap 0x214a -_0807EA94 -Call sub_0807DF50 -_0807E878 -.byte 0x3 diff --git a/data/scripts/gUnk_0800CF4B.inc b/data/scripts/gUnk_0800CF4B.inc deleted file mode 100644 index 89e503ec..00000000 --- a/data/scripts/gUnk_0800CF4B.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800CF4B -.byte 0x8 -.byte 0x46 -.byte 0xfe -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800CF50.inc b/data/scripts/gUnk_0800CF50.inc deleted file mode 100644 index 9de29634..00000000 --- a/data/scripts/gUnk_0800CF50.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800CF50 -StartScript -Call sub_08068104 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806811C -StopScript -Jump 0xffee -StopScript -_0807E864 -.byte 0xb -.byte 0xc -.byte 0x91 -.byte 0x81 -.byte 0x6 diff --git a/data/scripts/gUnk_0800CF7B.inc b/data/scripts/gUnk_0800CF7B.inc deleted file mode 100644 index f6e35584..00000000 --- a/data/scripts/gUnk_0800CF7B.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800CF7B -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd8 -.byte 0xff diff --git a/data/scripts/gUnk_0800CF88.inc b/data/scripts/gUnk_0800CF88.inc deleted file mode 100644 index ac27b808..00000000 --- a/data/scripts/gUnk_0800CF88.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800CF88 -StartScript -Call sub_08068104 -_0807EF80 0x000a -.byte 0x2 diff --git a/data/scripts/gUnk_0800CF95.inc b/data/scripts/gUnk_0800CF95.inc deleted file mode 100644 index e7f6e643..00000000 --- a/data/scripts/gUnk_0800CF95.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800CF95 -.short 0x5104 -.short 0x4304 -.short 0x0b04 -.short 0x910c -.short 0x0681 -.short 0x5908 -.short 0x3104 -.short 0x0f08 -.short 0x4400 -.short 0x0304 diff --git a/data/scripts/gUnk_0800CFA9.inc b/data/scripts/gUnk_0800CFA9.inc deleted file mode 100644 index 42d52b94..00000000 --- a/data/scripts/gUnk_0800CFA9.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800CFA9 -.byte 0x8 -.byte 0xec -.byte 0xff diff --git a/data/scripts/gUnk_0800CFAC.inc b/data/scripts/gUnk_0800CFAC.inc deleted file mode 100644 index dc738500..00000000 --- a/data/scripts/gUnk_0800CFAC.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_0800CFAC -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -CheckInventory1 0x0041 -JumpIf 0x000e -CheckLocalFlag 0x007e -JumpIfNot 0x0006 -_0807E930 0x0008 -CheckInventory1 0x0002 -JumpIf 0x0022 -CheckInventory1 0x0041 -JumpIfNot 0x000c -_0807E5F8 0x00000020 -Jump 0x0010 -CheckLocalFlag 0x007e -JumpIfNot 0x0008 -_0807E5F8 0x00000010 -StopScript -StartScript -Call sub_08068910 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -.byte 0xb -.byte 0xc -.byte 0x29 diff --git a/data/scripts/gUnk_0800D011.inc b/data/scripts/gUnk_0800D011.inc deleted file mode 100644 index ab7c8952..00000000 --- a/data/scripts/gUnk_0800D011.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800D011 -.short 0x07df -.short 0x0f08 -.short 0x0208 -.short 0x0500 -.short 0x1808 -.short 0x6300 -.short 0x4e04 -.short 0x000c -.short 0x0000 -.short 0x0b00 -.short 0x290c -.short 0x06c0 -.short 0x5b08 -.short 0x1908 -.short 0x0312 -.short 0x4c08 -.short 0x0f01 -.short 0x4108 -.short 0x0500 -.short 0x6008 -.short 0x4700 -.short 0x900c -.short 0x00d1 -.short 0x3308 -.short 0x080c -.short 0x0000 -.short 0x6300 -.short 0x4e04 -.short 0x000c -.short 0x0000 -.short 0x0b00 -.short 0x290c -.short 0x06c0 -.short 0x5c08 -.short 0x5c0c -.short 0x0212 -.short 0x5900 -.short 0x4704 -.short 0xb40c diff --git a/data/scripts/gUnk_0800D05F.inc b/data/scripts/gUnk_0800D05F.inc deleted file mode 100644 index 06b48077..00000000 --- a/data/scripts/gUnk_0800D05F.inc +++ /dev/null @@ -1,112 +0,0 @@ -SCRIPT_START gUnk_0800D05F -.byte 0xd1 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xc0 -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0xe0 -.byte 0xd1 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x5d -.byte 0x12 -.byte 0x2 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xe6 -.byte 0x0 -.byte 0x12 -.byte 0x8 -.byte 0x7e -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x3e -.byte 0x12 -.byte 0x3 -.byte 0x8 -.byte 0xd6 -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0x90 -.byte 0xd1 -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x63 -.byte 0x4 diff --git a/data/scripts/gUnk_0800D0CE.inc b/data/scripts/gUnk_0800D0CE.inc deleted file mode 100644 index 8b55a70d..00000000 --- a/data/scripts/gUnk_0800D0CE.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_0800D0CE -_0807E914 0x00000000 -Call sub_0806C028 -TextboxNoOverlapFollowPos 0x123d, 0x0002 -_0807EA94 -StartPlayerScript 0x0800d1b4 -WaitForSomething2 0x00000008 -_0807EB44 0x0002 -_0807E914 0x00000000 -Call sub_0806C028 -SoundReq 0x00cd -Call sub_08068964 -ComparePlayerAction 0x0008 -JumpIf 0xfffa -SoundReq 0x00f8 -_0807E5F8 0x00000010 -SetLocalFlag 0x007e -TextboxNoOverlapFollowPos 0x123e, 0x0002 -_0807EA94 -.byte 0x31 diff --git a/data/scripts/gUnk_0800D127.inc b/data/scripts/gUnk_0800D127.inc deleted file mode 100644 index 8d62eaff..00000000 --- a/data/scripts/gUnk_0800D127.inc +++ /dev/null @@ -1,106 +0,0 @@ -SCRIPT_START gUnk_0800D127 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x9 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x3f -.byte 0x12 -.byte 0x2 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x65 -.byte 0x51 -.byte 0x9 -.byte 0x8 -.byte 0x5f -.byte 0x8 -.byte 0x40 -.byte 0x12 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0x6e -.byte 0xfe -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/gUnk_0800D190.inc deleted file mode 100644 index e03152f1..00000000 --- a/data/scripts/gUnk_0800D190.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800D190 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0170, 0x0140 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/gUnk_0800D1B4.inc index 0393b5dc..1f1d73e9 100644 --- a/data/scripts/gUnk_0800D1B4.inc +++ b/data/scripts/gUnk_0800D1B4.inc @@ -3,4 +3,10 @@ StartScript SetEntityNonPlanarMovement 0x0100 StopScript _0807EDD4 0x0170, 0x0120 -.short 0x0c73 +_0807EDD4 0x01a8, 0x0120 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D1C4.inc b/data/scripts/gUnk_0800D1C4.inc deleted file mode 100644 index da71414e..00000000 --- a/data/scripts/gUnk_0800D1C4.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800D1C4 -.short 0x01a8 -.short 0x0120 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0008 diff --git a/data/scripts/gUnk_0800D1D4.inc b/data/scripts/gUnk_0800D1D4.inc deleted file mode 100644 index 66cf3692..00000000 --- a/data/scripts/gUnk_0800D1D4.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800D1D4 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc index 58cc2e6e..7a917f09 100644 --- a/data/scripts/gUnk_0800D1E0.inc +++ b/data/scripts/gUnk_0800D1E0.inc @@ -1,9 +1,21 @@ SCRIPT_START gUnk_0800D1E0 _0807F078 0x0002, 0x0001 -CallWithArg sub_0807F918, 0x00000002 +CallWithArg +.short 0xf919 +.short 0x0807 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters SoundReq 0x0109 -CallWithArg sub_0807F238, 0x000001e2 -Call sub_0807F304 -.byte 0x5b -.byte 0x8 -.byte 0x2 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x01e2 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f305 +TextboxNoOverlap 0x0502 +_0807EA94 +_0807E5F8 0x00000008 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800D207.inc b/data/scripts/gUnk_0800D207.inc deleted file mode 100644 index 73150653..00000000 --- a/data/scripts/gUnk_0800D207.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800D207 -.byte 0x5 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800D218.inc b/data/scripts/gUnk_0800D218.inc index 7f9f590d..2f19e4b4 100644 --- a/data/scripts/gUnk_0800D218.inc +++ b/data/scripts/gUnk_0800D218.inc @@ -10,12 +10,3 @@ WaitForSomething2 0x00000010 _0807EF80 0x0007 WaitForSomething2 0x00000010 SCRIPT_END -.short 0x0879 -.short 0x0007 -.short 0x0850 -.short 0x0003 -.short 0xffff -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800D242.inc b/data/scripts/gUnk_0800D242.inc new file mode 100644 index 00000000..52710175 --- /dev/null +++ b/data/scripts/gUnk_0800D242.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_0800D242 +_0807EF80 0x0007 +_0807E930 0x0003 +SCRIPT_END diff --git a/data/scripts/gUnk_0800D24C.inc b/data/scripts/gUnk_0800D24C.inc new file mode 100644 index 00000000..a1c01651 --- /dev/null +++ b/data/scripts/gUnk_0800D24C.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_0800D24C +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/gUnk_0800D278.inc index ce4ee7d9..82667aba 100644 --- a/data/scripts/gUnk_0800D278.inc +++ b/data/scripts/gUnk_0800D278.inc @@ -12,17 +12,100 @@ TestBit 0x00000001 JumpIf 0x002a CheckEntityInteractType JumpIf 0x000e -Call sub_0806811C +Call 0x0806811d StopScript Jump 0xffd4 StopScript _0807E864 -Call sub_08068190 +Call 0x08068191 _0807EA94 Wait 0x000f _0807E878 Jump 0xffbe StopScript -.short 0x0c28 -.short 0x0004 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807E5F8 0x00000004 +_0807E930 0x000c +WaitForSomething2 0x00000001 +_0807E5F8 0x00000004 +_0807E930 0x000b +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x08068191 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +StartScript +Call 0x08068885 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0000 +StopScript +StopScript +StartScript +Call 0x08068911 +CheckEntityInteractType +JumpIfNot 0xfff2 +StopScript +_0807E864 +_0807EB74 +_0807E914 0x00000000 +Call 0x0806c029 +TextboxNoOverlapFollow 0x1219 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffd0 +StartScript +Call 0x08068105 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000e +Call 0x0806811d +StopScript +Jump 0xffee +StopScript +_0807E864 +Call 0x08068191 +_0807EA94 +Wait 0x000f +CheckLocalFlag 0x007f +JumpIf 0x005c +CheckLocalFlag 0x007e +JumpIfNot 0x0054 +_0807EF80 0x000b +SetEntityNonPlanarMovement 0x0100 +CheckPlayerInRegion 0x0090, 0x0130, 0x0810 +JumpIfNot 0x000e +StartPlayerScript 0x0800d3ec +WaitForSomething2 0x00000001 +_0807EB44 0x0002 +_0807E930 0x0005 +_0807EDD4 0x00a0, 0x0130 +_0807EB44 0x0006 +_0807E930 0x0003 +_0807E914 0x00000004 +Call 0x080681d9 +SoundReq 0x00cd +Wait 0x001e +_0807EF80 0x000a +SetLocalFlag 0x007f +_0807E878 +Jump 0xff76 +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807EF80 0x000d +_0807ECC4 0x0020 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D2CE.inc b/data/scripts/gUnk_0800D2CE.inc deleted file mode 100644 index 69012311..00000000 --- a/data/scripts/gUnk_0800D2CE.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800D2CE -WaitForSomething2 0x00000002 -_0807E5F8 0x00000004 -_0807E930 0x000c -WaitForSomething2 0x00000001 -_0807E5F8 0x00000004 -_0807E930 0x000b -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -_0807E878 -.short 0x0803 diff --git a/data/scripts/gUnk_0800D306.inc b/data/scripts/gUnk_0800D306.inc deleted file mode 100644 index cb728fbb..00000000 --- a/data/scripts/gUnk_0800D306.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800D306 -.short 0xffe8 diff --git a/data/scripts/gUnk_0800D308.inc b/data/scripts/gUnk_0800D308.inc deleted file mode 100644 index ef86c3ed..00000000 --- a/data/scripts/gUnk_0800D308.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800D308 -StartScript -.byte 0xb -.byte 0xc -.byte 0x85 -.byte 0x88 -.byte 0x6 diff --git a/data/scripts/gUnk_0800D30F.inc b/data/scripts/gUnk_0800D30F.inc deleted file mode 100644 index 6a8a29a2..00000000 --- a/data/scripts/gUnk_0800D30F.inc +++ /dev/null @@ -1,66 +0,0 @@ -SCRIPT_START gUnk_0800D30F -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x2 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x89 -.byte 0x6 -.byte 0x8 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xf2 -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xc0 -.byte 0x6 -.byte 0x8 -.byte 0x5a -.byte 0x8 -.byte 0x19 -.byte 0x12 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd0 -.byte 0xff diff --git a/data/scripts/gUnk_0800D350.inc b/data/scripts/gUnk_0800D350.inc deleted file mode 100644 index e651a656..00000000 --- a/data/scripts/gUnk_0800D350.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800D350 -StartScript -Call sub_08068104 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806811C -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -CheckLocalFlag 0x007f -JumpIf 0x005c -CheckLocalFlag 0x007e -JumpIfNot 0x0054 -_0807EF80 0x000b -SetEntityNonPlanarMovement 0x0100 -CheckPlayerInRegion 0x0090, 0x0130, 0x0810 -JumpIfNot 0x000e -StartPlayerScript 0x0800d3ec -WaitForSomething2 0x00000001 -_0807EB44 0x0002 -_0807E930 0x0005 -_0807EDD4 0x00a0, 0x0130 -_0807EB44 0x0006 -_0807E930 0x0003 -_0807E914 0x00000004 -Call sub_080681D8 -SoundReq 0x00cd -Wait 0x001e -_0807EF80 0x000a -SetLocalFlag 0x007f -_0807E878 -Jump 0xff76 -.short 0x0000 diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc index 4ed59eb9..9bf015eb 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/gUnk_0800D414.inc @@ -1,14 +1,170 @@ SCRIPT_START gUnk_0800D414 StartScript SetEntityNonPlanarMovement 0x0100 -Call sub_08068104 +Call 0x08068105 _0807EF80 0x000a StopScript _0807EB44 0x0002 _0807E914 0x00000000 -Call sub_0806AF60 +Call 0x0806af61 Wait 0x0014 _0807EB44 0x0004 _0807E914 0x00000000 -Call sub_0806AF60 -.short 0x0831 +Call 0x0806af61 +Wait 0x0014 +_0807EB44 0x0006 +_0807E914 0x00000000 +Call 0x0806af61 +Wait 0x0014 +_0807EB44 0x0006 +_0807E914 0x00000004 +Call 0x0806af61 +_0807EDD4 0x00a8, 0x01e8 +_0807EB44 0x0006 +_0807E914 0x00000000 +Call 0x0806af61 +Wait 0x0014 +_0807EB44 0x0004 +_0807E914 0x00000000 +Call 0x0806af61 +Wait 0x0014 +_0807EB44 0x0002 +_0807E914 0x00000000 +Call 0x0806af61 +Wait 0x0014 +_0807EB44 0x0002 +_0807E914 0x00000004 +Call 0x0806af61 +_0807EDD4 0x0228, 0x01e8 +Jump 0xff5a +.short 0x0000 +StartScript +_0807EF80 0x000a +Call 0x08062a49 +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +Call 0x08062699 +Call 0x080626ad +CallWithArg +.short 0xf0ed +.short 0x0807 +.short 0x0009 +.short 0x0000 +@ End of 4 parameters +_0807E078 +.short 0x0012 +.short 0x001a +.short 0x0022 +.short 0x002a +.short 0x0032 +.short 0x003a +.short 0x0042 +.short 0x004a +.short 0x0052 +@ End of 9 parameters +_0807EE04 0x0038, 0x0068 +Jump 0x004e +_0807EE04 0x0078, 0x0068 +Jump 0x0044 +_0807EE04 0x00b8, 0x0068 +Jump 0x003a +_0807EE04 0x0038, 0x0090 +Jump 0x0030 +_0807EE04 0x0078, 0x0090 +Jump 0x0026 +_0807EE04 0x00b8, 0x0090 +Jump 0x001c +_0807EE04 0x0038, 0x00b8 +Jump 0x0012 +_0807EE04 0x0078, 0x00b8 +Jump 0x0008 +_0807EE04 0x00b8, 0x00b8 +StopScript +StartScript +Call 0x080626c1 +JumpIf 0xff72 +CheckEntityInteractType +JumpIf 0x000c +_0807EE30 +JumpIfNot 0xffe8 +Jump 0xff62 +StopScript +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xff4a +StartScript +_0807EF80 0x000a +Call 0x08062a49 +_0807EF80 0x0000 +StopScript +Call 0x08062699 +Call 0x080626ad +CallWithArg +.short 0xf0ed +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807E078 +.short 0x0008 +.short 0x0010 +.short 0x0018 +.short 0x0020 +@ End of 4 parameters +_0807EE04 0x0038, 0x0098 +Jump 0x001c +_0807EE04 0x0058, 0x0098 +Jump 0x0012 +_0807EE04 0x0038, 0x00c8 +Jump 0x0008 +_0807EE04 0x0058, 0x00c8 +StopScript +StartScript +Call 0x080626c1 +JumpIf 0xffae +_0807EE30 +JumpIfNot 0xffee +Jump 0xffa4 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x000b +_0807EF80 0x0008 +Call 0x0806daad +JumpIf 0x008c +Call 0x0806dad1 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +StopScript +_0807EA4C +_0807E9F0 +Call 0x0806daad +JumpIf 0x000e +Call 0x0807df51 +_0807E878 +Jump 0xffe8 +_0807E864 +Call 0x0807df29 +Call 0x0807fbc5 +Call 0x0807fba1 +SetEntityNonPlanarMovement 0x0700 +_0807F0B4 0x0007 +CameraTargetEntity +_0807EDD4 0x01e8, 0x01b8 +Wait 0x003c +Call 0x0806dae9 +Wait 0x0078 +Call 0x0806db45 +JumpIfNot 0x000e +LoadRoomEntityList 0x080dd730 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800D44C.inc b/data/scripts/gUnk_0800D44C.inc deleted file mode 100644 index 884704fb..00000000 --- a/data/scripts/gUnk_0800D44C.inc +++ /dev/null @@ -1,116 +0,0 @@ -SCRIPT_START gUnk_0800D44C -.byte 0x14 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0xa8 -.byte 0x0 -.byte 0xe8 -.byte 0x1 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x4e -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb diff --git a/data/scripts/gUnk_0800D4BF.inc b/data/scripts/gUnk_0800D4BF.inc deleted file mode 100644 index bf2d12ce..00000000 --- a/data/scripts/gUnk_0800D4BF.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800D4BF -.byte 0xc -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x73 -.byte 0xc -.byte 0x28 -.byte 0x2 -.byte 0xe8 -.byte 0x1 -.byte 0x3 -.byte 0x8 -.byte 0x5a -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x49 -.byte 0x2a -.byte 0x6 -.byte 0x8 diff --git a/data/scripts/gUnk_0800D4DC.inc b/data/scripts/gUnk_0800D4DC.inc deleted file mode 100644 index 3bf260fd..00000000 --- a/data/scripts/gUnk_0800D4DC.inc +++ /dev/null @@ -1,87 +0,0 @@ -SCRIPT_START gUnk_0800D4DC -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -Call sub_08062698 -Call sub_080626AC -CallWithArg sub_0807F0EC, 0x00000009 -.short 0x2806 -.short 0x0012 -.short 0x001a -.short 0x0022 -.short 0x002a -.short 0x0032 -.short 0x003a -.short 0x0042 -.short 0x004a -.short 0x0052 -.short 0x0c74 -.short 0x0038 -.short 0x0068 -.short 0x0803 -.short 0x004e -.short 0x0c74 -.short 0x0078 -.short 0x0068 -.short 0x0803 -.short 0x0044 -.short 0x0c74 -.short 0x00b8 -.short 0x0068 -.short 0x0803 -.short 0x003a -.short 0x0c74 -.short 0x0038 -.short 0x0090 -.short 0x0803 -.short 0x0030 -.short 0x0c74 -.short 0x0078 -.short 0x0090 -.short 0x0803 -.short 0x0026 -.short 0x0c74 -.short 0x00b8 -.short 0x0090 -.short 0x0803 -.short 0x001c -.short 0x0c74 -.short 0x0038 -.short 0x00b8 -.short 0x0803 -.short 0x0012 -.short 0x0c74 -.short 0x0078 -.short 0x00b8 -.short 0x0803 -.short 0x0008 -.short 0x0c74 -.short 0x00b8 -.short 0x00b8 -.short 0x0402 -.short 0x0401 -.short 0x0c0b -.short 0x26c1 -.short 0x0806 -.short 0x0804 -.short 0xff72 -.short 0x0418 -.short 0x0804 -.short 0x000c -.short 0x0475 -.short 0x0805 -.short 0xffe8 -.short 0x0803 -.short 0xff62 -.short 0x0402 -.short 0x0443 -.short 0x0463 -.short 0x0c0b -.short 0x265d -.short 0x0806 -.short 0x0459 -.short 0x0831 -.short 0x000f -.short 0x0444 -.short 0x0803 -.short 0xff4a diff --git a/data/scripts/gUnk_0800D59C.inc b/data/scripts/gUnk_0800D59C.inc deleted file mode 100644 index 66251bb0..00000000 --- a/data/scripts/gUnk_0800D59C.inc +++ /dev/null @@ -1,42 +0,0 @@ -SCRIPT_START gUnk_0800D59C -StartScript -_0807EF80 0x000a -Call sub_08062A48 -_0807EF80 0x0000 -StopScript -Call sub_08062698 -Call sub_080626AC -CallWithArg sub_0807F0EC, 0x00000004 -.byte 0x6 -.byte 0x14 -.byte 0x8 -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x18 -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x74 -.byte 0xc -.byte 0x38 -.byte 0x0 -.byte 0x98 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x1c -.byte 0x0 -.byte 0x74 -.byte 0xc -.byte 0x58 -.byte 0x0 -.byte 0x98 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x12 -.byte 0x0 -.byte 0x74 -.byte 0xc -.byte 0x38 diff --git a/data/scripts/gUnk_0800D5E5.inc b/data/scripts/gUnk_0800D5E5.inc deleted file mode 100644 index de9f96a1..00000000 --- a/data/scripts/gUnk_0800D5E5.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800D5E5 -.byte 0x0 -.byte 0xc8 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x74 -.byte 0xc -.byte 0x58 -.byte 0x0 -.byte 0xc8 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xc1 -.byte 0x26 -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x8 -.byte 0xae -.byte 0xff -.byte 0x75 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xee -.byte 0xff -.byte 0x3 -.byte 0x8 -.byte 0xa4 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800D60C.inc b/data/scripts/gUnk_0800D60C.inc deleted file mode 100644 index cd7d6b5d..00000000 --- a/data/scripts/gUnk_0800D60C.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800D60C -StartScript -_0807EB44 0x0004 -_0807EF80 0x000b -_0807EF80 0x0008 -Call sub_0806DAAC -JumpIf 0x008c -Call sub_0806DAD0 -.byte 0xc diff --git a/data/scripts/gUnk_0800D62B.inc b/data/scripts/gUnk_0800D62B.inc deleted file mode 100644 index ec328708..00000000 --- a/data/scripts/gUnk_0800D62B.inc +++ /dev/null @@ -1,138 +0,0 @@ -SCRIPT_START gUnk_0800D62B -.byte 0x14 -.byte 0x5 -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x57 -.byte 0x4 -.byte 0x56 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xad -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe8 -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xc5 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xa1 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x7 -.byte 0x89 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x87 -.byte 0x4 -.byte 0x73 -.byte 0xc -.byte 0xe8 -.byte 0x1 -.byte 0xb8 -.byte 0x1 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xe9 -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0xdb -.byte 0x6 -.byte 0x8 -.byte 0x5 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0xd -.byte 0xc -.byte 0x30 -.byte 0xd7 -.byte 0xd -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x76 -.byte 0x4 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x88 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xcd -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800D698.inc b/data/scripts/gUnk_0800D698.inc new file mode 100644 index 00000000..6413a8a2 --- /dev/null +++ b/data/scripts/gUnk_0800D698.inc @@ -0,0 +1,9 @@ +SCRIPT_START gUnk_0800D698 +_0807EEB4 +_0807F0B4 0x0004 +CameraTargetPlayer +Call 0x0807fbcd +_0807E878 +Call 0x0807df51 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/gUnk_0800D6B4.inc index 8b4de011..c1e96dca 100644 --- a/data/scripts/gUnk_0800D6B4.inc +++ b/data/scripts/gUnk_0800D6B4.inc @@ -1,4 +1,9 @@ SCRIPT_START gUnk_0800D6B4 StartScript -.short 0x0879 -.short 0x0007 +_0807EF80 0x0007 +_0807EF80 0x0011 +Call 0x0807f159 +Call 0x0807f739 +StopScript +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D6BA.inc b/data/scripts/gUnk_0800D6BA.inc deleted file mode 100644 index c92d039e..00000000 --- a/data/scripts/gUnk_0800D6BA.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800D6BA -_0807EF80 0x0011 -Call sub_0807F158 -Call sub_0807F738 -StopScript -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800D6F0.inc b/data/scripts/gUnk_0800D6F0.inc index 0f9916c8..c3a0aa60 100644 --- a/data/scripts/gUnk_0800D6F0.inc +++ b/data/scripts/gUnk_0800D6F0.inc @@ -4,4 +4,8 @@ CheckLocalFlag 0x00f5 JumpIf 0xfff0 _0807EF80 0x0008 StopScript -.short 0x0812 +CheckLocalFlag 0x00f5 +JumpIfNot 0xfffa +_0807EF80 0x0007 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D702.inc b/data/scripts/gUnk_0800D702.inc deleted file mode 100644 index d47e6ab0..00000000 --- a/data/scripts/gUnk_0800D702.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800D702 -.byte 0xf5 diff --git a/data/scripts/gUnk_0800D703.inc b/data/scripts/gUnk_0800D703.inc deleted file mode 100644 index 286f67c3..00000000 --- a/data/scripts/gUnk_0800D703.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800D703 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xfa -.byte 0xff -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/gUnk_0800D710.inc index 1658f0df..1fc7aacd 100644 --- a/data/scripts/gUnk_0800D710.inc +++ b/data/scripts/gUnk_0800D710.inc @@ -1,9 +1,23 @@ SCRIPT_START gUnk_0800D710 StartScript -Call sub_0807F360 +Call 0x0807f361 SetEntityNonPlanarMovement 0x0700 _0807F0B4 0x0007 CameraTargetEntity -.byte 0xb -.byte 0xc -.byte 0xc5 +Call 0x0807fbc5 +StopScript +_0807E5F8 0x00000008 +WaitForSomething2 0x00000010 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E5F8 0x0000000a +WaitForSomething2 0x00000004 +_0807EEB4 +_0807F0B4 0x0004 +CameraTargetPlayer +Call 0x0807fbcd +_0807E878 +Call 0x0807df51 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D725.inc b/data/scripts/gUnk_0800D725.inc deleted file mode 100644 index d1a157cb..00000000 --- a/data/scripts/gUnk_0800D725.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800D725 -.byte 0xfb -.byte 0x7 -.byte 0x8 diff --git a/data/scripts/gUnk_0800D728.inc b/data/scripts/gUnk_0800D728.inc deleted file mode 100644 index 93c3530a..00000000 --- a/data/scripts/gUnk_0800D728.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800D728 -StopScript -_0807E5F8 0x00000008 -WaitForSomething2 0x00000010 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E5F8 0x0000000a -WaitForSomething2 0x00000004 -_0807EEB4 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807FBCC -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc index 06386591..6203909c 100644 --- a/data/scripts/gUnk_0800D76C.inc +++ b/data/scripts/gUnk_0800D76C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800D76C StartScript -Call sub_0807F360 +Call 0x0807f361 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0200 _0807EB44 0x0004 @@ -10,7 +10,12 @@ WaitForSomething2 0x00000008 _0807EF80 0x0004 Wait 0x003c SoundReq 0x0123 -CallWithArg sub_0807F464, 0x000001e0 +CallWithArg +.short 0xf465 +.short 0x0807 +.short 0x01e0 +.short 0x0000 +@ End of 4 parameters _0807EDD4 0x01e0, 0x01d8 _0807EB44 0x0002 _0807EF80 0x0000 @@ -20,4 +25,34 @@ _0807EF3C 0x0180, 0x0030 SoundReq 0x007c _0807EF3C 0x0180, 0x0030 _0807EB44 0x0002 -.byte 0x79 +_0807EF80 0x0001 +WaitForSomething2 0x00000008 +Jump 0x0032 +StartScript +Call 0x0807f361 +_0807EF80 0x000b +SetEntityPositionRelative 0x01d80268 +SetEntityNonPlanarMovement 0x0100 +StopScript +WaitForSomething2 0x00000002 +_0807EDD4 0x01f0, 0x01d8 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0100 +_0807EEF4 0x0000, 0xffe0 +_0807EF80 0x000e +Call 0x0806ca5d +SetEntity0x20 0x00040000 +SoundReq 0x00f5 +CallWithArg +.short 0xf8d1 +.short 0x0807 +.short 0xe000 +.short 0xffff +@ End of 4 parameters +Call 0x0807f8bd +JumpIf 0xffee +_0807E5F8 0x00000004 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D7CF.inc b/data/scripts/gUnk_0800D7CF.inc deleted file mode 100644 index 34cb6e66..00000000 --- a/data/scripts/gUnk_0800D7CF.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800D7CF -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x32 -.byte 0x0 diff --git a/data/scripts/gUnk_0800D7DC.inc b/data/scripts/gUnk_0800D7DC.inc deleted file mode 100644 index a8fec942..00000000 --- a/data/scripts/gUnk_0800D7DC.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START gUnk_0800D7DC -StartScript -Call sub_0807F360 -_0807EF80 0x000b -SetEntityPositionRelative 0x01d80268 -SetEntityNonPlanarMovement 0x0100 -StopScript -WaitForSomething2 0x00000002 -_0807EDD4 0x01f0, 0x01d8 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0xffe0 -_0807EF80 0x000e -Call sub_0806CA5C -SetEntity0x20 0x00040000 -SoundReq 0x00f5 -CallWithArg sub_0807F8D0, 0xffffe000 -Call sub_0807F8BC -JumpIf 0xffee -_0807E5F8 0x00000004 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 -.short 0x0401 -.short 0x0402 -.short 0x0815 -.short 0x0000 -.short 0x0805 -.short 0xfffa -.short 0x0443 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 -.short 0x0831 -.short 0x003c -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800D84C.inc b/data/scripts/gUnk_0800D84C.inc new file mode 100644 index 00000000..8329c8c8 --- /dev/null +++ b/data/scripts/gUnk_0800D84C.inc @@ -0,0 +1,13 @@ +SCRIPT_START gUnk_0800D84C +StartScript +StopScript +CheckRoomFlag 0x0000 +JumpIfNot 0xfffa +_0807E864 +Call 0x0807df29 +Wait 0x003c +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc index 649fe5f5..34038a2a 100644 --- a/data/scripts/gUnk_0800D874.inc +++ b/data/scripts/gUnk_0800D874.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800D874 StartScript -Call sub_0807F934 +Call 0x0807f935 _0807EF80 0x0008 _0807E914 0x00000001 -Call sub_0806DA04 +Call 0x0806da05 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 +Call 0x0807df29 CheckLocalFlag 0x0045 JumpIf 0x000e StartPlayerScript 0x0800d92c @@ -23,7 +23,27 @@ JumpIf 0x0010 LoadRoomEntityList 0x080e3830 CheckLocalFlag 0x0045 JumpIfNot 0xfffa -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffae .short 0x0000 +StartScript +_0807EF80 0x0008 +CheckInventory1 0x0017 +JumpIf 0x0034 +StopScript +CheckInventory1 0x0017 +JumpIfNot 0xfffa +Call 0x0807df29 +_0807E864 +WaitPlayerAction8 +_0807EB28 0x1325 +_0807EA94 +SoundReq 0x0113 +_0807E914 0x00000000 +Call 0x0806da1d +_0807E878 +Call 0x0807df51 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D8E4.inc b/data/scripts/gUnk_0800D8E4.inc deleted file mode 100644 index 2c0e9c91..00000000 --- a/data/scripts/gUnk_0800D8E4.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800D8E4 -StartScript -_0807EF80 0x0008 -CheckInventory1 0x0017 -JumpIf 0x0034 -StopScript -CheckInventory1 0x0017 -JumpIfNot 0xfffa -Call sub_0807DF28 -_0807E864 -WaitPlayerAction8 diff --git a/data/scripts/gUnk_0800D906.inc b/data/scripts/gUnk_0800D906.inc deleted file mode 100644 index ebe410e4..00000000 --- a/data/scripts/gUnk_0800D906.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_0800D906 -_0807EB28 0x1325 -_0807EA94 -SoundReq 0x0113 -_0807E914 0x00000000 -Call sub_0806DA1C -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0080 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x00a0 -.short 0x0078 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/gUnk_0800D92C.inc similarity index 57% rename from data/scripts/gUnk_0800D3EC.inc rename to data/scripts/gUnk_0800D92C.inc index d2d514cb..ceb77657 100644 --- a/data/scripts/gUnk_0800D3EC.inc +++ b/data/scripts/gUnk_0800D92C.inc @@ -1,12 +1,11 @@ -SCRIPT_START gUnk_0800D3EC +SCRIPT_START gUnk_0800D92C StartScript SetEntityNonPlanarMovement 0x0080 StopScript +_0807EF80 0x0001 +_0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 _0807EF80 0x0000 -_0807EF80 0x000d -_0807ECC4 0x0020 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/gUnk_0800D954.inc index 92193d4c..e62ca105 100644 --- a/data/scripts/gUnk_0800D954.inc +++ b/data/scripts/gUnk_0800D954.inc @@ -1,11 +1,41 @@ SCRIPT_START gUnk_0800D954 StartScript _0807EF80 0x0008 -Call sub_0807F180 +Call 0x0807f181 StopScript CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -.byte 0x47 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x0800da00 +WaitForSomething2 0x00000001 +Wait 0x003c +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x0007 +SoundReq 0x01ce +SetEntity0x20 0xffff8000 +TextboxNoOverlap 0x1701 +_0807EA94 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +TextboxNoOverlap 0x1702 +_0807EA94 +SetEntity0x20 0x00010000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807F050 0x006d +WaitPlayerAction8 +_0807EB28 0x1703 +_0807EA94 +Wait 0x003c +SetLocalFlag 0x0032 +SoundReq 0x0113 +_0807E914 0x00000001 +Call 0x0806da1d +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D97D.inc b/data/scripts/gUnk_0800D97D.inc deleted file mode 100644 index 4bab4af2..00000000 --- a/data/scripts/gUnk_0800D97D.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800D97D -.short 0x000c -.short 0x00da diff --git a/data/scripts/gUnk_0800D981.inc b/data/scripts/gUnk_0800D981.inc deleted file mode 100644 index 88ca163b..00000000 --- a/data/scripts/gUnk_0800D981.inc +++ /dev/null @@ -1,73 +0,0 @@ -SCRIPT_START gUnk_0800D981 -.short 0x3308 -.short 0x010c -.short 0x0000 -.short 0x3100 -.short 0x3c08 -.short 0x6100 -.short 0x0408 -.short 0x7900 -.short 0x0008 -.short 0x7900 -.short 0x0708 -.short 0x7b00 -.short 0xce08 -.short 0x6801 -.short 0x000c -.short 0xff80 -.short 0x5bff -.short 0x0108 -.short 0x5917 -.short 0x2804 -.short 0x040c -.short 0x0000 -.short 0x3300 -.short 0x020c -.short 0x0000 -.short 0x5b00 -.short 0x0208 -.short 0x5917 -.short 0x6804 -.short 0x000c -.short 0x0100 -.short 0x2800 -.short 0x040c -.short 0x0000 -.short 0x3300 -.short 0x020c -.short 0x0000 -.short 0x8300 -.short 0x6d08 -.short 0x3400 -.short 0x5f04 -.short 0x0308 -.short 0x5917 -.short 0x3104 -.short 0x3c08 -.short 0x2a00 -.short 0x3208 -.short 0x7b00 -.short 0x1308 -.short 0x4e01 -.short 0x010c -.short 0x0000 -.short 0x0b00 -.short 0x1d0c -.short 0x06da -.short 0x0b08 -.short 0x510c -.short 0x07df -.short 0x4408 -.short 0x7904 -.short 0x0608 -.short 0xff00 -.short 0x00ff -.short 0x0100 -.short 0x6704 -.short 0x8008 -.short 0x0200 -.short 0x7904 -.short 0x0108 -.short 0x7300 -.short 0x180c -.short 0x6001 diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800DA00.inc similarity index 54% rename from data/scripts/gUnk_0800AD54.inc rename to data/scripts/gUnk_0800DA00.inc index 27b91895..d30696df 100644 --- a/data/scripts/gUnk_0800AD54.inc +++ b/data/scripts/gUnk_0800DA00.inc @@ -1,11 +1,11 @@ -SCRIPT_START gUnk_0800AD54 +SCRIPT_START gUnk_0800DA00 StartScript SetEntityNonPlanarMovement 0x0080 StopScript -_0807EC64 0x0020 +_0807EF80 0x0001 +_0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -.short 0x0c0b -.short 0x91bd -.short 0x0807 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800DA11.inc b/data/scripts/gUnk_0800DA11.inc deleted file mode 100644 index cbcd480a..00000000 --- a/data/scripts/gUnk_0800DA11.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800DA11 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800DA28.inc b/data/scripts/gUnk_0800DA28.inc index fa14520a..9ef7f502 100644 --- a/data/scripts/gUnk_0800DA28.inc +++ b/data/scripts/gUnk_0800DA28.inc @@ -7,5 +7,8 @@ WaitForSomething2 0x00000004 _0807EF80 0x0007 Wait 0x003c _0807E5F8 0x00000002 -.short 0x0c33 -.short 0x0004 +WaitForSomething2 0x00000004 +_0807EDD4 0x0118, 0x0060 +_0807E5F8 0x00000002 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800DA4C.inc b/data/scripts/gUnk_0800DA4C.inc deleted file mode 100644 index a9f03fb0..00000000 --- a/data/scripts/gUnk_0800DA4C.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800DA4C -.byte 0x0 diff --git a/data/scripts/gUnk_0800DA4D.inc b/data/scripts/gUnk_0800DA4D.inc deleted file mode 100644 index 90e834cb..00000000 --- a/data/scripts/gUnk_0800DA4D.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_0800DA4D -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x18 -.byte 0x1 -.byte 0x60 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc index 76a96408..4796cf09 100644 --- a/data/scripts/gUnk_0800DA60.inc +++ b/data/scripts/gUnk_0800DA60.inc @@ -4,40 +4,53 @@ StopScript CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 _0807E8E4_0 -Call sub_0807F3F8 +Call 0x0807f3f9 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x00800078 CameraTargetEntity -Call sub_0807F5C0 +Call 0x0807f5c1 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos 0x162d, 0x0002 +TextboxNoOverlapFollowPos +.short 0x162d +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000001 Wait 0x001e -TextboxNoOverlapFollowPos 0x162e, 0x0002 +TextboxNoOverlapFollowPos +.short 0x162e +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807E8E4_0 -CallWithArg sub_0807F75C, 0x00780138 +CallWithArg +.short 0xf75d +.short 0x0807 +.short 0x0138 +.short 0x0078 +@ End of 4 parameters _0807F0B4 0x0004 CameraTargetPlayer -Call sub_0807F5C0 +Call 0x0807f5c1 SetRoomFlag 0x0000 -Call sub_0807F40C +Call 0x0807f40d Wait 0x001e _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x000a _0807E8E4_2 -Call sub_0807F3F8 +Call 0x0807f3f9 Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/gUnk_0800DB18.inc index 9017228d..ed197a40 100644 --- a/data/scripts/gUnk_0800DB18.inc +++ b/data/scripts/gUnk_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800DB18 StartScript _0807EF80 0x000a -Call sub_08066E38 +Call 0x08066e39 StopScript SCRIPT_END diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/gUnk_0800DB28.inc index 74d6ca16..8dbae5d4 100644 --- a/data/scripts/gUnk_0800DB28.inc +++ b/data/scripts/gUnk_0800DB28.inc @@ -7,5 +7,15 @@ StopScript WaitForSomething2 0x00000001 Wait 0x003c _0807EF80 0x0004 -.short 0x0831 -.short 0x003c +Wait 0x003c +_0807EB44 0x0004 +_0807EF80 0x001c +Call 0x0807f2d5 +_0807EF80 0x0000 +Wait 0x003c +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EB44 0x0004 +_0807EF80 0x0014 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800DB4A.inc b/data/scripts/gUnk_0800DB4A.inc deleted file mode 100644 index 1885d12e..00000000 --- a/data/scripts/gUnk_0800DB4A.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800DB4A -_0807EB44 0x0004 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EF80 0x0000 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0004 -_0807EF80 0x0014 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc index 88ffc18a..e3ef98fb 100644 --- a/data/scripts/gUnk_0800DB78.inc +++ b/data/scripts/gUnk_0800DB78.inc @@ -1,5 +1,57 @@ SCRIPT_START gUnk_0800DB78 StartScript StopScript -CallWithArg sub_0807F6B4, 0x000000a0 -.short 0x0804 +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x00a0 +.short 0x0000 +@ End of 4 parameters +JumpIf 0xfff4 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +_0807F0B4 0x0001 +SetEntityPositionRelative 0x00780078 +CameraTargetEntity +Call 0x0807f5c1 +_0807EB28 0x1648 +_0807EA94 +Call 0x0804d7ed +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +Call 0x0807df51 +_0807E878 +CheckRoomFlag 0x0000 +JumpIfNot 0xfffa +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +Call 0x0804d811 +Call 0x0807f3f9 +Wait 0x003c +StartPlayerScript 0x0800ddd0 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807E5F8 0x00000001 +StartPlayerScript 0x0800de00 +WaitForSomething2 0x00000006 +TextboxNoOverlapFollowPos +.short 0x1643 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807EB28 0x1645 +_0807EA94 +Call 0x0807f3f9 +_0807E5F8 0x00000001 +SoundReq0x80100000 +Call 0x08094f99 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800DB88.inc b/data/scripts/gUnk_0800DB88.inc deleted file mode 100644 index 5f084e07..00000000 --- a/data/scripts/gUnk_0800DB88.inc +++ /dev/null @@ -1,69 +0,0 @@ -SCRIPT_START gUnk_0800DB88 -.short 0xfff4 -.short 0x0443 -.short 0x0c0b -.short 0xf9a5 -.short 0x0807 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 -.short 0x0889 -.short 0x0001 -.short 0x0c69 -.short 0x0078 -.short 0x0078 -.short 0x0487 -.short 0x0c0b -.short 0xf5c1 -.short 0x0807 -.short 0x085f -.short 0x1648 -.short 0x0459 -.short 0x0c0b -.short 0xd7ed -.short 0x0804 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0815 -.short 0x0000 -.short 0x0805 -.short 0xfffa -.short 0x0443 -.short 0x0c0b -.short 0xf9a5 -.short 0x0807 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 -.short 0x0c0b -.short 0xd811 -.short 0x0804 -.short 0x0c0b -.short 0xf3f9 -.short 0x0807 -.short 0x0831 -.short 0x003c -.short 0x0c47 -.short 0xddd0 -.short 0x0800 -.short 0x0c33 -.short 0x0004 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c47 diff --git a/data/scripts/gUnk_0800DC10.inc b/data/scripts/gUnk_0800DC10.inc deleted file mode 100644 index 3354f111..00000000 --- a/data/scripts/gUnk_0800DC10.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800DC10 -.byte 0x0 -.byte 0xde -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x6 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800DC19.inc b/data/scripts/gUnk_0800DC19.inc deleted file mode 100644 index 2ce37552..00000000 --- a/data/scripts/gUnk_0800DC19.inc +++ /dev/null @@ -1,61 +0,0 @@ -SCRIPT_START gUnk_0800DC19 -.short 0x5c00 -.short 0x430c -.short 0x0216 -.short 0x5900 -.short 0x5f04 -.short 0x4508 -.short 0x5916 -.short 0x0b04 -.short 0xf90c -.short 0x07f3 -.short 0x2808 -.short 0x010c -.short 0x0000 -.short 0x7e00 -.short 0x0b04 -.short 0x990c -.short 0x094f -.short 0x0c08 -.short 0xed14 -.short 0x05dd -.short 0x0108 -.short 0x0000 -.short 0x8a00 -.short 0xff0c -.short 0x00ff -.short 0x3100 -.short 0x3c08 -.short 0x7c00 -.short 0x3108 -.short 0x4700 -.short 0x500c -.short 0x00de -.short 0x3308 -.short 0x060c -.short 0x0000 -.short 0x5f00 -.short 0x4608 -.short 0x5916 -.short 0x2804 -.short 0x010c -.short 0x0000 -.short 0x4700 -.short 0x2c0c -.short 0x00de -.short 0x8808 -.short 0x3804 -.short 0x0408 -.short 0x4100 -.short 0x000c -.short 0x0000 -.short 0x3700 -.short 0x0c04 -.short 0x1914 -.short 0x05de -.short 0x0108 -.short 0x0000 -.short 0x8a00 -.short 0x000c -.short 0x0000 -.short 0x2a00 diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc new file mode 100644 index 00000000..0bcebd35 --- /dev/null +++ b/data/scripts/gUnk_0800DC4C.inc @@ -0,0 +1,31 @@ +SCRIPT_START gUnk_0800DC4C +Wait 0x003c +SoundReq2 0x0031 +StartPlayerScript 0x0800de50 +WaitForSomething2 0x00000006 +_0807EB28 0x1646 +_0807EA94 +_0807E5F8 0x00000001 +StartPlayerScript 0x0800de2c +CameraTargetPlayer +_0807E778 0x0004 +_0807E80C 0x00000000 +WaitFor_2 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +SetLocalFlag 0x0079 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800DC91.inc b/data/scripts/gUnk_0800DC91.inc deleted file mode 100644 index 71c48c82..00000000 --- a/data/scripts/gUnk_0800DC91.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_0800DC91 -.byte 0x8 -.byte 0x79 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x1d -.byte 0xda -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc index bf543e78..64b1df99 100644 --- a/data/scripts/gUnk_0800DCAC.inc +++ b/data/scripts/gUnk_0800DCAC.inc @@ -1,12 +1,72 @@ SCRIPT_START gUnk_0800DCAC StartScript _0807EF80 0x000a -Call sub_08066E38 +Call 0x08066e39 StopScript WaitForSomething2 0x00000001 -CallWithArg sub_0807F8E8, 0x00000000 +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807E5F8 0x00000002 CheckRoomFlag 0x0000 JumpIfNot 0xfffa -.short 0x0879 -.short 0x0010 +_0807EF80 0x0010 +Wait 0x003c +_0807EF80 0x0010 +SetEntityPositionRelative 0x00680078 +WaitForSomething2 0x00000001 +SoundReq0x80100000 +Call 0x08066e51 +SoundReq 0x01c9 +Call 0x0807f2d5 +SoundReq 0x01ca +Wait 0x003c +_0807EF80 0x0004 +SoundReq2 0x000b +Wait 0x0078 +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +Wait 0x003c +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +SetEntityNonPlanarMovement 0x0100 +_0807EEF4 0x0000, 0x0008 +_0807EB44 0x0004 +_0807EF80 0x0000 +Wait 0x001e +Call 0x08066e81 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807EF80 0x0004 +Wait 0x003c +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +SetEntityNonPlanarMovement 0x0100 +_0807EEF4 0x0000, 0x0080 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800DCDC.inc b/data/scripts/gUnk_0800DCDC.inc deleted file mode 100644 index beb9af3b..00000000 --- a/data/scripts/gUnk_0800DCDC.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800DCDC -Wait 0x003c -_0807EF80 0x0010 -SetEntityPositionRelative 0x00680078 -WaitForSomething2 0x00000001 -SoundReq0x80100000 -Call sub_08066E50 -SoundReq 0x01c9 -Call sub_0807F2D4 -.short 0x087b diff --git a/data/scripts/gUnk_0800DD04.inc b/data/scripts/gUnk_0800DD04.inc deleted file mode 100644 index 1a7f42c1..00000000 --- a/data/scripts/gUnk_0800DD04.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800DD04 -.short 0x01ca -.short 0x0831 -.short 0x003c -.short 0x0879 -.short 0x0004 -.short 0x087c diff --git a/data/scripts/gUnk_0800DD10.inc b/data/scripts/gUnk_0800DD10.inc deleted file mode 100644 index 8612e296..00000000 --- a/data/scripts/gUnk_0800DD10.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800DD10 -.byte 0xb -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 diff --git a/data/scripts/gUnk_0800DD19.inc b/data/scripts/gUnk_0800DD19.inc deleted file mode 100644 index 44db9bce..00000000 --- a/data/scripts/gUnk_0800DD19.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800DD19 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 diff --git a/data/scripts/gUnk_0800DD22.inc b/data/scripts/gUnk_0800DD22.inc deleted file mode 100644 index d42d1020..00000000 --- a/data/scripts/gUnk_0800DD22.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_0800DD22 -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x001e -Call sub_08066E80 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EF80 0x0004 -Wait 0x003c -.byte 0x61 -.byte 0x8 -.byte 0x2 diff --git a/data/scripts/gUnk_0800DD8D.inc b/data/scripts/gUnk_0800DD8D.inc deleted file mode 100644 index 836543b8..00000000 --- a/data/scripts/gUnk_0800DD8D.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800DD8D -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 diff --git a/data/scripts/gUnk_0800DDAA.inc b/data/scripts/gUnk_0800DDAA.inc deleted file mode 100644 index b54cfa42..00000000 --- a/data/scripts/gUnk_0800DDAA.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800DDAA -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0x0080 -SCRIPT_END -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x140c -.short 0xf4f9 -.short 0x0807 -.short 0x00a0 -.short 0x0000 -.short 0x0c73 -.short 0x0078 -.short 0x00a0 diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc new file mode 100644 index 00000000..a87382da --- /dev/null +++ b/data/scripts/gUnk_0800DDD0.inc @@ -0,0 +1,17 @@ +SCRIPT_START gUnk_0800DDD0 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x00a0 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x0078, 0x00a0 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800DDE8.inc b/data/scripts/gUnk_0800DDE8.inc deleted file mode 100644 index f7f3205b..00000000 --- a/data/scripts/gUnk_0800DDE8.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800DDE8 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -.short 0x0c0b -.short 0x91bd -.short 0x0807 diff --git a/data/scripts/gUnk_0800DDFC.inc b/data/scripts/gUnk_0800DDFC.inc deleted file mode 100644 index e06fa928..00000000 --- a/data/scripts/gUnk_0800DDFC.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800DDFC -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/gUnk_0800DE00.inc index 6151a959..0db24874 100644 --- a/data/scripts/gUnk_0800DE00.inc +++ b/data/scripts/gUnk_0800DE00.inc @@ -8,44 +8,6 @@ _0807EF80 0x0000 _0807ECC4 0x0010 _0807EF80 0x000c _0807E5F8 0x00000004 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c77 -.short 0x0000 -.short 0x0080 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0402 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x140c -.short 0xf239 -.short 0x0807 -.short 0x03c5 -.short 0x0000 -.short 0x0c0b -.short 0xf305 -.short 0x0807 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_0800DE2C.inc b/data/scripts/gUnk_0800DE2C.inc new file mode 100644 index 00000000..4fd1716d --- /dev/null +++ b/data/scripts/gUnk_0800DE2C.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_0800DE2C +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EEF4 0x0000, 0x0080 +_0807E5F8 0x00000004 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc new file mode 100644 index 00000000..3d9860e0 --- /dev/null +++ b/data/scripts/gUnk_0800DE50.inc @@ -0,0 +1,14 @@ +SCRIPT_START gUnk_0800DE50 +StopScript +_0807EB44 0x0004 +_0807EF80 0x0000 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x03c5 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f305 +_0807E5F8 0x00000004 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/gUnk_0800DE78.inc index 075549bb..cc5a1b73 100644 --- a/data/scripts/gUnk_0800DE78.inc +++ b/data/scripts/gUnk_0800DE78.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800DE78 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 StartPlayerScript 0x0800deb0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000002 _0807EB28 0x1647 _0807EA94 SetLocalFlag 0x007a -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/gUnk_0800DEB0.inc index 9f9cb7d8..6d86314c 100644 --- a/data/scripts/gUnk_0800DEB0.inc +++ b/data/scripts/gUnk_0800DEB0.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/gUnk_0800DED4.inc index 1524793f..3e1a8115 100644 --- a/data/scripts/gUnk_0800DED4.inc +++ b/data/scripts/gUnk_0800DED4.inc @@ -4,9 +4,18 @@ _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000b -Call sub_08066D04 +Call 0x08066d05 StopScript StartScript -.short 0x0c0b -.short 0x6d15 -.short 0x0806 +Call 0x08066d15 +SetEntityPositionRelative 0x01480198 +_0807EF80 0x0007 +StopScript +_0807EDD4 0x0198, 0x01a8 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call 0x08066d4d +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800DEF6.inc b/data/scripts/gUnk_0800DEF6.inc deleted file mode 100644 index af54a3f7..00000000 --- a/data/scripts/gUnk_0800DEF6.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800DEF6 -SetEntityPositionRelative 0x01480198 -_0807EF80 0x0007 -StopScript -.byte 0x73 -.byte 0xc -.byte 0x98 -.byte 0x1 -.byte 0xa8 diff --git a/data/scripts/gUnk_0800DF07.inc b/data/scripts/gUnk_0800DF07.inc deleted file mode 100644 index c2033e78..00000000 --- a/data/scripts/gUnk_0800DF07.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800DF07 -.byte 0x1 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x4d -.byte 0x6d -.byte 0x6 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc index 842a183a..86f06c8d 100644 --- a/data/scripts/gUnk_0800DF24.inc +++ b/data/scripts/gUnk_0800DF24.inc @@ -5,34 +5,37 @@ _0807EB44 0x0004 _0807EF80 0x0000 StopScript _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 SoundReq0x80100000 _0807E8E4_2 Wait 0x005a -Call sub_0807F3F8 +Call 0x0807f3f9 Wait 0x003c _0807E8E4_0 _0807F0B4 0x0001 CameraTargetEntity -Call sub_0807F5C0 -Call sub_08066C94 +Call 0x0807f5c1 +Call 0x08066c95 Wait 0x00e9 _0807EF80 0x0007 -TextboxNoOverlapFollowPos 0x162f, 0x0002 +TextboxNoOverlapFollowPos +.short 0x162f +.short 0x0002 +@ End of 2 parameters _0807EA94 SoundReq2 0x002f _0807EF80 0x0019 SoundReq 0x0198 -Call sub_0807F2D4 +Call 0x0807f2d5 SetRoomFlag 0x0000 _0807EF80 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer -Call sub_0807F5C0 +Call 0x0807f5c1 SetLocalFlag 0x0078 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc index 7697f328..c1f2c298 100644 --- a/data/scripts/gUnk_0800DFB4.inc +++ b/data/scripts/gUnk_0800DFB4.inc @@ -4,7 +4,15 @@ CheckRoomFlag 0x0001 JumpIfNot 0xfffa SoundReq0x80100000 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SoundReq 0x00f6 -.short 0x140c +CallWithArg .short 0xda1d +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800DFD0.inc b/data/scripts/gUnk_0800DFD0.inc deleted file mode 100644 index 3ff0be81..00000000 --- a/data/scripts/gUnk_0800DFD0.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800DFD0 -_0807E078 0x0004 -.byte 0x0 -.byte 0x0 -.byte 0xb diff --git a/data/scripts/gUnk_0800DFD7.inc b/data/scripts/gUnk_0800DFD7.inc deleted file mode 100644 index ff2789b8..00000000 --- a/data/scripts/gUnk_0800DFD7.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800DFD7 -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 diff --git a/data/scripts/gUnk_0800DFDE.inc b/data/scripts/gUnk_0800DFDE.inc deleted file mode 100644 index d2d8c0eb..00000000 --- a/data/scripts/gUnk_0800DFDE.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800DFDE -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc index fa5c2ad2..0c9cbd6c 100644 --- a/data/scripts/gUnk_0800DFE4.inc +++ b/data/scripts/gUnk_0800DFE4.inc @@ -1,28 +1,39 @@ SCRIPT_START gUnk_0800DFE4 StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 StopScript SoundReq0x80100000 -TextboxNoOverlapFollowPos 0x1632, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1632 +.short 0x0002 +@ End of 2 parameters _0807EA94 SetRoomFlag 0x0003 CheckRoomFlag 0x0000 JumpIfNot 0xfffa SoundReq2 0x0030 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 CheckRoomFlag 0x0002 JumpIfNot 0xfffa _0807E864 -Call sub_0807DF28 +Call 0x0807df29 SetLocalFlag 0x007b -TextboxNoOverlapFollowPos 0x1639, 0x000c +TextboxNoOverlapFollowPos +.short 0x1639 +.short 0x000c +@ End of 2 parameters _0807EA94 Wait 0x0096 SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x00000005 -Call sub_0807DF50 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0005 +.short 0x0000 +@ End of 4 parameters +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/gUnk_0800E050.inc index d3d3ee42..2bfb0644 100644 --- a/data/scripts/gUnk_0800E050.inc +++ b/data/scripts/gUnk_0800E050.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800E050 StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 StopScript SoundReq0x80100000 @@ -13,28 +13,8 @@ Wait 0x001e _0807E5F8 0x00000001 StartPlayerScript 0x0800e094 WaitForSomething2 0x00000002 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x00c0 -.short 0x0402 -.short 0x0c33 -.short 0x0001 -.short 0x0000 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x00a8 -.short 0x002c -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800E094.inc b/data/scripts/gUnk_0800E094.inc new file mode 100644 index 00000000..c91b7180 --- /dev/null +++ b/data/scripts/gUnk_0800E094.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_0800E094 +StartScript +SetEntityNonPlanarMovement 0x00c0 +StopScript +WaitForSomething2 0x00000001 +_0807EF80 0x0001 +_0807EDD4 0x00a8, 0x002c +_0807E5F8 0x00000002 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc index 3c5626c5..aada138e 100644 --- a/data/scripts/gUnk_0800E0BC.inc +++ b/data/scripts/gUnk_0800E0BC.inc @@ -5,7 +5,12 @@ _0807EF80 0x000a CheckLocalFlag 0x0093 JumpIf 0x0062 _0807E930 0x0008 -CallWithArg sub_0807F8E8, 0x00000000 +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -13,4 +18,376 @@ _0807E864 Wait 0x001e _0807EF80 0x0010 SoundReq 0x01c9 -.short 0x0850 +_0807E930 0x0009 +Wait 0x003c +SoundReq 0x01ca +_0807EF80 0x0010 +Wait 0x001e +SoundReq 0x0072 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x001e +_0807EF80 0x0000 +_0807EB8C +_0807EB74 +Wait 0x000a +TextboxNoOverlap 0x2402 +_0807EA94 +SetLocalFlag 0x0093 +Call 0x080668f1 +_0807E878 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x2402 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x000a +CheckLocalFlag 0x0094 +JumpIf 0x006c +_0807E930 0x0010 +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckRoomFlag 0x0001 +JumpIfNot 0xfffa +_0807E864 +Wait 0x001e +_0807EF80 0x0010 +SoundReq 0x01c9 +_0807E930 0x0015 +Wait 0x003c +SoundReq 0x01ca +_0807EF80 0x0010 +Wait 0x001e +SoundReq 0x0072 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x001e +_0807EF80 0x0000 +_0807EB8C +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x000a +TextboxNoOverlap 0x2401 +_0807EA94 +SetLocalFlag 0x0094 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E9D4 +_0807E878 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlap 0x2401 +_0807EA94 +_0807E878 +Jump 0xffe2 +StartScript +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0004 +_0807EF80 0x000a +CheckLocalFlag 0x0073 +JumpIfNot 0x001e +_0807E9D4 +SetEntityPositionRelative 0x01680070 +_0807EB44 0x0002 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +Jump 0x00fe +CheckLocalFlag 0x0095 +JumpIf 0x0062 +_0807E930 0x0010 +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckRoomFlag 0x0002 +JumpIfNot 0xfffa +_0807E864 +Wait 0x001e +_0807EF80 0x0010 +SoundReq 0x01c9 +_0807E930 0x0015 +Wait 0x003c +SoundReq 0x01ca +_0807EF80 0x0010 +Wait 0x001e +SoundReq 0x0072 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x001e +_0807EF80 0x0000 +_0807EB8C +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +SetLocalFlag 0x0095 +_0807EF80 0x0000 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E9D4 +_0807E878 +StopScript +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x005c +CheckLocalFlag 0x0093 +JumpIfNot 0xfff0 +CheckLocalFlag 0x0094 +JumpIfNot 0xffe8 +CheckLocalFlag 0x0095 +JumpIfNot 0xffe0 +_0807E9DC +SetLocalFlag 0x0073 +StopScript +_0807EB44 0x0000 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x0088, 0x0168 +_0807EB44 0x0006 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x0070, 0x0168 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E9D4 +Jump 0x001e +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +TextboxNoOverlap 0x2404 +_0807EA94 +_0807E878 +Jump 0xff82 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlap 0x2403 +_0807EA94 +_0807E878 +Jump 0xffe2 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x000a +CheckLocalFlag 0x0071 +JumpIf 0x0088 +CheckLocalFlag 0x0096 +JumpIf 0x0056 +_0807E930 0x000c +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckRoomFlag 0x0000 +JumpIfNot 0xfffa +_0807E864 +Wait 0x001e +_0807EF80 0x0010 +SoundReq 0x01c9 +_0807E930 0x000d +Wait 0x003c +SoundReq 0x01ca +_0807EF80 0x0010 +Wait 0x001e +SoundReq 0x0072 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x001e +_0807EF80 0x0000 +_0807EB74 +SetLocalFlag 0x0096 +_0807EF80 0x0000 +_0807E9D4 +_0807E878 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x240c +_0807EA94 +Wait 0x000f +_0807F034 0x0053 +WaitPlayerAction8 +SetLocalFlag 0x0071 +_0807E878 +_0807E9D4 +_0807E878 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x240d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +StartScript +_0807EB44 0x0002 +_0807EF80 0x000a +Call 0x080668f1 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x2406 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe8 +StartScript +_0807EB44 0x0002 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x000a +_0807E9D4 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlap 0x2405 +_0807EA94 +_0807E878 +Jump 0xffe2 +StartScript +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x000a +_0807E9D4 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlap 0x2407 +_0807EA94 +_0807E878 +Jump 0xffe2 +StartScript +Call 0x0807f355 +StopScript +CheckLocalFlag 0x007c +JumpIf 0x0046 +CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 +JumpIfNot 0xfff6 +StartScript +_0807E864 +StopScript +Call 0x0807f3f9 +Wait 0x003c +TextboxNoOverlapFollow 0x160c +_0807EA94 +Wait 0x001e +TextboxNoOverlapFollow 0x160d +_0807EA94 +Wait 0x001e +_0807EB28 0x160e +Wait 0x003c +_0807EA94 +StartScript +SoundReq2 0x0033 +SetLocalFlag 0x007c +_0807E878 +_0807EF80 0x0006 +StopScript +SCRIPT_END diff --git a/data/scripts/gUnk_0800E0F6.inc b/data/scripts/gUnk_0800E0F6.inc deleted file mode 100644 index aae1f893..00000000 --- a/data/scripts/gUnk_0800E0F6.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_0800E0F6 -.short 0x0009 -.short 0x0831 -.short 0x003c -.short 0x087b -.short 0x01ca -.short 0x0879 -.short 0x0010 -.short 0x0831 -.short 0x001e -.short 0x087b -.short 0x0072 -.short 0x0831 -.short 0x0078 -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x001e -.short 0x0879 -.short 0x0000 -.short 0x0464 -.short 0x0463 -.short 0x0831 -.short 0x000a -.short 0x085b -.short 0x2402 -.short 0x0459 -.short 0x082a -.short 0x0093 -.short 0x0c0b -.short 0x68f1 -.short 0x0806 -.short 0x0444 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 diff --git a/data/scripts/gUnk_0800E140.inc b/data/scripts/gUnk_0800E140.inc deleted file mode 100644 index 1c76ce25..00000000 --- a/data/scripts/gUnk_0800E140.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800E140 -_0807EB74 -TextboxNoOverlap 0x2402 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -.byte 0x0 diff --git a/data/scripts/gUnk_0800E153.inc b/data/scripts/gUnk_0800E153.inc deleted file mode 100644 index dc8aa199..00000000 --- a/data/scripts/gUnk_0800E153.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800E153 -.byte 0x0 diff --git a/data/scripts/gUnk_0800E154.inc b/data/scripts/gUnk_0800E154.inc deleted file mode 100644 index 8120e6dd..00000000 --- a/data/scripts/gUnk_0800E154.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_0800E154 -StartScript -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0094 -JumpIf 0x006c -_0807E930 0x0010 -CallWithArg sub_0807F8E8, 0x00000001 -StopScript -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x0015 -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB8C -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -.byte 0x31 -.byte 0x8 -.byte 0xa diff --git a/data/scripts/gUnk_0800E1C5.inc b/data/scripts/gUnk_0800E1C5.inc deleted file mode 100644 index b1fb4da9..00000000 --- a/data/scripts/gUnk_0800E1C5.inc +++ /dev/null @@ -1,60 +0,0 @@ -SCRIPT_START gUnk_0800E1C5 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x1 -.byte 0x24 -.byte 0x59 -.byte 0x4 -.byte 0x2a -.byte 0x8 -.byte 0x94 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x53 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x1 -.byte 0x24 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe2 -.byte 0xff diff --git a/data/scripts/gUnk_0800E200.inc b/data/scripts/gUnk_0800E200.inc deleted file mode 100644 index 287a4365..00000000 --- a/data/scripts/gUnk_0800E200.inc +++ /dev/null @@ -1,64 +0,0 @@ -SCRIPT_START gUnk_0800E200 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0073 -JumpIfNot 0x001e -_0807E9D4 -SetEntityPositionRelative 0x01680070 -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -Jump 0x00fe -CheckLocalFlag 0x0095 -JumpIf 0x0062 -_0807E930 0x0010 -CallWithArg sub_0807F8E8, 0x00000002 -StopScript -CheckRoomFlag 0x0002 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x0015 -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB8C -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -SetLocalFlag 0x0095 -_0807EF80 0x0000 -CallWithArg sub_0807F3D8, 0x00000000 -_0807E9D4 -_0807E878 -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x005c -CheckLocalFlag 0x0093 -JumpIfNot 0xfff0 -CheckLocalFlag 0x0094 -JumpIfNot 0xffe8 -CheckLocalFlag 0x0095 -JumpIfNot 0xffe0 -_0807E9DC -SetLocalFlag 0x0073 -StopScript -_0807EB44 0x0000 -CallWithArg sub_0807F3D8, 0x00000004 -_0807EDD4 0x0088, 0x0168 -_0807EB44 0x0006 -CallWithArg sub_0807F3D8, 0x00000004 -.short 0x0c73 -.short 0x0070 -.short 0x0168 diff --git a/data/scripts/gUnk_0800E300.inc b/data/scripts/gUnk_0800E300.inc deleted file mode 100644 index e94132c2..00000000 --- a/data/scripts/gUnk_0800E300.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800E300 -_0807EB74 -.byte 0xc -.byte 0x14 -.byte 0xd9 diff --git a/data/scripts/gUnk_0800E305.inc b/data/scripts/gUnk_0800E305.inc deleted file mode 100644 index cdb3ea4d..00000000 --- a/data/scripts/gUnk_0800E305.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800E305 -.short 0x07f3 diff --git a/data/scripts/gUnk_0800E307.inc b/data/scripts/gUnk_0800E307.inc deleted file mode 100644 index 5d62dd31..00000000 --- a/data/scripts/gUnk_0800E307.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800E307 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800E30C.inc b/data/scripts/gUnk_0800E30C.inc deleted file mode 100644 index 88f350a3..00000000 --- a/data/scripts/gUnk_0800E30C.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800E30C -_0807E9D4 -Jump 0x001e -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -TextboxNoOverlap 0x2404 -_0807EA94 -.byte 0x44 diff --git a/data/scripts/gUnk_0800E329.inc b/data/scripts/gUnk_0800E329.inc deleted file mode 100644 index f1d61aad..00000000 --- a/data/scripts/gUnk_0800E329.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800E329 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x82 -.byte 0xff -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x3 -.byte 0x24 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe2 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800E350.inc b/data/scripts/gUnk_0800E350.inc deleted file mode 100644 index 9a0449e6..00000000 --- a/data/scripts/gUnk_0800E350.inc +++ /dev/null @@ -1,47 +0,0 @@ -SCRIPT_START gUnk_0800E350 -StartScript -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0071 -JumpIf 0x0088 -CheckLocalFlag 0x0096 -JumpIf 0x0056 -_0807E930 0x000c -CallWithArg sub_0807F8E8, 0x00000000 -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x000d -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB74 -SetLocalFlag 0x0096 -_0807EF80 0x0000 -_0807E9D4 -_0807E878 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x240c -_0807EA94 -Wait 0x000f -_0807F034 0x0053 -WaitPlayerAction8 -SetLocalFlag 0x0071 -_0807E878 -_0807E9D4 -_0807E878 -StopScript diff --git a/data/scripts/gUnk_0800E3EE.inc b/data/scripts/gUnk_0800E3EE.inc deleted file mode 100644 index 12ba23bc..00000000 --- a/data/scripts/gUnk_0800E3EE.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800E3EE -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -.byte 0x5b diff --git a/data/scripts/gUnk_0800E3F9.inc b/data/scripts/gUnk_0800E3F9.inc deleted file mode 100644 index c1c452d1..00000000 --- a/data/scripts/gUnk_0800E3F9.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800E3F9 -.byte 0x8 diff --git a/data/scripts/gUnk_0800E3FA.inc b/data/scripts/gUnk_0800E3FA.inc deleted file mode 100644 index 4c052ab0..00000000 --- a/data/scripts/gUnk_0800E3FA.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800E3FA -.short 0x240d diff --git a/data/scripts/gUnk_0800E3FC.inc b/data/scripts/gUnk_0800E3FC.inc deleted file mode 100644 index 282136e7..00000000 --- a/data/scripts/gUnk_0800E3FC.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800E3FC -_0807EA94 -.short 0x0831 diff --git a/data/scripts/gUnk_0800E400.inc b/data/scripts/gUnk_0800E400.inc deleted file mode 100644 index e22e6d14..00000000 --- a/data/scripts/gUnk_0800E400.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800E400 -.short 0x000f -.short 0x0444 -.short 0x0803 -.short 0xffe8 diff --git a/data/scripts/gUnk_0800E408.inc b/data/scripts/gUnk_0800E408.inc deleted file mode 100644 index 2f60c694..00000000 --- a/data/scripts/gUnk_0800E408.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800E408 -StartScript -.byte 0x61 diff --git a/data/scripts/gUnk_0800E40B.inc b/data/scripts/gUnk_0800E40B.inc deleted file mode 100644 index 224feb8f..00000000 --- a/data/scripts/gUnk_0800E40B.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800E40B -.short 0x0208 -.short 0x7900 -.short 0x0a08 diff --git a/data/scripts/gUnk_0800E411.inc b/data/scripts/gUnk_0800E411.inc deleted file mode 100644 index c9db5d83..00000000 --- a/data/scripts/gUnk_0800E411.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_0800E411 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xf1 -.byte 0x68 -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0x5b -.byte 0x8 -.byte 0x6 -.byte 0x24 -.byte 0x59 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 diff --git a/data/scripts/gUnk_0800E430.inc b/data/scripts/gUnk_0800E430.inc deleted file mode 100644 index 3af172e9..00000000 --- a/data/scripts/gUnk_0800E430.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800E430 -.short 0x0803 -.short 0xffe8 diff --git a/data/scripts/gUnk_0800E434.inc b/data/scripts/gUnk_0800E434.inc deleted file mode 100644 index 0780d5bc..00000000 --- a/data/scripts/gUnk_0800E434.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800E434 -StartScript -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlap 0x2405 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffe2 diff --git a/data/scripts/gUnk_0800E46C.inc b/data/scripts/gUnk_0800E46C.inc deleted file mode 100644 index 598e5559..00000000 --- a/data/scripts/gUnk_0800E46C.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800E46C -StartScript -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -.byte 0x5 -.byte 0x8 -.byte 0xfc diff --git a/data/scripts/gUnk_0800E489.inc b/data/scripts/gUnk_0800E489.inc deleted file mode 100644 index 2bedfe87..00000000 --- a/data/scripts/gUnk_0800E489.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800E489 -.short 0x43ff -.short 0x6304 -.short 0x0c04 -.short 0xd914 -.short 0x07f3 -.short 0x0008 -.short 0x0000 -.short 0x5b00 diff --git a/data/scripts/gUnk_0800E499.inc b/data/scripts/gUnk_0800E499.inc deleted file mode 100644 index 6970feeb..00000000 --- a/data/scripts/gUnk_0800E499.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800E499 -.byte 0x8 -.byte 0x7 -.byte 0x24 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe2 -.byte 0xff diff --git a/data/scripts/gUnk_0800E4A4.inc b/data/scripts/gUnk_0800E4A4.inc deleted file mode 100644 index 51402646..00000000 --- a/data/scripts/gUnk_0800E4A4.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800E4A4 -StartScript -Call sub_0807F354 -StopScript -CheckLocalFlag 0x007c -JumpIf 0x0046 -CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 -JumpIfNot 0xfff6 -StartScript -_0807E864 -StopScript -Call sub_0807F3F8 -Wait 0x003c -TextboxNoOverlapFollow 0x160c -_0807EA94 -Wait 0x001e -TextboxNoOverlapFollow 0x160d -_0807EA94 -.byte 0x31 diff --git a/data/scripts/gUnk_0800E4E3.inc b/data/scripts/gUnk_0800E4E3.inc deleted file mode 100644 index dfbba668..00000000 --- a/data/scripts/gUnk_0800E4E3.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_0800E4E3 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x5f -.byte 0x8 -.byte 0xe -.byte 0x16 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0x7c -.byte 0x8 -.byte 0x33 -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0x7c -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/gUnk_0800E504.inc index 5466e088..6b3ce23d 100644 --- a/data/scripts/gUnk_0800E504.inc +++ b/data/scripts/gUnk_0800E504.inc @@ -1,5 +1,18 @@ SCRIPT_START gUnk_0800E504 StartScript StopScript -.short 0x0812 -.short 0x007d +CheckLocalFlag 0x007d +JumpIf 0x002e +CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 +JumpIfNot 0xfff6 +_0807E864 +Wait 0x001e +Call 0x0807f3f9 +Wait 0x003c +SoundReq 0x0105 +Wait 0x001e +_0807EB28 0x1617 +SetLocalFlag 0x007d +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800E50C.inc b/data/scripts/gUnk_0800E50C.inc deleted file mode 100644 index 75f145fe..00000000 --- a/data/scripts/gUnk_0800E50C.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800E50C -JumpIf 0x002e -CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 -JumpIfNot 0xfff6 -_0807E864 -Wait 0x001e -Call sub_0807F3F8 -Wait 0x003c -SoundReq 0x0105 -Wait 0x001e -_0807EB28 0x1617 -SetLocalFlag 0x007d -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/gUnk_0800E544.inc index 3b997d96..8b5cb87f 100644 --- a/data/scripts/gUnk_0800E544.inc +++ b/data/scripts/gUnk_0800E544.inc @@ -7,12 +7,12 @@ CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot 0xfff6 _0807E864 Wait 0x001e -Call sub_0807F3F8 +Call 0x0807f3f9 Wait 0x003c SoundReq 0x0105 Wait 0x001e _0807EB28 0x1622 -Call sub_08053494 +Call 0x08053495 SetLocalFlag 0x007e _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/gUnk_0800E58C.inc index db10f91a..09c173f9 100644 --- a/data/scripts/gUnk_0800E58C.inc +++ b/data/scripts/gUnk_0800E58C.inc @@ -12,6 +12,6 @@ Wait 0x001e TextboxNoOverlap 0x1625 _0807EA94 Wait 0x003c -Call sub_08053C84 +Call 0x08053c85 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800E5C4.inc b/data/scripts/gUnk_0800E5C4.inc index 80384901..aa2c3204 100644 --- a/data/scripts/gUnk_0800E5C4.inc +++ b/data/scripts/gUnk_0800E5C4.inc @@ -5,24 +5,3 @@ JumpIfNot 0x000a _0807EF80 0x0006 StopScript SCRIPT_END -.short 0x0402 -.short 0x0812 -.short 0x0086 -.short 0x0805 -.short 0xfffa -.short 0x0443 -.short 0x0831 -.short 0x003c -.short 0x0c4e -.short 0x0905 -.short 0x0000 -.short 0x0c0b -.short 0xf421 -.short 0x0807 -.short 0x082f -.short 0x0001 -.short 0x0831 -.short 0x001e -.short 0x0444 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800E5D6.inc b/data/scripts/gUnk_0800E5D6.inc new file mode 100644 index 00000000..45eed0b2 --- /dev/null +++ b/data/scripts/gUnk_0800E5D6.inc @@ -0,0 +1,13 @@ +SCRIPT_START gUnk_0800E5D6 +StopScript +CheckLocalFlag 0x0086 +JumpIfNot 0xfffa +_0807E864 +Wait 0x003c +_0807E914 0x00000905 +Call 0x0807f421 +SetRoomFlag 0x0001 +Wait 0x001e +_0807E878 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/gUnk_0800E600.inc index b61b17a2..e0cf612c 100644 --- a/data/scripts/gUnk_0800E600.inc +++ b/data/scripts/gUnk_0800E600.inc @@ -3,4 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0000 _0807E864 -.short 0x0c0b +Call 0x0807f355 +StopScript +WaitForPlayerAction0x17 +_0807E8E4_0 +_0807EF80 0x0001 +Call 0x080752ad +_0807E878 +Call 0x080791d1 +SCRIPT_END diff --git a/data/scripts/gUnk_0800E60E.inc b/data/scripts/gUnk_0800E60E.inc deleted file mode 100644 index 0982add4..00000000 --- a/data/scripts/gUnk_0800E60E.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_0800E60E -.short 0xf355 -.short 0x0807 -.short 0x0402 -.short 0x0435 -.short 0x0449 -.short 0x0879 -.short 0x0001 -.short 0x0c0b -.short 0x52ad -.short 0x0807 -.short 0x0444 -.short 0x0c0b -.short 0x91d1 -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/gUnk_0800E62C.inc index b2267bf5..7c2303ff 100644 --- a/data/scripts/gUnk_0800E62C.inc +++ b/data/scripts/gUnk_0800E62C.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0008 _0807E864 -Call sub_0807F354 +Call 0x0807f355 StopScript WaitForPlayerAction0x17 _0807E8E4_1 _0807EF80 0x0001 -Call sub_080752AC +Call 0x080752ad _0807E878 -Call sub_080791D0 +Call 0x080791d1 SCRIPT_END diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/gUnk_0800E658.inc index f51cd3cf..7d530b7a 100644 --- a/data/scripts/gUnk_0800E658.inc +++ b/data/scripts/gUnk_0800E658.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0010 _0807E864 -Call sub_0807F354 +Call 0x0807f355 StopScript WaitForPlayerAction0x17 _0807E8E4_2 _0807EF80 0x0001 -Call sub_080752AC +Call 0x080752ad _0807E878 -Call sub_080791D0 +Call 0x080791d1 SCRIPT_END diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/gUnk_0800E684.inc index d59676bc..98aa719d 100644 --- a/data/scripts/gUnk_0800E684.inc +++ b/data/scripts/gUnk_0800E684.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0018 _0807E864 -Call sub_0807F354 +Call 0x0807f355 StopScript WaitForPlayerAction0x17 _0807E8E4_3 _0807EF80 0x0001 -Call sub_080752AC +Call 0x080752ad _0807E878 -Call sub_080791D0 +Call 0x080791d1 SCRIPT_END diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc index e85b52c7..033b40e7 100644 --- a/data/scripts/gUnk_0800E6B0.inc +++ b/data/scripts/gUnk_0800E6B0.inc @@ -1,19 +1,176 @@ SCRIPT_START gUnk_0800E6B0 StartScript -Call sub_08060090 +Call 0x08060091 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call sub_08060158 +Call 0x08060159 StopScript Jump 0xffee StopScript _0807E864 -Call sub_0806025C +Call 0x0806025d _0807EA94 Wait 0x000f _0807E878 -.short 0x0803 -.short 0xffd8 +Jump 0xffd8 +StartScript +Call 0x0806adfd +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x000c +Call 0x0806aee5 +Jump 0xffee +StopScript +_0807E864 +Call 0x0806afe9 +JumpIf 0x000e +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffd4 +_0807EA94 +_0807F034 0x0057 +WaitPlayerAction8 +_0807EA94 +_0807E878 +Jump 0xffc4 +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0806afe9 +_0807EA94 +_0807E878 +Jump 0xffe0 +StartScript +_0807E9D4 +_0807EF80 0x000a +SetEntityNonPlanarMovement 0x0200 +CheckGlobalFlag 0x0029 +JumpIfNot 0x000a +CheckGlobalFlag 0x002a +JumpIfNot 0x000c +SetEntityPositionRelative 0x00980188 +Jump 0xff70 +StopScript +StartScript +CheckGlobalFlag 0x002a +JumpIf 0x002a +CheckEntityInteractType +JumpIf 0x000e +Call 0x0806aee5 +StopScript +Jump 0xffe6 +StopScript +_0807E864 +Call 0x0806afe9 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffd0 +_0807EF80 0x000f +_0807EB44 0x0002 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x0806af71 +_0807EE04 0x0188, 0x0058 +StopScript +StartScript +Call 0x0806af79 +_0807EE30 +JumpIfNot 0xfff2 +EntityHasHeight +JumpIf 0xffec +StopScript +Jump 0xff02 +StartScript +Call 0x0806c675 +_0807EF80 0x000a +_0807EB44 0x0004 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c70d +_0807EA94 +_0807E878 +_0807EB44 0x0004 +Jump 0xffe6 +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB44 0x0004 +StartScript +TextboxNoOverlapFollow 0x4501 +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x0032 +.short 0x0001 +@ End of 4 parameters +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x00c8 +.short 0x0002 +@ End of 4 parameters +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x0190 +.short 0x0003 +@ End of 4 parameters +StopScript +_0807EA94 +_0807EB38 +_0807E078 +.short 0x00a6 +.short 0x006a +.short 0x0036 +.short 0x0002 +@ End of 4 parameters +StartScript +TextboxNoOverlapFollow 0x4505 +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x0190 +.short 0x0001 +@ End of 4 parameters +StopScript +_0807EA94 +HasRupees 0x0190 +JumpIfNot 0x007c +ModRupees 0xfe70 +SetLocalFlag 0x0091 +TextboxNoOverlapFollow 0x4508 +_0807EA94 +Call 0x0806c579 +SCRIPT_END diff --git a/data/scripts/gUnk_0800E6E8.inc b/data/scripts/gUnk_0800E6E8.inc deleted file mode 100644 index 413751e4..00000000 --- a/data/scripts/gUnk_0800E6E8.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800E6E8 -StartScript -Call sub_0806ADFC -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000c -Call sub_0806AEE4 -.byte 0x3 -.byte 0x8 -.byte 0xee diff --git a/data/scripts/gUnk_0800E707.inc b/data/scripts/gUnk_0800E707.inc deleted file mode 100644 index 8035a1e5..00000000 --- a/data/scripts/gUnk_0800E707.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800E707 -.byte 0xff -.byte 0x2 -.byte 0x4 diff --git a/data/scripts/gUnk_0800E70A.inc b/data/scripts/gUnk_0800E70A.inc deleted file mode 100644 index da9019d6..00000000 --- a/data/scripts/gUnk_0800E70A.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800E70A -_0807E864 -Call sub_0806AFE8 -JumpIf 0x000e -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd4 -_0807EA94 -_0807F034 0x0057 -WaitPlayerAction8 -_0807EA94 -_0807E878 -Jump 0xffc4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800E734.inc b/data/scripts/gUnk_0800E734.inc deleted file mode 100644 index da7702f0..00000000 --- a/data/scripts/gUnk_0800E734.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800E734 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0806AF60, 0x00000000 -Call sub_0806AFE8 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffe0 diff --git a/data/scripts/gUnk_0800E760.inc b/data/scripts/gUnk_0800E760.inc deleted file mode 100644 index 7874911e..00000000 --- a/data/scripts/gUnk_0800E760.inc +++ /dev/null @@ -1,33 +0,0 @@ -SCRIPT_START gUnk_0800E760 -StartScript -_0807E9D4 -_0807EF80 0x000a -SetEntityNonPlanarMovement 0x0200 -CheckGlobalFlag 0x0029 -JumpIfNot 0x000a -CheckGlobalFlag 0x002a -JumpIfNot 0x000c -SetEntityPositionRelative 0x00980188 -Jump 0xff70 -StopScript -StartScript -CheckGlobalFlag 0x002a -JumpIf 0x002a -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806AEE4 -StopScript -Jump 0xffe6 -StopScript -_0807E864 -Call sub_0806AFE8 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd0 -_0807EF80 0x000f -_0807EB44 0x0002 -CallWithArg sub_0806AF60, 0x00000004 -Call sub_0806AF70 -_0807EE04 0x0188, 0x0058 -.byte 0x2 diff --git a/data/scripts/gUnk_0800E7D9.inc b/data/scripts/gUnk_0800E7D9.inc deleted file mode 100644 index a52e81a7..00000000 --- a/data/scripts/gUnk_0800E7D9.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_0800E7D9 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x79 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x75 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xf2 -.byte 0xff -.byte 0x25 -.byte 0x4 -.byte 0x4 -.byte 0x8 -.byte 0xec -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x2 -.byte 0xff diff --git a/data/scripts/gUnk_0800E7F4.inc b/data/scripts/gUnk_0800E7F4.inc deleted file mode 100644 index 79a91c3e..00000000 --- a/data/scripts/gUnk_0800E7F4.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800E7F4 -StartScript -.short 0x0c0b -.short 0xc675 diff --git a/data/scripts/gUnk_0800E7FA.inc b/data/scripts/gUnk_0800E7FA.inc deleted file mode 100644 index d0195f28..00000000 --- a/data/scripts/gUnk_0800E7FA.inc +++ /dev/null @@ -1,39 +0,0 @@ -SCRIPT_START gUnk_0800E7FA -_0807E078 0x0879 -.byte 0xa -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xd -.byte 0xc7 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xe6 -.byte 0xff -.byte 0x0 diff --git a/data/scripts/gUnk_0800E823.inc b/data/scripts/gUnk_0800E823.inc deleted file mode 100644 index 2b318c88..00000000 --- a/data/scripts/gUnk_0800E823.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800E823 -.byte 0x0 diff --git a/data/scripts/gUnk_0800E824.inc b/data/scripts/gUnk_0800E824.inc deleted file mode 100644 index 4167d136..00000000 --- a/data/scripts/gUnk_0800E824.inc +++ /dev/null @@ -1,133 +0,0 @@ -SCRIPT_START gUnk_0800E824 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB44 0x0004 -StartScript -TextboxNoOverlapFollow 0x4501 -CallWithArg sub_0807F854, 0x00010032 -CallWithArg sub_0807F854, 0x000200c8 -CallWithArg sub_0807F854, 0x00030190 -StopScript -_0807EA94 -_0807EB38 -.byte 0x6 -.byte 0x14 -.byte 0xa6 -.byte 0x0 -.byte 0x6a -.byte 0x0 -.byte 0x36 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x5 -.byte 0x45 -.byte 0xc -.byte 0x14 -.byte 0x55 -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0x90 -.byte 0x1 -.byte 0x1 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x59 -.byte 0x4 -.byte 0x1a -.byte 0x8 -.byte 0x90 -.byte 0x1 -.byte 0x5 -.byte 0x8 -.byte 0x7c -.byte 0x0 -.byte 0x7f -.byte 0x8 -.byte 0x70 -.byte 0xfe -.byte 0x2a -.byte 0x8 -.byte 0x91 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x8 -.byte 0x45 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x79 -.byte 0xc5 -.byte 0x6 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x1 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x4 -.byte 0x45 -.byte 0xc -.byte 0x14 -.byte 0x55 -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0xc8 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x59 -.byte 0x4 -.byte 0x1a -.byte 0x8 -.byte 0xc8 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x4a -.byte 0x0 -.byte 0x7f -.byte 0x8 -.byte 0x38 -.byte 0xff -.byte 0x2a -.byte 0x8 -.byte 0x91 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x8 -.byte 0x45 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x89 -.byte 0xc5 -.byte 0x6 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x1 -.byte 0x4 -.byte 0x5a -.byte 0x8 -.byte 0x3 diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc new file mode 100644 index 00000000..b9d52ee1 --- /dev/null +++ b/data/scripts/gUnk_0800E8A4.inc @@ -0,0 +1,19 @@ +SCRIPT_START gUnk_0800E8A4 +StartScript +TextboxNoOverlapFollow 0x4504 +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x00c8 +.short 0x0001 +@ End of 4 parameters +StopScript +_0807EA94 +HasRupees 0x00c8 +JumpIfNot 0x004a +ModRupees 0xff38 +SetLocalFlag 0x0091 +TextboxNoOverlapFollow 0x4508 +_0807EA94 +Call 0x0806c589 +SCRIPT_END diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc new file mode 100644 index 00000000..0a1f03a1 --- /dev/null +++ b/data/scripts/gUnk_0800E8D6.inc @@ -0,0 +1,19 @@ +SCRIPT_START gUnk_0800E8D6 +StartScript +TextboxNoOverlapFollow 0x4503 +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x0032 +.short 0x0001 +@ End of 4 parameters +StopScript +_0807EA94 +HasRupees 0x0032 +JumpIfNot 0x0018 +ModRupees 0xffce +SetLocalFlag 0x0091 +TextboxNoOverlapFollow 0x4508 +_0807EA94 +Call 0x0806c599 +SCRIPT_END diff --git a/data/scripts/gUnk_0800E8DB.inc b/data/scripts/gUnk_0800E8DB.inc deleted file mode 100644 index 0387d346..00000000 --- a/data/scripts/gUnk_0800E8DB.inc +++ /dev/null @@ -1,70 +0,0 @@ -SCRIPT_START gUnk_0800E8DB -.byte 0x45 -.byte 0xc -.byte 0x14 -.byte 0x55 -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0x32 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x59 -.byte 0x4 -.byte 0x1a -.byte 0x8 -.byte 0x32 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x18 -.byte 0x0 -.byte 0x7f -.byte 0x8 -.byte 0xce -.byte 0xff -.byte 0x2a -.byte 0x8 -.byte 0x91 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x8 -.byte 0x45 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x99 -.byte 0xc5 -.byte 0x6 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x5a -.byte 0x8 -.byte 0x7 -.byte 0x45 -.byte 0x3 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x9 -.byte 0x45 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x14 -.byte 0xff diff --git a/data/scripts/gUnk_0800E908.inc b/data/scripts/gUnk_0800E908.inc new file mode 100644 index 00000000..a716fb55 --- /dev/null +++ b/data/scripts/gUnk_0800E908.inc @@ -0,0 +1,75 @@ +SCRIPT_START gUnk_0800E908 +TextboxNoOverlapFollow 0x4507 +Jump 0x0006 +TextboxNoOverlapFollow 0x4509 +_0807EA94 +_0807E878 +_0807EB44 0x0000 +Jump 0xff14 +StartScript +Call 0x0806c4f9 +_0807EF80 0x000a +_0807EB44 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB44 0x0004 +_0807E930 0x0004 +Call 0x0806c4a9 +JumpIfNot 0xfff8 +Call 0x0806c4dd +_0807EA94 +_0807E878 +_0807EB44 0x0000 +_0807E930 0x0000 +Jump 0xffd2 +.short 0x0000 +StartScript +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807E930 0x0008 +Call 0x0807f2d5 +_0807E930 0x0009 +Call 0x0806b261 +JumpIfNot 0x0052 +_0807EA94 +_0807EF80 0x000b +StartPlayerScript 0x0800e9f4 +WaitForSomething2 0x00000001 +_0807EF80 0x000a +TextboxNoOverlapFollow 0x4a24 +_0807EA94 +_0807E930 0x000a +Wait 0x0014 +TextboxNoOverlapFollow 0x4a25 +_0807EA94 +_0807E930 0x0000 +StartPlayerScript 0x0800ea1c +WaitForSomething2 0x00000001 +SetLocalFlag 0x0074 +SoundReq 0x0072 +Wait 0x00f0 +TextboxNoOverlapFollow 0x4a26 +_0807EA94 +SetLocalFlag 0x0075 +_0807EA94 +Wait 0x000f +_0807E878 +_0807E930 0x0000 +Jump 0xff82 +StartScript +_0807EB44 0x0004 +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x0078, 0x0080 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800E920.inc b/data/scripts/gUnk_0800E920.inc deleted file mode 100644 index 4d9a3ccf..00000000 --- a/data/scripts/gUnk_0800E920.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_0800E920 -StartScript -Call sub_0806C4F8 -_0807EF80 0x000a -_0807EB44 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB44 0x0004 -_0807E930 0x0004 -Call sub_0806C4A8 -JumpIfNot 0xfff8 -Call sub_0806C4DC -_0807EA94 -_0807E878 -_0807EB44 0x0000 -_0807E930 0x0000 -Jump 0xffd2 -.short 0x0000 diff --git a/data/scripts/gUnk_0800E964.inc b/data/scripts/gUnk_0800E964.inc deleted file mode 100644 index 79094ddf..00000000 --- a/data/scripts/gUnk_0800E964.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_0800E964 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0008 -Call sub_0807F2D4 -_0807E930 0x0009 -Call sub_0806B260 -JumpIfNot 0x0052 -_0807EA94 -_0807EF80 0x000b -StartPlayerScript 0x0800e9f4 -WaitForSomething2 0x00000001 -_0807EF80 0x000a -TextboxNoOverlapFollow 0x4a24 -_0807EA94 -_0807E930 0x000a -Wait 0x0014 -TextboxNoOverlapFollow 0x4a25 -_0807EA94 -_0807E930 0x0000 -StartPlayerScript 0x0800ea1c -WaitForSomething2 0x00000001 -SetLocalFlag 0x0074 -.short 0x087b -.short 0x0072 diff --git a/data/scripts/gUnk_0800E9D6.inc b/data/scripts/gUnk_0800E9D6.inc deleted file mode 100644 index e8ebfeed..00000000 --- a/data/scripts/gUnk_0800E9D6.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800E9D6 -Wait 0x00f0 -TextboxNoOverlapFollow 0x4a26 -_0807EA94 -SetLocalFlag 0x0075 -_0807EA94 -Wait 0x000f -_0807E878 -_0807E930 0x0000 -.short 0x0803 -.short 0xff82 diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/gUnk_0800EA1C.inc index 49a32db0..f940e9b6 100644 --- a/data/scripts/gUnk_0800EA1C.inc +++ b/data/scripts/gUnk_0800EA1C.inc @@ -10,6 +10,6 @@ _0807EF80 0x0000 _0807EF80 0x0005 Wait 0x003c _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc index baf1c112..f3bbc0c5 100644 --- a/data/scripts/gUnk_0800EA54.inc +++ b/data/scripts/gUnk_0800EA54.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800EA54 StartScript -Call sub_0806CE5C +Call 0x0806ce5d _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 @@ -9,14 +9,358 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -Call sub_0807F2D4 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f2d5 _0807E930 0x0009 -Call sub_0806CE80 +Call 0x0806ce81 _0807EA94 _0807E878 _0807E930 0x000a -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E930 0x0008 -.short 0x0803 -.short 0xffc8 +Jump 0xffc8 +StartScript +_0807E9D4 +Call 0x0806c09d +_0807EF80 0x000a +_0807E930 0x0000 +_0807EB44 0x0004 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +StartScript +_0807E864 +_0807EB74 +CallWithArg +.short 0xc029 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +Call 0x0806c00d +JumpIfNot 0xfff8 +_0807E930 0x0008 +Call 0x0806c039 +_0807EA94 +Wait 0x000f +_0807E878 +_0807E930 0x0000 +Jump 0xffc6 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0000 +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +.short 0x0000 +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0004 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +Jump 0xffe4 +.short 0x0000 +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0006 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +_0807EB44 0x0006 +Call 0x08061fd9 +Jump 0xffda +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0002 +Call 0x08061fd9 +StopScript +Jump 0x0036 +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0004 +Call 0x08061fd9 +StopScript +Jump 0x001a +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0006 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +Jump 0xffe4 +.short 0x0000 +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0002 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +_0807EB44 0x0002 +Call 0x08061fd9 +Jump 0xffda +StartScript +Call 0x08061e71 +_0807EF80 0x000a +_0807EB44 0x0004 +Call 0x08061fd9 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08061fd9 +Call 0x08062049 +_0807EA94 +_0807E878 +Jump 0xffe4 +.short 0x0000 +StartScript +_0807E9D4 +CallWithArg +.short 0x1fb9 +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +SetEntityNonPlanarMovement 0x0040 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0002 +StopScript +_0807EB44 0x0006 +_0807E930 0x0007 +_0807EDD4 0x0028, 0x0050 +Wait 0x001e +_0807EB44 0x0004 +_0807E930 0x0002 +Wait 0x001e +_0807EB44 0x0002 +_0807E930 0x0001 +Wait 0x001e +_0807EB44 0x0002 +_0807E930 0x0005 +_0807EDD4 0x0048, 0x0050 +Wait 0x001e +_0807EB44 0x0004 +_0807E930 0x0002 +Wait 0x001e +_0807EB44 0x0006 +_0807E930 0x0003 +Wait 0x001e +Jump 0xffaa +StartScript +Call 0x080639d1 +_0807EF80 0x000a +StopScript +StartScript +CallWithArg +.short 0x3851 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0x3851 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x08063945 +_0807EA94 +JumpIfNot 0x0008 +_0807F050 0x0070 +WaitPlayerAction8 +_0807E878 +Call 0x08063875 +CallWithArg +.short 0x3851 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffc6 +StartScript +Call 0x08064cc1 +_0807EF80 0x000a +_0807EF80 0x0007 +_0807EB44 0x0002 +_0807E930 0x0000 +StopScript +_0807E944 +_0807E864 +_0807EB74 +Call 0x08064cd9 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffea +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x0016 +TestBit 0x00000001 +JumpIf 0x0068 +Call 0x0806aee5 +Jump 0xffe4 +StopScript +_0807E864 +Call 0x0807df29 +CheckLocalFlag 0x00ae +JumpIf 0x0078 +Wait 0x000a +_0807E5F8 0x00000001 +TextboxNoOverlapFollow 0x4c07 +_0807EA94 +_0807E5F8 0x00000010 +TextboxNoOverlapFollow 0x4c08 +_0807EA94 +_0807E5F8 0x00000020 +TextboxNoOverlapFollow 0x4c09 +_0807EA94 +_0807E914 0x00000503 +Call 0x0807f421 +_0807E5F8 0x00000040 +Call 0x0807df51 +_0807E878 +SetLocalFlag 0x00ae +Jump 0xff88 +StopScript +WaitForSomething2 0x00000002 +_0807EB44 0x0002 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +WaitForSomething2 0x00000004 +Call 0x0806aed9 +WaitForSomething2 0x00000008 +Jump 0xff5c +TextboxNoOverlapFollow 0x4c16 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xff4a +StartScript +_0807E9D4 +_0807EF80 0x000a +StopScript +StartScript +CheckEntityInteractType +JumpIf 0x0016 +TestBit 0x00000001 +JumpIf 0x0068 +Call 0x0806aee5 +Jump 0xffe4 +StopScript +_0807E864 +Call 0x0807df29 +CheckLocalFlag 0x00ae +JumpIf 0x0078 +Wait 0x000a +_0807E5F8 0x00000001 +TextboxNoOverlapFollow 0x4c07 +_0807EA94 +_0807E5F8 0x00000002 +TextboxNoOverlapFollow 0x4c08 +_0807EA94 +_0807E5F8 0x00000004 +TextboxNoOverlapFollow 0x4c09 +_0807EA94 +_0807E914 0x00000503 +Call 0x0807f421 +_0807E5F8 0x00000008 +Call 0x0807df51 +_0807E878 +SetLocalFlag 0x00ae +Jump 0xff88 +StopScript +WaitForSomething2 0x00000010 +_0807EB44 0x0006 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +WaitForSomething2 0x00000020 +Call 0x0806aed9 +WaitForSomething2 0x00000040 +Jump 0xff5c +TextboxNoOverlapFollow 0x4c15 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xff4a +TextboxNoOverlapFollow 0x4c07 +_0807EA94 +_0807E5F8 0x00000012 +Wait 0x000a +TextboxNoOverlapFollow 0x4c08 +_0807EA94 +_0807E5F8 0x00000024 +TextboxNoOverlapFollow 0x4c09 +_0807EA94 +_0807E5F8 0x00000048 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800EAA4.inc b/data/scripts/gUnk_0800EAA4.inc deleted file mode 100644 index 626dc0dd..00000000 --- a/data/scripts/gUnk_0800EAA4.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_0800EAA4 -StartScript -_0807E9D4 -Call sub_0806C09C -_0807EF80 0x000a -_0807E930 0x0000 -_0807EB44 0x0004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -StartScript -_0807E864 -_0807EB74 -CallWithArg sub_0806C028, 0x00000004 -StopScript -Call sub_0806C00C -JumpIfNot 0xfff8 -_0807E930 0x0008 -Call sub_0806C038 -_0807EA94 -.byte 0x31 diff --git a/data/scripts/gUnk_0800EAEB.inc b/data/scripts/gUnk_0800EAEB.inc deleted file mode 100644 index 11bceabe..00000000 --- a/data/scripts/gUnk_0800EAEB.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800EAEB -.byte 0x8 -.byte 0xf -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x50 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xc6 -.byte 0xff diff --git a/data/scripts/gUnk_0800EAF8.inc b/data/scripts/gUnk_0800EAF8.inc deleted file mode 100644 index 1a376bd3..00000000 --- a/data/scripts/gUnk_0800EAF8.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800EAF8 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 diff --git a/data/scripts/gUnk_0800EB2C.inc b/data/scripts/gUnk_0800EB2C.inc deleted file mode 100644 index bf9bb96b..00000000 --- a/data/scripts/gUnk_0800EB2C.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800EB2C -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800EB64.inc b/data/scripts/gUnk_0800EB64.inc deleted file mode 100644 index 4b9c3f44..00000000 --- a/data/scripts/gUnk_0800EB64.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800EB64 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0006 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -_0807EB44 0x0006 -Call sub_08061FD8 -Jump 0xffda -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0002 -Call sub_08061FD8 -StopScript -.short 0x0803 -.short 0x0036 diff --git a/data/scripts/gUnk_0800EBC0.inc b/data/scripts/gUnk_0800EBC0.inc deleted file mode 100644 index 5d826fef..00000000 --- a/data/scripts/gUnk_0800EBC0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800EBC0 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -.short 0x0803 -.short 0x001a diff --git a/data/scripts/gUnk_0800EBDC.inc b/data/scripts/gUnk_0800EBDC.inc deleted file mode 100644 index ed2c5da1..00000000 --- a/data/scripts/gUnk_0800EBDC.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800EBDC -StartScript -.short 0x0c0b diff --git a/data/scripts/gUnk_0800EBE0.inc b/data/scripts/gUnk_0800EBE0.inc deleted file mode 100644 index b1480401..00000000 --- a/data/scripts/gUnk_0800EBE0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800EBE0 -.short 0x1e71 -.short 0x0806 -.short 0x0879 -.short 0x000a -.short 0x0861 -.short 0x0006 -.short 0x0c0b -.short 0x1fd9 diff --git a/data/scripts/gUnk_0800EBF0.inc b/data/scripts/gUnk_0800EBF0.inc deleted file mode 100644 index c5a4bdd0..00000000 --- a/data/scripts/gUnk_0800EBF0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800EBF0 -_0807E078 0x0402 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -.short 0x0c0b -.short 0x2049 diff --git a/data/scripts/gUnk_0800EC08.inc b/data/scripts/gUnk_0800EC08.inc deleted file mode 100644 index 4c6e46e4..00000000 --- a/data/scripts/gUnk_0800EC08.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800EC08 -_0807E078 0x0459 -_0807E878 -Jump 0xffe4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800EC14.inc b/data/scripts/gUnk_0800EC14.inc deleted file mode 100644 index 40d32fda..00000000 --- a/data/scripts/gUnk_0800EC14.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800EC14 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0002 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -_0807EB44 0x0002 -Call sub_08061FD8 -.short 0x0803 -.short 0xffda diff --git a/data/scripts/gUnk_0800EC54.inc b/data/scripts/gUnk_0800EC54.inc deleted file mode 100644 index 74b8261c..00000000 --- a/data/scripts/gUnk_0800EC54.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800EC54 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -.byte 0x61 diff --git a/data/scripts/gUnk_0800EC61.inc b/data/scripts/gUnk_0800EC61.inc deleted file mode 100644 index 64187010..00000000 --- a/data/scripts/gUnk_0800EC61.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START gUnk_0800EC61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0x1f -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0x1f -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x49 -.byte 0x20 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe4 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800EC8C.inc b/data/scripts/gUnk_0800EC8C.inc deleted file mode 100644 index 093d3ac9..00000000 --- a/data/scripts/gUnk_0800EC8C.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0800EC8C -StartScript -_0807E9D4 -CallWithArg sub_08061FB8, 0x00000001 -SetEntityNonPlanarMovement 0x0040 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0002 -StopScript -_0807EB44 0x0006 -_0807E930 0x0007 -_0807EDD4 0x0028, 0x0050 -Wait 0x001e -_0807EB44 0x0004 -_0807E930 0x0002 -Wait 0x001e -_0807EB44 0x0002 -_0807E930 0x0001 -Wait 0x001e -_0807EB44 0x0002 -_0807E930 0x0005 -_0807EDD4 0x0048, 0x0050 -Wait 0x001e -_0807EB44 0x0004 -_0807E930 0x0002 -.byte 0x31 diff --git a/data/scripts/gUnk_0800ECF1.inc b/data/scripts/gUnk_0800ECF1.inc deleted file mode 100644 index 70ec0120..00000000 --- a/data/scripts/gUnk_0800ECF1.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_0800ECF1 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xaa -.byte 0xff diff --git a/data/scripts/gUnk_0800ED04.inc b/data/scripts/gUnk_0800ED04.inc deleted file mode 100644 index 1300437f..00000000 --- a/data/scripts/gUnk_0800ED04.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800ED04 -StartScript -.short 0x0c0b -.short 0x39d1 -.short 0x0806 diff --git a/data/scripts/gUnk_0800ED0C.inc b/data/scripts/gUnk_0800ED0C.inc deleted file mode 100644 index 45527289..00000000 --- a/data/scripts/gUnk_0800ED0C.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800ED0C -.byte 0x79 diff --git a/data/scripts/gUnk_0800ED0D.inc b/data/scripts/gUnk_0800ED0D.inc deleted file mode 100644 index 2a01bd1e..00000000 --- a/data/scripts/gUnk_0800ED0D.inc +++ /dev/null @@ -1,80 +0,0 @@ -SCRIPT_START gUnk_0800ED0D -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x51 -.byte 0x38 -.byte 0x6 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x51 -.byte 0x38 -.byte 0x6 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0x39 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x83 -.byte 0x8 -.byte 0x70 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x75 -.byte 0x38 -.byte 0x6 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x51 -.byte 0x38 -.byte 0x6 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xc6 -.byte 0xff diff --git a/data/scripts/gUnk_0800ED5C.inc b/data/scripts/gUnk_0800ED5C.inc deleted file mode 100644 index 96ca6a5c..00000000 --- a/data/scripts/gUnk_0800ED5C.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_0800ED5C -StartScript -Call sub_08064CC0 -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0002 -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -_0807EB74 -Call sub_08064CD8 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 diff --git a/data/scripts/gUnk_0800ED90.inc b/data/scripts/gUnk_0800ED90.inc deleted file mode 100644 index 5aece36e..00000000 --- a/data/scripts/gUnk_0800ED90.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800ED90 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0016 -TestBit 0x00000001 -JumpIf 0x0068 -Call sub_0806AEE4 -Jump 0xffe4 -StopScript -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x00ae -JumpIf 0x0078 -Wait 0x000a -_0807E5F8 0x00000001 -TextboxNoOverlapFollow 0x4c07 -_0807EA94 -.byte 0x28 diff --git a/data/scripts/gUnk_0800EDD9.inc b/data/scripts/gUnk_0800EDD9.inc deleted file mode 100644 index cc1fab74..00000000 --- a/data/scripts/gUnk_0800EDD9.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800EDD9 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5a -.byte 0x8 diff --git a/data/scripts/gUnk_0800EDE0.inc b/data/scripts/gUnk_0800EDE0.inc deleted file mode 100644 index d48a3a8d..00000000 --- a/data/scripts/gUnk_0800EDE0.inc +++ /dev/null @@ -1,42 +0,0 @@ -SCRIPT_START gUnk_0800EDE0 -.byte 0x8 -.byte 0x4c -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5a -.byte 0x8 -.byte 0x9 -.byte 0x4c -.byte 0x59 -.byte 0x4 -.byte 0x4e -.byte 0xc -.byte 0x3 -.byte 0x5 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x21 -.byte 0xf4 -.byte 0x7 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 diff --git a/data/scripts/gUnk_0800EE09.inc b/data/scripts/gUnk_0800EE09.inc deleted file mode 100644 index 3c8f7938..00000000 --- a/data/scripts/gUnk_0800EE09.inc +++ /dev/null @@ -1,72 +0,0 @@ -SCRIPT_START gUnk_0800EE09 -.byte 0x4 -.byte 0x2a -.byte 0x8 -.byte 0xae -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x88 -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0xae -.byte 0x6 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x5c -.byte 0xff -.byte 0x5a -.byte 0x8 -.byte 0x16 -.byte 0x4c -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x4a -.byte 0xff diff --git a/data/scripts/gUnk_0800EE50.inc b/data/scripts/gUnk_0800EE50.inc deleted file mode 100644 index 15c15625..00000000 --- a/data/scripts/gUnk_0800EE50.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800EE50 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0016 -TestBit 0x00000001 -JumpIf 0x0068 -Call sub_0806AEE4 -Jump 0xffe4 -StopScript -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x00ae -JumpIf 0x0078 -.short 0x0831 -.short 0x000a diff --git a/data/scripts/gUnk_0800EE8C.inc b/data/scripts/gUnk_0800EE8C.inc deleted file mode 100644 index d8927be4..00000000 --- a/data/scripts/gUnk_0800EE8C.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_0800EE8C -_0807E5F8 0x00000001 -TextboxNoOverlapFollow 0x4c07 -_0807EA94 -_0807E5F8 0x00000002 -TextboxNoOverlapFollow 0x4c08 -_0807EA94 -_0807E5F8 0x00000004 -TextboxNoOverlapFollow 0x4c09 -_0807EA94 -_0807E914 0x00000503 -Call sub_0807F420 -_0807E5F8 0x00000008 -Call sub_0807DF50 -_0807E878 -SetLocalFlag 0x00ae -Jump 0xff88 -StopScript -WaitForSomething2 0x00000010 -_0807EB44 0x0006 -.short 0x140c diff --git a/data/scripts/gUnk_0800EEE0.inc b/data/scripts/gUnk_0800EEE0.inc deleted file mode 100644 index 1d58b622..00000000 --- a/data/scripts/gUnk_0800EEE0.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_0800EEE0 -.byte 0x61 -.byte 0xaf -.byte 0x6 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd9 -.byte 0xae -.byte 0x6 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x5c diff --git a/data/scripts/gUnk_0800EEFD.inc b/data/scripts/gUnk_0800EEFD.inc deleted file mode 100644 index 75d66b81..00000000 --- a/data/scripts/gUnk_0800EEFD.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800EEFD -.short 0x5aff -.short 0x1508 -.short 0x594c -.short 0x0b04 -.short 0x510c diff --git a/data/scripts/gUnk_0800EF07.inc b/data/scripts/gUnk_0800EF07.inc deleted file mode 100644 index 97e9c0f2..00000000 --- a/data/scripts/gUnk_0800EF07.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800EF07 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x4a -.byte 0xff -.byte 0x5a -.byte 0x8 diff --git a/data/scripts/gUnk_0800EF12.inc b/data/scripts/gUnk_0800EF12.inc deleted file mode 100644 index b1a6ce36..00000000 --- a/data/scripts/gUnk_0800EF12.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_0800EF12 -.short 0x4c07 -.short 0x0459 -.short 0x0c28 -.short 0x0012 -.short 0x0000 -.short 0x0831 -.short 0x000a -.short 0x085a -.short 0x4c08 -.short 0x0459 -.short 0x0c28 -.short 0x0024 -.short 0x0000 -.short 0x085a -.short 0x4c09 -.short 0x0459 -.short 0x0c28 -.short 0x0048 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/gUnk_0800EF40.inc index 25e4c7c8..7054cbda 100644 --- a/data/scripts/gUnk_0800EF40.inc +++ b/data/scripts/gUnk_0800EF40.inc @@ -4,7 +4,7 @@ _0807EF80 0x0007 CheckGlobalFlag 0x001f JumpIf 0x0046 StopScript -Call sub_080869A4 +Call 0x080869a5 JumpIfNot 0xfff8 _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d @@ -21,4 +21,6 @@ TextboxNoOverlapFollow 0x4d02 _0807EA94 Wait 0x000f _0807E878 -.byte 0xb +Call 0x0808692d +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800EF93.inc b/data/scripts/gUnk_0800EF93.inc deleted file mode 100644 index 241bef5f..00000000 --- a/data/scripts/gUnk_0800EF93.inc +++ /dev/null @@ -1,46 +0,0 @@ -SCRIPT_START gUnk_0800EF93 -.byte 0xc -.byte 0x2d -.byte 0x69 -.byte 0x8 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x2 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x70 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800EF9C.inc b/data/scripts/gUnk_0800EF9C.inc new file mode 100644 index 00000000..aa4dbcd5 --- /dev/null +++ b/data/scripts/gUnk_0800EF9C.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_0800EF9C +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807ECC4 0x0008 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc index 38b323e8..e9c5bd82 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/gUnk_0800EFC0.inc @@ -8,4 +8,128 @@ JumpIf 0x00b0 StopScript Jump 0x0026 _0807EB44 0x0006 -.short 0x140c +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0004 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0002 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0002 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x0088, 0x0040 +_0807EF80 0x000a +_0807EB44 0x0002 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0004 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0006 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +_0807EB44 0x0006 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x0068, 0x0040 +_0807EF80 0x000a +CheckLocalFlag 0x007b +JumpIf 0x0006 +Jump 0xff5a +StopScript +Call 0x0806aee5 +Jump 0xfff6 +.short 0x0000 +StartScript +_0807F0B4 0x0001 +CameraTargetPlayer +StopScript +CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +LoadRoomEntityList 0x080ee8ac +StartPlayerScript 0x0800f14c +WaitForSomething2 0x00000001 +_0807E5F8 0x0000001e +WaitForSomething2 0x00000040 +TextboxNoOverlapFollowPos +.short 0x1201 +.short 0x000c +@ End of 2 parameters +_0807EA94 +WaitForSomething2 0x000003c0 +_0807E8E4_0 +TextboxNoOverlapFollowPos +.short 0x1202 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807F034 0x0067 +WaitPlayerAction8 +_0807E8E4_0 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000040 +TextboxNoOverlapFollowPos +.short 0x1203 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +Call 0x0807df51 +_0807E878 +WaitForSomething2 0x00000040 +CheckKinstoneFused 0x0032 +JumpIfNot 0xfffa +_0807E864 +Call 0x0807df29 +_0807E5F8 0x0000001e +Wait 0x003c +_0807E8E4_1 +WaitForSomething2 0x000003c0 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800EFE0.inc b/data/scripts/gUnk_0800EFE0.inc deleted file mode 100644 index 9d7068c2..00000000 --- a/data/scripts/gUnk_0800EFE0.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800EFE0 -.short 0xaf61 -.short 0x0806 diff --git a/data/scripts/gUnk_0800EFE4.inc b/data/scripts/gUnk_0800EFE4.inc deleted file mode 100644 index 7a23461a..00000000 --- a/data/scripts/gUnk_0800EFE4.inc +++ /dev/null @@ -1,87 +0,0 @@ -SCRIPT_START gUnk_0800EFE4 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0004 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0002 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0002 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0c73 -.short 0x0088 -.short 0x0040 -.short 0x0879 -.short 0x000a -.short 0x0861 -.short 0x0002 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0004 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0006 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0008 -.short 0x0000 -.short 0x0831 -.short 0x0004 -.short 0x0861 -.short 0x0006 -.short 0x140c -.short 0xaf61 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0c73 -.short 0x0068 -.short 0x0040 -.short 0x0879 -.short 0x000a -.short 0x0812 -.short 0x007b -.short 0x0804 -.short 0x0006 -.short 0x0803 -.short 0xff5a -.short 0x0402 -.short 0x0c0b -.short 0xaee5 -.short 0x0806 -.short 0x0803 -.short 0xfff6 -.short 0x0000 diff --git a/data/scripts/gUnk_0800F090.inc b/data/scripts/gUnk_0800F090.inc deleted file mode 100644 index 77414fc0..00000000 --- a/data/scripts/gUnk_0800F090.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F090 -StartScript -.short 0x0889 diff --git a/data/scripts/gUnk_0800F094.inc b/data/scripts/gUnk_0800F094.inc deleted file mode 100644 index 72e8cab2..00000000 --- a/data/scripts/gUnk_0800F094.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_0800F094 -.short 0x0001 -.short 0x0488 -.short 0x0402 -.short 0x1016 -.short 0x01f8 -.short 0x0338 -.short 0x1030 -.short 0x0805 -.short 0xfff6 -.short 0x0443 -.short 0x0c0b -.short 0xf9a5 -.short 0x0807 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 -.short 0x0c0d -.short 0xe8ac -.short 0x080e -.short 0x0c47 -.short 0xf14c -.short 0x0800 -.short 0x0c33 -.short 0x0001 -.short 0x0000 -.short 0x0c28 -.short 0x001e -.short 0x0000 -.short 0x0c33 -.short 0x0040 -.short 0x0000 -.short 0x0c5c -.short 0x1201 diff --git a/data/scripts/gUnk_0800F0D6.inc b/data/scripts/gUnk_0800F0D6.inc deleted file mode 100644 index 15c8839e..00000000 --- a/data/scripts/gUnk_0800F0D6.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800F0D6 -.short 0x000c -.short 0x0459 -.short 0x0c33 -.short 0x03c0 -.short 0x0000 -.short 0x0449 diff --git a/data/scripts/gUnk_0800F0E2.inc b/data/scripts/gUnk_0800F0E2.inc deleted file mode 100644 index 27b15b7d..00000000 --- a/data/scripts/gUnk_0800F0E2.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F0E2 -TextboxNoOverlapFollowPos 0x1202, 0x000c -_0807EA94 -_0807F034 0x0067 -WaitPlayerAction8 -_0807E8E4_0 diff --git a/data/scripts/gUnk_0800F0F2.inc b/data/scripts/gUnk_0800F0F2.inc deleted file mode 100644 index ed25a718..00000000 --- a/data/scripts/gUnk_0800F0F2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F0F2 -.byte 0x28 diff --git a/data/scripts/gUnk_0800F0F3.inc b/data/scripts/gUnk_0800F0F3.inc deleted file mode 100644 index 599503fc..00000000 --- a/data/scripts/gUnk_0800F0F3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F0F3 -.byte 0xc diff --git a/data/scripts/gUnk_0800F0F4.inc b/data/scripts/gUnk_0800F0F4.inc deleted file mode 100644 index 62397ca1..00000000 --- a/data/scripts/gUnk_0800F0F4.inc +++ /dev/null @@ -1,45 +0,0 @@ -SCRIPT_START gUnk_0800F0F4 -.short 0x0002 -.short 0x0000 -.short 0x0c33 -.short 0x0040 -.short 0x0000 -.short 0x0c5c -.short 0x1203 -.short 0x000c -.short 0x0459 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0c33 -.short 0x0040 -.short 0x0000 -.short 0x081d -.short 0x0032 -.short 0x0805 -.short 0xfffa -.short 0x0443 -.short 0x0c0b -.short 0xdf29 -.short 0x0807 -.short 0x0c28 -.short 0x001e -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x044a -.short 0x0c33 -.short 0x03c0 -.short 0x0000 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/gUnk_0800F14C.inc index d0f0517e..622ee0eb 100644 --- a/data/scripts/gUnk_0800F14C.inc +++ b/data/scripts/gUnk_0800F14C.inc @@ -11,5 +11,5 @@ _0807EDD4 0x01f8, 0x0338 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc index 356ec88d..48f4ed28 100644 --- a/data/scripts/gUnk_0800F184.inc +++ b/data/scripts/gUnk_0800F184.inc @@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0008 _0807EF80 0x000a StopScript -Call sub_0807F348 +Call 0x0807f349 _0807EB44 0x0002 WaitForSomething2 0x00000002 _0807EF80 0x0007 @@ -16,7 +16,127 @@ _0807E930 0x0008 _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 -Call sub_0806E440 +Call 0x0806e441 Wait 0x0078 -.short 0x0c28 -.short 0x0040 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +StopScript +StartScript +CallWithArg +.short 0xf681 +.short 0x0807 +.short 0x01c0 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x0034 +StopScript +_0807E864 +Call 0x0807f9a5 +_0807EB74 +_0807E930 0x0008 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1206 +.short 0x000c +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800f33c +WaitForSomething2 0x00000400 +_0807E878 +Jump 0xffbe +CallWithArg +.short 0xf681 +.short 0x0807 +.short 0x0230 +.short 0x0000 +@ End of 4 parameters +JumpIfNot 0x0034 +StopScript +_0807E864 +Call 0x0807f9a5 +_0807EB74 +_0807E930 0x0008 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1206 +.short 0x000c +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800f354 +WaitForSomething2 0x00000400 +_0807E878 +Jump 0xff7e +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x0310 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x0034 +StopScript +_0807E864 +Call 0x0807f9a5 +_0807EB74 +_0807E930 0x0008 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1206 +.short 0x000c +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800f36c +WaitForSomething2 0x00000400 +_0807E878 +Jump 0xff3e +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x0340 +.short 0x0000 +@ End of 4 parameters +JumpIfNot 0x0034 +StopScript +_0807E864 +Call 0x0807f9a5 +_0807EB74 +_0807E930 0x0008 +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1206 +.short 0x000c +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800f384 +WaitForSomething2 0x00000400 +_0807E878 +Jump 0xfefe +StopScript +StartScript +CheckKinstoneFused 0x0032 +JumpIf 0x0020 +CheckEntityInteractType +JumpIfNot 0xfff0 +StopScript +_0807E864 +_0807EB74 +_0807E930 0x0008 +TextboxNoOverlapFollowPos +.short 0x1208 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E878 +Jump 0xfed4 +StopScript +_0807E5F8 0x00000040 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0002 +_0807EEF4 0x00c0, 0x0000 +_0807E5F8 0x00000040 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800F1DE.inc b/data/scripts/gUnk_0800F1DE.inc deleted file mode 100644 index 6258fd46..00000000 --- a/data/scripts/gUnk_0800F1DE.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F1DE -.byte 0x0 -.byte 0x0 -.byte 0x33 diff --git a/data/scripts/gUnk_0800F1E1.inc b/data/scripts/gUnk_0800F1E1.inc deleted file mode 100644 index 8304b6ce..00000000 --- a/data/scripts/gUnk_0800F1E1.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F1E1 -.short 0x020c -.short 0x0000 diff --git a/data/scripts/gUnk_0800F1E5.inc b/data/scripts/gUnk_0800F1E5.inc deleted file mode 100644 index 6e7bf469..00000000 --- a/data/scripts/gUnk_0800F1E5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F1E5 -.short 0x0200 diff --git a/data/scripts/gUnk_0800F1E7.inc b/data/scripts/gUnk_0800F1E7.inc deleted file mode 100644 index 754af852..00000000 --- a/data/scripts/gUnk_0800F1E7.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F1E7 -.short 0x0104 -.short 0x0c04 -.short 0x8114 diff --git a/data/scripts/gUnk_0800F1ED.inc b/data/scripts/gUnk_0800F1ED.inc deleted file mode 100644 index e581a907..00000000 --- a/data/scripts/gUnk_0800F1ED.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F1ED -.short 0x07f6 -.short 0xc008 -.short 0x0001 -.short 0x0400 -.short 0x3408 -.short 0x0200 -.short 0x4304 diff --git a/data/scripts/gUnk_0800F1FB.inc b/data/scripts/gUnk_0800F1FB.inc deleted file mode 100644 index fb1d7825..00000000 --- a/data/scripts/gUnk_0800F1FB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F1FB -.short 0x0b04 diff --git a/data/scripts/gUnk_0800F1FD.inc b/data/scripts/gUnk_0800F1FD.inc deleted file mode 100644 index a6e73a6c..00000000 --- a/data/scripts/gUnk_0800F1FD.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F1FD -.short 0xa50c -.short 0x07f9 -.short 0x6308 diff --git a/data/scripts/gUnk_0800F203.inc b/data/scripts/gUnk_0800F203.inc deleted file mode 100644 index e3382c32..00000000 --- a/data/scripts/gUnk_0800F203.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F203 -.short 0x5004 -.short 0x0808 diff --git a/data/scripts/gUnk_0800F207.inc b/data/scripts/gUnk_0800F207.inc deleted file mode 100644 index a9b8ee3b..00000000 --- a/data/scripts/gUnk_0800F207.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800F207 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 diff --git a/data/scripts/gUnk_0800F210.inc b/data/scripts/gUnk_0800F210.inc deleted file mode 100644 index 8fa88e89..00000000 --- a/data/scripts/gUnk_0800F210.inc +++ /dev/null @@ -1,53 +0,0 @@ -SCRIPT_START gUnk_0800F210 -TextboxNoOverlapFollowPos 0x1206, 0x000c -_0807EA94 -StartPlayerScript 0x0800f33c -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xffbe -CallWithArg sub_0807F680, 0x00000230 -JumpIfNot 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x1206, 0x000c -_0807EA94 -StartPlayerScript 0x0800f354 -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xff7e -CallWithArg sub_0807F6B4, 0x00000310 -JumpIf 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x1206, 0x000c -_0807EA94 -StartPlayerScript 0x0800f36c -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xff3e -CallWithArg sub_0807F6B4, 0x00000340 -JumpIfNot 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x1206, 0x000c -_0807EA94 -StartPlayerScript 0x0800f384 -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xfefe -.byte 0x2 diff --git a/data/scripts/gUnk_0800F2EB.inc b/data/scripts/gUnk_0800F2EB.inc deleted file mode 100644 index 5292d064..00000000 --- a/data/scripts/gUnk_0800F2EB.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F2EB -.byte 0x4 -.byte 0x1 -.byte 0x4 -.byte 0x1d -.byte 0x8 diff --git a/data/scripts/gUnk_0800F2F0.inc b/data/scripts/gUnk_0800F2F0.inc deleted file mode 100644 index 8eddb220..00000000 --- a/data/scripts/gUnk_0800F2F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F2F0 -.short 0x0032 diff --git a/data/scripts/gUnk_0800F2F2.inc b/data/scripts/gUnk_0800F2F2.inc deleted file mode 100644 index 8bb256c2..00000000 --- a/data/scripts/gUnk_0800F2F2.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F2F2 -JumpIf 0x0020 -CheckEntityInteractType -JumpIfNot 0xfff0 -StopScript -_0807E864 -_0807EB74 -.byte 0x50 diff --git a/data/scripts/gUnk_0800F303.inc b/data/scripts/gUnk_0800F303.inc deleted file mode 100644 index 855cbddc..00000000 --- a/data/scripts/gUnk_0800F303.inc +++ /dev/null @@ -1,154 +0,0 @@ -SCRIPT_START gUnk_0800F303 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x8 -.byte 0x12 -.byte 0xc -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd4 -.byte 0xfe -.byte 0x2 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0xc0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x6f -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x71 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x70 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x6e -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800F33C.inc b/data/scripts/gUnk_0800F33C.inc new file mode 100644 index 00000000..d6632d61 --- /dev/null +++ b/data/scripts/gUnk_0800F33C.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800F33C +SetEntityNonPlanarMovement 0x0100 +_0807EC94 0x0008 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800F354.inc b/data/scripts/gUnk_0800F354.inc new file mode 100644 index 00000000..f84638a3 --- /dev/null +++ b/data/scripts/gUnk_0800F354.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800F354 +SetEntityNonPlanarMovement 0x0100 +_0807ECF4 0x0008 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800F36C.inc b/data/scripts/gUnk_0800F36C.inc new file mode 100644 index 00000000..ce91e138 --- /dev/null +++ b/data/scripts/gUnk_0800F36C.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800F36C +SetEntityNonPlanarMovement 0x0100 +_0807ECC4 0x0008 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800F384.inc b/data/scripts/gUnk_0800F384.inc new file mode 100644 index 00000000..68bf6162 --- /dev/null +++ b/data/scripts/gUnk_0800F384.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800F384 +SetEntityNonPlanarMovement 0x0100 +_0807EC64 0x0008 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/gUnk_0800F39C.inc index fdfdbecf..34f2ec83 100644 --- a/data/scripts/gUnk_0800F39C.inc +++ b/data/scripts/gUnk_0800F39C.inc @@ -7,12 +7,34 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call sub_0807F348 +Call 0x0807f349 WaitForSomething2 0x00000004 _0807EF80 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 _0807EDD4 0x0208, 0x0338 -.byte 0x61 -.byte 0x8 -.byte 0x6 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E5F8 0x00000080 +StopScript +StartScript +CheckEntityInteractType +JumpIfNot 0x0010 +StopScript +_0807E864 +_0807EB74 +TextboxNoOverlap 0x1237 +_0807EA94 +_0807E878 +TestBit 0x00000004 +JumpIfNot 0xffe0 +StopScript +_0807EF80 0x000b +Wait 0x0010 +SetEntityNonPlanarMovement 0x0100 +_0807EC64 0x0010 +_0807EDD4 0x0288, 0x0328 +_0807E5F8 0x00000080 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800F3DB.inc b/data/scripts/gUnk_0800F3DB.inc deleted file mode 100644 index 05dd228a..00000000 --- a/data/scripts/gUnk_0800F3DB.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F3DB -.short 0x7900 -.short 0x0008 -.short 0x7900 -.short 0x0a08 -.short 0x2800 diff --git a/data/scripts/gUnk_0800F3E5.inc b/data/scripts/gUnk_0800F3E5.inc deleted file mode 100644 index fabd6bc6..00000000 --- a/data/scripts/gUnk_0800F3E5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F3E5 -.byte 0xc diff --git a/data/scripts/gUnk_0800F3E6.inc b/data/scripts/gUnk_0800F3E6.inc deleted file mode 100644 index 50e2a1ff..00000000 --- a/data/scripts/gUnk_0800F3E6.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F3E6 -.short 0x0080 diff --git a/data/scripts/gUnk_0800F3E8.inc b/data/scripts/gUnk_0800F3E8.inc deleted file mode 100644 index 82f0aeb2..00000000 --- a/data/scripts/gUnk_0800F3E8.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F3E8 -.byte 0x0 -.byte 0x0 -.byte 0x2 diff --git a/data/scripts/gUnk_0800F3EB.inc b/data/scripts/gUnk_0800F3EB.inc deleted file mode 100644 index a9954b8e..00000000 --- a/data/scripts/gUnk_0800F3EB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F3EB -.short 0x0104 diff --git a/data/scripts/gUnk_0800F3ED.inc b/data/scripts/gUnk_0800F3ED.inc deleted file mode 100644 index 614f4b38..00000000 --- a/data/scripts/gUnk_0800F3ED.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800F3ED -.short 0x1804 -.short 0x0504 -.short 0x1008 -.short 0x0200 diff --git a/data/scripts/gUnk_0800F3F5.inc b/data/scripts/gUnk_0800F3F5.inc deleted file mode 100644 index e16fbc6f..00000000 --- a/data/scripts/gUnk_0800F3F5.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F3F5 -.short 0x4304 -.short 0x6304 diff --git a/data/scripts/gUnk_0800F3F9.inc b/data/scripts/gUnk_0800F3F9.inc deleted file mode 100644 index db02cae5..00000000 --- a/data/scripts/gUnk_0800F3F9.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F3F9 -.byte 0x4 -.byte 0x5b -.byte 0x8 -.byte 0x37 -.byte 0x12 -.byte 0x59 -.byte 0x4 diff --git a/data/scripts/gUnk_0800F400.inc b/data/scripts/gUnk_0800F400.inc deleted file mode 100644 index a607008f..00000000 --- a/data/scripts/gUnk_0800F400.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800F400 -_0807E878 -.short 0x0c0e -.short 0x0004 -.short 0x0000 diff --git a/data/scripts/gUnk_0800F408.inc b/data/scripts/gUnk_0800F408.inc deleted file mode 100644 index 253909b8..00000000 --- a/data/scripts/gUnk_0800F408.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F408 -.byte 0x5 diff --git a/data/scripts/gUnk_0800F409.inc b/data/scripts/gUnk_0800F409.inc deleted file mode 100644 index be4798ae..00000000 --- a/data/scripts/gUnk_0800F409.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F409 -.byte 0x8 -.byte 0xe0 -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x79 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F410.inc b/data/scripts/gUnk_0800F410.inc deleted file mode 100644 index b80cf8d5..00000000 --- a/data/scripts/gUnk_0800F410.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800F410 -.short 0x000b -.short 0x0831 -.short 0x0010 -.short 0x0867 -.short 0x0100 -.short 0x086e -.short 0x0010 -.short 0x0c73 -.short 0x0288 -.short 0x0328 -.short 0x0c28 diff --git a/data/scripts/gUnk_0800F426.inc b/data/scripts/gUnk_0800F426.inc deleted file mode 100644 index 7ca38cee..00000000 --- a/data/scripts/gUnk_0800F426.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F426 -.short 0x0080 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/gUnk_0800F430.inc index 94e2ad26..1570ff8a 100644 --- a/data/scripts/gUnk_0800F430.inc +++ b/data/scripts/gUnk_0800F430.inc @@ -7,7 +7,7 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call sub_0807F348 +Call 0x0807f349 WaitForSomething2 0x00000008 _0807EF80 0x0007 _0807EDD4 0x01d8, 0x0328 diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/gUnk_0800F4C4.inc index 74a6202a..e9cdb3da 100644 --- a/data/scripts/gUnk_0800F4C4.inc +++ b/data/scripts/gUnk_0800F4C4.inc @@ -7,7 +7,34 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call sub_0807F348 -.short 0x0c33 -.short 0x0010 +Call 0x0807f349 +WaitForSomething2 0x00000010 +_0807EF80 0x0007 +_0807EDD4 0x01c8, 0x0328 +_0807EDD4 0x01e8, 0x0338 +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E5F8 0x00000200 +StopScript +StartScript +CheckEntityInteractType +JumpIfNot 0x0010 +StopScript +_0807E864 +_0807EB74 +TextboxNoOverlap 0x1239 +_0807EA94 +_0807E878 +TestBit 0x00000010 +JumpIfNot 0xffe0 +StopScript +_0807EF80 0x000b +Wait 0x0028 +SetEntityNonPlanarMovement 0x0100 +_0807EC64 0x0010 +_0807EDD4 0x0288, 0x0328 +_0807E5F8 0x00000200 +_0807EF80 0x0006 +SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800F4EA.inc b/data/scripts/gUnk_0800F4EA.inc deleted file mode 100644 index a8a3c9bf..00000000 --- a/data/scripts/gUnk_0800F4EA.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F4EA -.byte 0x79 diff --git a/data/scripts/gUnk_0800F4EB.inc b/data/scripts/gUnk_0800F4EB.inc deleted file mode 100644 index 435d785c..00000000 --- a/data/scripts/gUnk_0800F4EB.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F4EB -.short 0x0708 -.short 0x7300 diff --git a/data/scripts/gUnk_0800F4EF.inc b/data/scripts/gUnk_0800F4EF.inc deleted file mode 100644 index 631b4796..00000000 --- a/data/scripts/gUnk_0800F4EF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F4EF -.byte 0xc diff --git a/data/scripts/gUnk_0800F4F0.inc b/data/scripts/gUnk_0800F4F0.inc deleted file mode 100644 index 1e075f39..00000000 --- a/data/scripts/gUnk_0800F4F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F4F0 -.byte 0xc8 diff --git a/data/scripts/gUnk_0800F4F1.inc b/data/scripts/gUnk_0800F4F1.inc deleted file mode 100644 index 32a58387..00000000 --- a/data/scripts/gUnk_0800F4F1.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F4F1 -.short 0x2801 diff --git a/data/scripts/gUnk_0800F4F3.inc b/data/scripts/gUnk_0800F4F3.inc deleted file mode 100644 index 2962f037..00000000 --- a/data/scripts/gUnk_0800F4F3.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F4F3 -.short 0x7303 -.short 0xe80c diff --git a/data/scripts/gUnk_0800F4F7.inc b/data/scripts/gUnk_0800F4F7.inc deleted file mode 100644 index 421f1073..00000000 --- a/data/scripts/gUnk_0800F4F7.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F4F7 -.short 0x3801 diff --git a/data/scripts/gUnk_0800F4F9.inc b/data/scripts/gUnk_0800F4F9.inc deleted file mode 100644 index e84329b5..00000000 --- a/data/scripts/gUnk_0800F4F9.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800F4F9 -.short 0x6103 -.short 0x0208 -.short 0x7900 -.short 0x0008 diff --git a/data/scripts/gUnk_0800F501.inc b/data/scripts/gUnk_0800F501.inc deleted file mode 100644 index 405d2b4d..00000000 --- a/data/scripts/gUnk_0800F501.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800F501 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 diff --git a/data/scripts/gUnk_0800F50E.inc b/data/scripts/gUnk_0800F50E.inc deleted file mode 100644 index 3c8649cc..00000000 --- a/data/scripts/gUnk_0800F50E.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0800F50E -StartScript -CheckEntityInteractType -JumpIfNot 0x0010 -StopScript -_0807E864 -_0807EB74 -TextboxNoOverlap 0x1239 -_0807EA94 -_0807E878 -TestBit 0x00000010 -JumpIfNot 0xffe0 -StopScript -_0807EF80 0x000b -Wait 0x0028 -SetEntityNonPlanarMovement 0x0100 -_0807EC64 0x0010 -_0807EDD4 0x0288, 0x0328 -_0807E5F8 0x00000200 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc index 9165b792..bf854ed0 100644 --- a/data/scripts/gUnk_0800F554.inc +++ b/data/scripts/gUnk_0800F554.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800F554 StartScript -Call sub_08061FE4 +Call 0x08061fe5 _0807E9D4 _0807EF80 0x000a StopScript @@ -8,9 +8,157 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_08061FE4 -Call sub_08061FF4 +Call 0x08061fe5 +Call 0x08061ff5 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 +StartScript +_0807EF80 0x0001 +_0807E9D4 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +_0807E878 +_0807EF80 0x0001 +Jump 0xffe6 +.short 0x0000 +StartScript +_0807EB44 0x0006 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Call 0x08064429 +_0807EA94 +_0807E878 +Jump 0xffe0 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0000 +_0807E9D4 +_0807EF80 0x000a +Call 0x0807f349 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlap 0x2511 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffde +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EF80 0x0001 +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +_0807E878 +Jump 0xffea +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E9D4 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0001 +Call 0x0806b4f1 +_0807EA94 +Wait 0x000f +_0807E878 +_0807EF80 0x0000 +Jump 0xffde +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E930 0x0000 +_0807E9D4 +_0807EF80 0x000a +Call 0x0807f349 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +CheckLocalFlag 0x00cd +JumpIf 0x000a +TextboxNoOverlap 0x2512 +Jump 0x0006 +TextboxNoOverlap 0x251f +_0807EA94 +Wait 0x000f +_0807E878 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffc4 +.short 0x0000 +StartScript +_0807EF80 0x0001 +_0807E9D4 +_0807EF80 0x000a +Call 0x08062789 +StopScript +CheckLocalFlag 0x00cd +JumpIf 0x001e +CheckEntityInteractType +JumpIfNot 0xfff4 +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +_0807E878 +_0807EF80 0x0001 +Jump 0xffde +Call 0x080627e9 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800F584.inc b/data/scripts/gUnk_0800F584.inc deleted file mode 100644 index 7c8cebd3..00000000 --- a/data/scripts/gUnk_0800F584.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800F584 -StartScript -_0807EF80 0x0001 -_0807E9D4 -.byte 0x79 -.byte 0x8 -.byte 0xa diff --git a/data/scripts/gUnk_0800F58F.inc b/data/scripts/gUnk_0800F58F.inc deleted file mode 100644 index 5388e13e..00000000 --- a/data/scripts/gUnk_0800F58F.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_0800F58F -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0x63 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x5d -.byte 0x26 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xe6 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800F5B0.inc b/data/scripts/gUnk_0800F5B0.inc deleted file mode 100644 index fb29c6f8..00000000 --- a/data/scripts/gUnk_0800F5B0.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_0800F5B0 -StartScript -_0807EB44 0x0006 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000008 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_08064428 -_0807EA94 -_0807E878 -.byte 0x3 -.byte 0x8 -.byte 0xe0 diff --git a/data/scripts/gUnk_0800F5E9.inc b/data/scripts/gUnk_0800F5E9.inc deleted file mode 100644 index 17d68420..00000000 --- a/data/scripts/gUnk_0800F5E9.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F5E9 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800F5EC.inc b/data/scripts/gUnk_0800F5EC.inc deleted file mode 100644 index b99ac058..00000000 --- a/data/scripts/gUnk_0800F5EC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5EC -.byte 0x1 diff --git a/data/scripts/gUnk_0800F5ED.inc b/data/scripts/gUnk_0800F5ED.inc deleted file mode 100644 index be79dc66..00000000 --- a/data/scripts/gUnk_0800F5ED.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5ED -.byte 0x4 diff --git a/data/scripts/gUnk_0800F5EE.inc b/data/scripts/gUnk_0800F5EE.inc deleted file mode 100644 index 3f450a2a..00000000 --- a/data/scripts/gUnk_0800F5EE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5EE -.byte 0x61 diff --git a/data/scripts/gUnk_0800F5EF.inc b/data/scripts/gUnk_0800F5EF.inc deleted file mode 100644 index dd283283..00000000 --- a/data/scripts/gUnk_0800F5EF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5EF -.byte 0x8 diff --git a/data/scripts/gUnk_0800F5F0.inc b/data/scripts/gUnk_0800F5F0.inc deleted file mode 100644 index a0d9cb65..00000000 --- a/data/scripts/gUnk_0800F5F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5F0 -.short 0x0004 diff --git a/data/scripts/gUnk_0800F5F2.inc b/data/scripts/gUnk_0800F5F2.inc deleted file mode 100644 index ce7b9e1b..00000000 --- a/data/scripts/gUnk_0800F5F2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F5F2 -.short 0x0850 diff --git a/data/scripts/gUnk_0800F5F4.inc b/data/scripts/gUnk_0800F5F4.inc deleted file mode 100644 index 7288c55b..00000000 --- a/data/scripts/gUnk_0800F5F4.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800F5F4 -.short 0x0000 -.short 0x0453 -.short 0x0879 -.short 0x000a diff --git a/data/scripts/gUnk_0800F5FC.inc b/data/scripts/gUnk_0800F5FC.inc deleted file mode 100644 index 430d56f5..00000000 --- a/data/scripts/gUnk_0800F5FC.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F5FC -.byte 0xb -.byte 0xc -.byte 0x49 diff --git a/data/scripts/gUnk_0800F5FF.inc b/data/scripts/gUnk_0800F5FF.inc deleted file mode 100644 index f5b8fd49..00000000 --- a/data/scripts/gUnk_0800F5FF.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F5FF -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x18 -.byte 0x4 diff --git a/data/scripts/gUnk_0800F606.inc b/data/scripts/gUnk_0800F606.inc deleted file mode 100644 index d9a88bb7..00000000 --- a/data/scripts/gUnk_0800F606.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F606 -.byte 0x5 diff --git a/data/scripts/gUnk_0800F607.inc b/data/scripts/gUnk_0800F607.inc deleted file mode 100644 index 30ad22a2..00000000 --- a/data/scripts/gUnk_0800F607.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F607 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F608.inc b/data/scripts/gUnk_0800F608.inc deleted file mode 100644 index cb8cc66d..00000000 --- a/data/scripts/gUnk_0800F608.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F608 -.short 0xfffc diff --git a/data/scripts/gUnk_0800F60A.inc b/data/scripts/gUnk_0800F60A.inc deleted file mode 100644 index 3ac06e79..00000000 --- a/data/scripts/gUnk_0800F60A.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800F60A -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -TextboxNoOverlap 0x2511 -_0807EA94 -Wait 0x000f -_0807E878 -.short 0x0803 -.short 0xffde diff --git a/data/scripts/gUnk_0800F628.inc b/data/scripts/gUnk_0800F628.inc deleted file mode 100644 index 2ecdb62e..00000000 --- a/data/scripts/gUnk_0800F628.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0800F628 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EF80 0x0001 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -_0807E878 -Jump 0xffea -.short 0x0000 diff --git a/data/scripts/gUnk_0800F650.inc b/data/scripts/gUnk_0800F650.inc deleted file mode 100644 index ab6d77c9..00000000 --- a/data/scripts/gUnk_0800F650.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_0800F650 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806B4F0 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 diff --git a/data/scripts/gUnk_0800F688.inc b/data/scripts/gUnk_0800F688.inc deleted file mode 100644 index 0fcfacf3..00000000 --- a/data/scripts/gUnk_0800F688.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F688 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -_0807E9D4 -_0807EF80 0x000a -Call sub_0807F348 -StopScript diff --git a/data/scripts/gUnk_0800F6A0.inc b/data/scripts/gUnk_0800F6A0.inc deleted file mode 100644 index cbc613ef..00000000 --- a/data/scripts/gUnk_0800F6A0.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800F6A0 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -CheckLocalFlag 0x00cd -JumpIf 0x000a -TextboxNoOverlap 0x2512 -Jump 0x0006 -.short 0x085b -.short 0x251f diff --git a/data/scripts/gUnk_0800F6C8.inc b/data/scripts/gUnk_0800F6C8.inc deleted file mode 100644 index 0eaf28e0..00000000 --- a/data/scripts/gUnk_0800F6C8.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_0800F6C8 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000000 -Jump 0xffc4 -.short 0x0000 diff --git a/data/scripts/gUnk_0800F6E0.inc b/data/scripts/gUnk_0800F6E0.inc deleted file mode 100644 index ab65b54f..00000000 --- a/data/scripts/gUnk_0800F6E0.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0800F6E0 -StartScript -_0807EF80 0x0001 -_0807E9D4 -.byte 0x79 diff --git a/data/scripts/gUnk_0800F6E9.inc b/data/scripts/gUnk_0800F6E9.inc deleted file mode 100644 index f7de9bf3..00000000 --- a/data/scripts/gUnk_0800F6E9.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F6E9 -.byte 0x8 -.byte 0xa -.byte 0x0 diff --git a/data/scripts/gUnk_0800F6EC.inc b/data/scripts/gUnk_0800F6EC.inc deleted file mode 100644 index aad40ce2..00000000 --- a/data/scripts/gUnk_0800F6EC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6EC -.byte 0xb diff --git a/data/scripts/gUnk_0800F6ED.inc b/data/scripts/gUnk_0800F6ED.inc deleted file mode 100644 index 73bd769d..00000000 --- a/data/scripts/gUnk_0800F6ED.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6ED -.byte 0xc diff --git a/data/scripts/gUnk_0800F6EE.inc b/data/scripts/gUnk_0800F6EE.inc deleted file mode 100644 index d528ca30..00000000 --- a/data/scripts/gUnk_0800F6EE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6EE -.byte 0x89 diff --git a/data/scripts/gUnk_0800F6EF.inc b/data/scripts/gUnk_0800F6EF.inc deleted file mode 100644 index f15c37fb..00000000 --- a/data/scripts/gUnk_0800F6EF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6EF -.byte 0x27 diff --git a/data/scripts/gUnk_0800F6F0.inc b/data/scripts/gUnk_0800F6F0.inc deleted file mode 100644 index 3774af96..00000000 --- a/data/scripts/gUnk_0800F6F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6F0 -.byte 0x6 diff --git a/data/scripts/gUnk_0800F6F1.inc b/data/scripts/gUnk_0800F6F1.inc deleted file mode 100644 index 646ff764..00000000 --- a/data/scripts/gUnk_0800F6F1.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6F1 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F6F2.inc b/data/scripts/gUnk_0800F6F2.inc deleted file mode 100644 index c4258905..00000000 --- a/data/scripts/gUnk_0800F6F2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6F2 -.byte 0x2 diff --git a/data/scripts/gUnk_0800F6F3.inc b/data/scripts/gUnk_0800F6F3.inc deleted file mode 100644 index a265e213..00000000 --- a/data/scripts/gUnk_0800F6F3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F6F3 -.byte 0x4 diff --git a/data/scripts/gUnk_0800F6F4.inc b/data/scripts/gUnk_0800F6F4.inc deleted file mode 100644 index 842f18d5..00000000 --- a/data/scripts/gUnk_0800F6F4.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F6F4 -CheckLocalFlag 0x00cd -.byte 0x4 diff --git a/data/scripts/gUnk_0800F6F9.inc b/data/scripts/gUnk_0800F6F9.inc deleted file mode 100644 index 812fd700..00000000 --- a/data/scripts/gUnk_0800F6F9.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F6F9 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x18 -.byte 0x4 diff --git a/data/scripts/gUnk_0800F6FE.inc b/data/scripts/gUnk_0800F6FE.inc deleted file mode 100644 index 3d0f90e1..00000000 --- a/data/scripts/gUnk_0800F6FE.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F6FE -.short 0x0805 -.short 0xfff4 diff --git a/data/scripts/gUnk_0800F702.inc b/data/scripts/gUnk_0800F702.inc deleted file mode 100644 index 0676c592..00000000 --- a/data/scripts/gUnk_0800F702.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F702 -_0807E864 -_0807EB74 diff --git a/data/scripts/gUnk_0800F706.inc b/data/scripts/gUnk_0800F706.inc deleted file mode 100644 index c0d86b0d..00000000 --- a/data/scripts/gUnk_0800F706.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800F706 -Call sub_0806265C -_0807EA94 -_0807E878 -_0807EF80 0x0001 -Jump 0xffde -.short 0x0c0b -.short 0x27e9 -.short 0x0806 diff --git a/data/scripts/gUnk_0800F71E.inc b/data/scripts/gUnk_0800F71E.inc deleted file mode 100644 index 7d059899..00000000 --- a/data/scripts/gUnk_0800F71E.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F71E -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc index a6ec34d6..1ded33f7 100644 --- a/data/scripts/gUnk_0800F724.inc +++ b/data/scripts/gUnk_0800F724.inc @@ -3,5 +3,235 @@ StartScript _0807EF80 0x0008 StopScript CheckLocalFlag 0x00cd -.short 0x0805 -.short 0xfffa +JumpIfNot 0xfffa +_0807EF80 0x0007 +Jump 0xfe4a +CheckLocalFlag 0x00cd +JumpIf 0x030a +_0807E864 +Call 0x0807df29 +SetEntityPositionRelative 0x014800c8 +Call 0x0807f845 +_0807E778 0x0002 +DoFade6 +WaitFor_2 +StartPlayerScript 0x0800fa54 +_0807E5F8 0x00000002 +_0807F0B4 0x0001 +SetEntityPositionRelative 0x021800c8 +Call 0x0807f5c1 +Wait 0x0064 +_0807F0B4 0x0002 +SetEntityPositionRelative 0x036800c8 +Call 0x0807f5c1 +WaitForSomething2 0x00000001 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x2501 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807F0B4 0x0004 +CameraTargetPlayer +Call 0x0807df51 +_0807E878 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000004 +_0807E864 +Call 0x0807df29 +StartPlayerScript 0x0800fa78 +WaitForSomething2 0x00000001 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x2503 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Call 0x0807df51 +_0807E878 +WaitForSomething2 0x00000004 +_0807E864 +Call 0x0807df29 +StartPlayerScript 0x0800fa9c +WaitForSomething2 0x00000001 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x2504 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Call 0x0807df51 +_0807E878 +WaitForSomething2 0x00000004 +_0807E864 +Call 0x0807df29 +StartPlayerScript 0x0800fac0 +WaitForSomething2 0x00000001 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +TextboxNoOverlapFollowPos +.short 0x2505 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Call 0x0807df51 +_0807E878 +WaitForSomething2 0x00000004 +_0807E864 +Call 0x0807df29 +Call 0x08063c5d +SoundReq 0x00e2 +Wait 0x001e +_0807E8E4_0 +Call 0x0807f3f9 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x1021 +.short 0x000e +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800fae4 +SetEntityPositionRelative 0x025800f0 +_0807F0B4 0x0001 +CameraTargetEntity +Wait 0x001e +Call 0x08063c2d +WaitForSomething2 0x00000001 +TextboxNoOverlapFollowPos +.short 0x1022 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E8E4_0 +Call 0x08063c15 +Call 0x08094cdd +Wait 0x001e +TextboxNoOverlapFollowPos +.short 0x1023 +.short 0x000e +@ End of 2 parameters +_0807EA94 +Call 0x08063c15 +Call 0x08094dd9 +Wait 0x001e +TextboxNoOverlapFollowPos +.short 0x1024 +.short 0x000e +@ End of 2 parameters +_0807EA94 +Call 0x08063c15 +Call 0x08094d35 +Wait 0x001e +TextboxNoOverlapFollowPos +.short 0x1025 +.short 0x000e +@ End of 2 parameters +_0807EA94 +Call 0x08063c5d +TextboxNoOverlapFollowPos +.short 0x1026 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E8E4_1 +Call 0x08063c2d +TextboxNoOverlapFollowPos +.short 0x1027 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +Call 0x08063c75 +Wait 0x003c +Call 0x08063c15 +_0807E8E4_0 +TextboxNoOverlapFollowPos +.short 0x1028 +.short 0x000e +@ End of 2 parameters +_0807EA94 +_0807E8E4_1 +TextboxNoOverlapFollowPos +.short 0x1029 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807E8E4_0 +TextboxNoOverlapFollowPos +.short 0x102a +.short 0x000e +@ End of 2 parameters +_0807EA94 +Call 0x08063c15 +Call 0x08094d71 +SoundReq 0x0103 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +Call 0x08063c15 +Call 0x08094d11 +Wait 0x001e +Call 0x08094e0d +Wait 0x001e +_0807E8E4_1 +Call 0x0807f3f9 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x102b +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807F034 0x000d +WaitPlayerAction8 +Call 0x0806dc3d +Call 0x080791bd +CallWithArg +.short 0xf245 +.short 0x0807 +.short 0x000d +.short 0x0000 +@ End of 4 parameters +_0807E914 0x000000ff +Call 0x0807f5b1 +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x49d6 +.short 0x0800 +@ End of 4 parameters +Wait 0x00b7 +_0807E914 0x00000000 +Call 0x0807f5b1 +TextboxNoOverlapFollowPos +.short 0x102c +.short 0x0000 +@ End of 2 parameters +_0807EA94 +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0806dc59 +_0807F0B4 0x0004 +CameraTargetPlayer +Wait 0x000a +_0807E5F8 0x00000002 +Call 0x08063c45 +SetLocalFlag 0x00cd +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800F734.inc b/data/scripts/gUnk_0800F734.inc deleted file mode 100644 index d0e49b47..00000000 --- a/data/scripts/gUnk_0800F734.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F734 -_0807EF80 0x0007 -.short 0x0803 -.short 0xfe4a diff --git a/data/scripts/gUnk_0800F73C.inc b/data/scripts/gUnk_0800F73C.inc deleted file mode 100644 index 4222c77f..00000000 --- a/data/scripts/gUnk_0800F73C.inc +++ /dev/null @@ -1,37 +0,0 @@ -SCRIPT_START gUnk_0800F73C -CheckLocalFlag 0x00cd -JumpIf 0x030a -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x014800c8 -Call sub_0807F844 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -StartPlayerScript 0x0800fa54 -_0807E5F8 0x00000002 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x021800c8 -Call sub_0807F5C0 -Wait 0x0064 -_0807F0B4 0x0002 -SetEntityPositionRelative 0x036800c8 -Call sub_0807F5C0 -WaitForSomething2 0x00000001 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x2501, 0x0000 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000004 -_0807E864 -Call sub_0807DF28 -StartPlayerScript 0x0800fa78 -WaitForSomething2 0x00000001 -_0807E5F8 0x00000002 -.short 0x0c33 diff --git a/data/scripts/gUnk_0800F7E6.inc b/data/scripts/gUnk_0800F7E6.inc deleted file mode 100644 index 953fde86..00000000 --- a/data/scripts/gUnk_0800F7E6.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F7E6 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c diff --git a/data/scripts/gUnk_0800F7EB.inc b/data/scripts/gUnk_0800F7EB.inc deleted file mode 100644 index 3d459670..00000000 --- a/data/scripts/gUnk_0800F7EB.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F7EB -.byte 0xc -.byte 0x3 -.byte 0x25 diff --git a/data/scripts/gUnk_0800F7EE.inc b/data/scripts/gUnk_0800F7EE.inc deleted file mode 100644 index 944c3718..00000000 --- a/data/scripts/gUnk_0800F7EE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7EE -.byte 0xe diff --git a/data/scripts/gUnk_0800F7EF.inc b/data/scripts/gUnk_0800F7EF.inc deleted file mode 100644 index 11367ef6..00000000 --- a/data/scripts/gUnk_0800F7EF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7EF -.byte 0x0 diff --git a/data/scripts/gUnk_0800F7F0.inc b/data/scripts/gUnk_0800F7F0.inc deleted file mode 100644 index bc74cb92..00000000 --- a/data/scripts/gUnk_0800F7F0.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800F7F0 -_0807EA94 -.short 0x0c28 diff --git a/data/scripts/gUnk_0800F7F4.inc b/data/scripts/gUnk_0800F7F4.inc deleted file mode 100644 index 08dfcc8c..00000000 --- a/data/scripts/gUnk_0800F7F4.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7F4 -.byte 0x2 diff --git a/data/scripts/gUnk_0800F7F5.inc b/data/scripts/gUnk_0800F7F5.inc deleted file mode 100644 index 756de5ad..00000000 --- a/data/scripts/gUnk_0800F7F5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7F5 -.short 0x0000 diff --git a/data/scripts/gUnk_0800F7F7.inc b/data/scripts/gUnk_0800F7F7.inc deleted file mode 100644 index 2e69551b..00000000 --- a/data/scripts/gUnk_0800F7F7.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F7F7 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 diff --git a/data/scripts/gUnk_0800F7FC.inc b/data/scripts/gUnk_0800F7FC.inc deleted file mode 100644 index 4153960a..00000000 --- a/data/scripts/gUnk_0800F7FC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7FC -.byte 0x0 diff --git a/data/scripts/gUnk_0800F7FD.inc b/data/scripts/gUnk_0800F7FD.inc deleted file mode 100644 index 18c9cbd5..00000000 --- a/data/scripts/gUnk_0800F7FD.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7FD -.short 0x0b00 diff --git a/data/scripts/gUnk_0800F7FF.inc b/data/scripts/gUnk_0800F7FF.inc deleted file mode 100644 index ea7923f1..00000000 --- a/data/scripts/gUnk_0800F7FF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F7FF -.byte 0xc diff --git a/data/scripts/gUnk_0800F800.inc b/data/scripts/gUnk_0800F800.inc deleted file mode 100644 index 73788381..00000000 --- a/data/scripts/gUnk_0800F800.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F800 -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 diff --git a/data/scripts/gUnk_0800F805.inc b/data/scripts/gUnk_0800F805.inc deleted file mode 100644 index f6ae29d7..00000000 --- a/data/scripts/gUnk_0800F805.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F805 -.byte 0x4 -.byte 0x33 -.byte 0xc diff --git a/data/scripts/gUnk_0800F808.inc b/data/scripts/gUnk_0800F808.inc deleted file mode 100644 index 6bce11ac..00000000 --- a/data/scripts/gUnk_0800F808.inc +++ /dev/null @@ -1,232 +0,0 @@ -SCRIPT_START gUnk_0800F808 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x47 -.byte 0xc -.byte 0x9c -.byte 0xfa -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x4 -.byte 0x25 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x47 -.byte 0xc -.byte 0xc0 -.byte 0xfa -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x5 -.byte 0x25 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x5d -.byte 0x3c -.byte 0x6 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xe2 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xf9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x21 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0xe4 -.byte 0xfa -.byte 0x0 -.byte 0x8 -.byte 0x69 -.byte 0xc -.byte 0xf0 -.byte 0x0 -.byte 0x58 -.byte 0x2 -.byte 0x89 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x87 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x2d -.byte 0x3c -.byte 0x6 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x22 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x49 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x15 -.byte 0x3c -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xdd diff --git a/data/scripts/gUnk_0800F8EF.inc b/data/scripts/gUnk_0800F8EF.inc deleted file mode 100644 index 397b00d6..00000000 --- a/data/scripts/gUnk_0800F8EF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8EF -.byte 0x4c diff --git a/data/scripts/gUnk_0800F8F0.inc b/data/scripts/gUnk_0800F8F0.inc deleted file mode 100644 index 9ba8ee23..00000000 --- a/data/scripts/gUnk_0800F8F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F0 -.byte 0x9 diff --git a/data/scripts/gUnk_0800F8F1.inc b/data/scripts/gUnk_0800F8F1.inc deleted file mode 100644 index 0ee53ef7..00000000 --- a/data/scripts/gUnk_0800F8F1.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F1 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F8F2.inc b/data/scripts/gUnk_0800F8F2.inc deleted file mode 100644 index e2fd314d..00000000 --- a/data/scripts/gUnk_0800F8F2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F2 -.byte 0x31 diff --git a/data/scripts/gUnk_0800F8F3.inc b/data/scripts/gUnk_0800F8F3.inc deleted file mode 100644 index 4d0967ba..00000000 --- a/data/scripts/gUnk_0800F8F3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F3 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F8F4.inc b/data/scripts/gUnk_0800F8F4.inc deleted file mode 100644 index 60bde4ad..00000000 --- a/data/scripts/gUnk_0800F8F4.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F4 -.byte 0x1e diff --git a/data/scripts/gUnk_0800F8F5.inc b/data/scripts/gUnk_0800F8F5.inc deleted file mode 100644 index 8bde204a..00000000 --- a/data/scripts/gUnk_0800F8F5.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800F8F5 -.byte 0x0 -.byte 0x5c -.byte 0xc diff --git a/data/scripts/gUnk_0800F8F8.inc b/data/scripts/gUnk_0800F8F8.inc deleted file mode 100644 index 01353483..00000000 --- a/data/scripts/gUnk_0800F8F8.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F8F8 -.byte 0x23 diff --git a/data/scripts/gUnk_0800F8F9.inc b/data/scripts/gUnk_0800F8F9.inc deleted file mode 100644 index ce2fbabc..00000000 --- a/data/scripts/gUnk_0800F8F9.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800F8F9 -.byte 0x10 -.byte 0xe -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc diff --git a/data/scripts/gUnk_0800F900.inc b/data/scripts/gUnk_0800F900.inc deleted file mode 100644 index eb4fc475..00000000 --- a/data/scripts/gUnk_0800F900.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F900 -.short 0x3c15 diff --git a/data/scripts/gUnk_0800F902.inc b/data/scripts/gUnk_0800F902.inc deleted file mode 100644 index f02849a5..00000000 --- a/data/scripts/gUnk_0800F902.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0800F902 -_0807E078 0x0c0b -.short 0x4dd9 -.short 0x0809 -.short 0x0831 -.short 0x001e -.short 0x0c5c -.short 0x1024 -.short 0x000e -.short 0x0459 diff --git a/data/scripts/gUnk_0800F916.inc b/data/scripts/gUnk_0800F916.inc deleted file mode 100644 index 5d2bafce..00000000 --- a/data/scripts/gUnk_0800F916.inc +++ /dev/null @@ -1,49 +0,0 @@ -SCRIPT_START gUnk_0800F916 -Call sub_08063C14 -Call sub_08094D34 -Wait 0x001e -TextboxNoOverlapFollowPos 0x1025, 0x000e -_0807EA94 -Call sub_08063C5C -TextboxNoOverlapFollowPos 0x1026, 0x000e -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E8E4_1 -Call sub_08063C2C -TextboxNoOverlapFollowPos 0x1027, 0x0000 -_0807EA94 -Call sub_08063C74 -Wait 0x003c -Call sub_08063C14 -_0807E8E4_0 -TextboxNoOverlapFollowPos 0x1028, 0x000e -_0807EA94 -_0807E8E4_1 -TextboxNoOverlapFollowPos 0x1029, 0x0000 -_0807EA94 -_0807E8E4_0 -TextboxNoOverlapFollowPos 0x102a, 0x000e -_0807EA94 -Call sub_08063C14 -Call sub_08094D70 -SoundReq 0x0103 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Call sub_08063C14 -Call sub_08094D10 -Wait 0x001e -Call sub_08094E0C -Wait 0x001e -_0807E8E4_1 -Call sub_0807F3F8 -Wait 0x003c -TextboxNoOverlapFollowPos 0x102b, 0x0000 -_0807EA94 -_0807F034 0x000d -WaitPlayerAction8 -Call sub_0806DC3C -Call sub_080791BC -CallWithArg sub_0807F244, 0x0000000d -.short 0x0c4e -.short 0x00ff diff --git a/data/scripts/gUnk_0800F9F0.inc b/data/scripts/gUnk_0800F9F0.inc deleted file mode 100644 index bab942c3..00000000 --- a/data/scripts/gUnk_0800F9F0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F0 -.short 0x0000 diff --git a/data/scripts/gUnk_0800F9F2.inc b/data/scripts/gUnk_0800F9F2.inc deleted file mode 100644 index 6b6f43e7..00000000 --- a/data/scripts/gUnk_0800F9F2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F2 -.byte 0xb diff --git a/data/scripts/gUnk_0800F9F3.inc b/data/scripts/gUnk_0800F9F3.inc deleted file mode 100644 index 27975d22..00000000 --- a/data/scripts/gUnk_0800F9F3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F3 -.byte 0xc diff --git a/data/scripts/gUnk_0800F9F4.inc b/data/scripts/gUnk_0800F9F4.inc deleted file mode 100644 index bd4ba954..00000000 --- a/data/scripts/gUnk_0800F9F4.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F4 -.short 0xf5b1 diff --git a/data/scripts/gUnk_0800F9F6.inc b/data/scripts/gUnk_0800F9F6.inc deleted file mode 100644 index 5bc2894b..00000000 --- a/data/scripts/gUnk_0800F9F6.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F6 -.byte 0x7 diff --git a/data/scripts/gUnk_0800F9F7.inc b/data/scripts/gUnk_0800F9F7.inc deleted file mode 100644 index 0dbc4a29..00000000 --- a/data/scripts/gUnk_0800F9F7.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800F9F7 -.byte 0x8 diff --git a/data/scripts/gUnk_0800F9F8.inc b/data/scripts/gUnk_0800F9F8.inc deleted file mode 100644 index 409c328c..00000000 --- a/data/scripts/gUnk_0800F9F8.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800F9F8 -.short 0x140c -.short 0xf29d -.short 0x0807 -.short 0x49d6 -.short 0x0800 diff --git a/data/scripts/gUnk_0800FA02.inc b/data/scripts/gUnk_0800FA02.inc deleted file mode 100644 index f708cb2b..00000000 --- a/data/scripts/gUnk_0800FA02.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FA02 -Wait 0x00b7 -.byte 0x4e diff --git a/data/scripts/gUnk_0800FA07.inc b/data/scripts/gUnk_0800FA07.inc deleted file mode 100644 index a2b21a30..00000000 --- a/data/scripts/gUnk_0800FA07.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FA07 -.byte 0xc diff --git a/data/scripts/gUnk_0800FA08.inc b/data/scripts/gUnk_0800FA08.inc deleted file mode 100644 index 0b09498d..00000000 --- a/data/scripts/gUnk_0800FA08.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FA08 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FA09.inc b/data/scripts/gUnk_0800FA09.inc deleted file mode 100644 index f05952c3..00000000 --- a/data/scripts/gUnk_0800FA09.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FA09 -.short 0x0000 -.short 0x0b00 diff --git a/data/scripts/gUnk_0800FA0D.inc b/data/scripts/gUnk_0800FA0D.inc deleted file mode 100644 index 4d48ce5c..00000000 --- a/data/scripts/gUnk_0800FA0D.inc +++ /dev/null @@ -1,108 +0,0 @@ -SCRIPT_START gUnk_0800FA0D -.byte 0xc -.byte 0xb1 -.byte 0xf5 -.byte 0x7 -.byte 0x8 -.byte 0x5c -.byte 0xc -.byte 0x2c -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x9d -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0xdc -.byte 0x6 -.byte 0x8 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x88 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0x3c -.byte 0x6 -.byte 0x8 -.byte 0x2a -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x2 -.byte 0x4 -.byte 0x69 -.byte 0xc -.byte 0xd8 -.byte 0x0 -.byte 0x98 -.byte 0x3 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800FA54.inc b/data/scripts/gUnk_0800FA54.inc new file mode 100644 index 00000000..0b51b2e4 --- /dev/null +++ b/data/scripts/gUnk_0800FA54.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_0800FA54 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +SetEntityPositionRelative 0x039800d8 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/gUnk_0800FA78.inc index d62af1bf..fe2366d3 100644 --- a/data/scripts/gUnk_0800FA78.inc +++ b/data/scripts/gUnk_0800FA78.inc @@ -6,23 +6,5 @@ _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0c73 -.short 0x0078 -.short 0x01c0 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/gUnk_0800FA9C.inc similarity index 51% rename from data/scripts/gUnk_0801635C.inc rename to data/scripts/gUnk_0800FA9C.inc index d0aff840..303070de 100644 --- a/data/scripts/gUnk_0801635C.inc +++ b/data/scripts/gUnk_0800FA9C.inc @@ -1,9 +1,10 @@ -SCRIPT_START gUnk_0801635C +SCRIPT_START gUnk_0800FA9C +StartScript SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0078, 0x0050 +StopScript +_0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.byte 0x0 diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/gUnk_0800FAC0.inc index 202b3a20..26a1c150 100644 --- a/data/scripts/gUnk_0800FAC0.inc +++ b/data/scripts/gUnk_0800FAC0.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc index 06d7fca4..adc95fc2 100644 --- a/data/scripts/gUnk_0800FAE4.inc +++ b/data/scripts/gUnk_0800FAE4.inc @@ -2,5 +2,28 @@ SCRIPT_START gUnk_0800FAE4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -Call sub_0807F584 -.byte 0x6 +Call 0x0807f585 +_0807E078 +.short 0x0012 +.short 0x001a +.short 0x000e +.short 0x0002 +@ End of 4 parameters +CallWithArg +.short 0xf4f9 +.short 0x0807 +.short 0x027c +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf465 +.short 0x0807 +.short 0x00e8 +.short 0x0000 +@ End of 4 parameters +_0807EDD4 0x00e8, 0x0270 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_0800FAF3.inc b/data/scripts/gUnk_0800FAF3.inc deleted file mode 100644 index 0f932d1d..00000000 --- a/data/scripts/gUnk_0800FAF3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAF3 -.short 0x1214 diff --git a/data/scripts/gUnk_0800FAF5.inc b/data/scripts/gUnk_0800FAF5.inc deleted file mode 100644 index 6c76b8e0..00000000 --- a/data/scripts/gUnk_0800FAF5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAF5 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FAF6.inc b/data/scripts/gUnk_0800FAF6.inc deleted file mode 100644 index 00f8c4e5..00000000 --- a/data/scripts/gUnk_0800FAF6.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAF6 -.byte 0x1a diff --git a/data/scripts/gUnk_0800FAF7.inc b/data/scripts/gUnk_0800FAF7.inc deleted file mode 100644 index cbb90022..00000000 --- a/data/scripts/gUnk_0800FAF7.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAF7 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FAF8.inc b/data/scripts/gUnk_0800FAF8.inc deleted file mode 100644 index ea809c7c..00000000 --- a/data/scripts/gUnk_0800FAF8.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800FAF8 -.byte 0xe -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0xc diff --git a/data/scripts/gUnk_0800FAFD.inc b/data/scripts/gUnk_0800FAFD.inc deleted file mode 100644 index aad4b905..00000000 --- a/data/scripts/gUnk_0800FAFD.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAFD -.byte 0x14 diff --git a/data/scripts/gUnk_0800FAFE.inc b/data/scripts/gUnk_0800FAFE.inc deleted file mode 100644 index b6e56c6d..00000000 --- a/data/scripts/gUnk_0800FAFE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAFE -.byte 0xf9 diff --git a/data/scripts/gUnk_0800FAFF.inc b/data/scripts/gUnk_0800FAFF.inc deleted file mode 100644 index 70b8910d..00000000 --- a/data/scripts/gUnk_0800FAFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FAFF -.byte 0xf4 diff --git a/data/scripts/gUnk_0800FB00.inc b/data/scripts/gUnk_0800FB00.inc deleted file mode 100644 index a6ec0cae..00000000 --- a/data/scripts/gUnk_0800FB00.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FB00 -.byte 0x7 diff --git a/data/scripts/gUnk_0800FB01.inc b/data/scripts/gUnk_0800FB01.inc deleted file mode 100644 index 0ea92a29..00000000 --- a/data/scripts/gUnk_0800FB01.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FB01 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FB02.inc b/data/scripts/gUnk_0800FB02.inc deleted file mode 100644 index ba6e9447..00000000 --- a/data/scripts/gUnk_0800FB02.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FB02 -.short 0x027c diff --git a/data/scripts/gUnk_0800FB04.inc b/data/scripts/gUnk_0800FB04.inc deleted file mode 100644 index cd6fa411..00000000 --- a/data/scripts/gUnk_0800FB04.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FB04 -.short 0x0000 -.short 0x140c diff --git a/data/scripts/gUnk_0800FB08.inc b/data/scripts/gUnk_0800FB08.inc deleted file mode 100644 index bb95d840..00000000 --- a/data/scripts/gUnk_0800FB08.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FB08 -.short 0xf465 diff --git a/data/scripts/gUnk_0800FB0A.inc b/data/scripts/gUnk_0800FB0A.inc deleted file mode 100644 index 842689e6..00000000 --- a/data/scripts/gUnk_0800FB0A.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_0800FB0A -.byte 0x7 -.byte 0x8 -.byte 0xe8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xe8 -.byte 0x0 -.byte 0x70 -.byte 0x2 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x79 diff --git a/data/scripts/gUnk_0800FB2C.inc b/data/scripts/gUnk_0800FB2C.inc new file mode 100644 index 00000000..8a6d1083 --- /dev/null +++ b/data/scripts/gUnk_0800FB2C.inc @@ -0,0 +1,7 @@ +SCRIPT_START gUnk_0800FB2C +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800FB31.inc b/data/scripts/gUnk_0800FB31.inc deleted file mode 100644 index 8ac8fa60..00000000 --- a/data/scripts/gUnk_0800FB31.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_0800FB31 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/gUnk_0800FB44.inc index 3e81d840..0dba8ca8 100644 --- a/data/scripts/gUnk_0800FB44.inc +++ b/data/scripts/gUnk_0800FB44.inc @@ -3,10 +3,10 @@ StartScript _0807EF80 0x0008 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0080 -Call sub_08066D04 +Call 0x08066d05 StopScript WaitForSomething2 0x00000002 -Call sub_08066D14 +Call 0x08066d15 JumpIf 0x0004 MoveEntityToPlayer _0807EF80 0x0007 @@ -26,6 +26,75 @@ _0807E9D4 _0807E30C JumpIfNot 0xfffc _0807EF80 0x000b -.byte 0x28 -.byte 0xc -.byte 0x4 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0200 +_0807EDD4 0x00a0, 0x0268 +_0807EDD4 0x0070, 0x0268 +_0807EDD4 0x0070, 0x0208 +SetEntityPositionRelative 0x01a80078 +_0807EB44 0x0000 +_0807EF80 0x0001 +_0807E5F8 0x00000004 +_0807EF80 0x000a +_0807E30C +JumpIfNot 0xfffc +_0807EF80 0x000b +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0200 +_0807EDD4 0x00f8, 0x01a8 +SetEntityPositionRelative 0x01c80118 +_0807EB44 0x0002 +_0807EF80 0x0001 +_0807E5F8 0x00000004 +_0807EF80 0x000a +_0807E30C +JumpIfNot 0xfffc +_0807EF80 0x000b +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0200 +_0807EDD4 0x0118, 0x0260 +SetEntityPositionRelative 0x027000f8 +_0807EB44 0x0000 +_0807EF80 0x0001 +_0807E5F8 0x00000004 +_0807EF80 0x000a +CheckEntityInteractType +JumpIfNot 0xfffc +_0807EF80 0x000b +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +_0807EF80 0x0004 +WaitForSomething2 0x00000002 +_0807EF80 0x000d +SetEntityNonPlanarMovement 0x0040 +_0807EC94 0x0020 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EF80 0x000c +SetEntityNonPlanarMovement 0x0040 +_0807ECF4 0x0020 +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +Call 0x08066d4d +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800FBBB.inc b/data/scripts/gUnk_0800FBBB.inc deleted file mode 100644 index 418f5e0f..00000000 --- a/data/scripts/gUnk_0800FBBB.inc +++ /dev/null @@ -1,54 +0,0 @@ -SCRIPT_START gUnk_0800FBBB -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x73 -.byte 0xc -.byte 0xa0 -.byte 0x0 -.byte 0x68 -.byte 0x2 -.byte 0x73 -.byte 0xc -.byte 0x70 -.byte 0x0 -.byte 0x68 -.byte 0x2 -.byte 0x73 -.byte 0xc -.byte 0x70 -.byte 0x0 -.byte 0x8 -.byte 0x2 -.byte 0x69 -.byte 0xc diff --git a/data/scripts/gUnk_0800FBF0.inc b/data/scripts/gUnk_0800FBF0.inc deleted file mode 100644 index 26a37a5d..00000000 --- a/data/scripts/gUnk_0800FBF0.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FBF0 -.byte 0x78 -.byte 0x0 -.byte 0xa8 diff --git a/data/scripts/gUnk_0800FBF3.inc b/data/scripts/gUnk_0800FBF3.inc deleted file mode 100644 index 8114b485..00000000 --- a/data/scripts/gUnk_0800FBF3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBF3 -.short 0x6101 diff --git a/data/scripts/gUnk_0800FBF5.inc b/data/scripts/gUnk_0800FBF5.inc deleted file mode 100644 index 61ae4f2e..00000000 --- a/data/scripts/gUnk_0800FBF5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBF5 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FBF6.inc b/data/scripts/gUnk_0800FBF6.inc deleted file mode 100644 index a9e0082c..00000000 --- a/data/scripts/gUnk_0800FBF6.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBF6 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FBF8.inc b/data/scripts/gUnk_0800FBF8.inc deleted file mode 100644 index 48e69ee6..00000000 --- a/data/scripts/gUnk_0800FBF8.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBF8 -.byte 0x79 diff --git a/data/scripts/gUnk_0800FBF9.inc b/data/scripts/gUnk_0800FBF9.inc deleted file mode 100644 index fd7511fd..00000000 --- a/data/scripts/gUnk_0800FBF9.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBF9 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FBFA.inc b/data/scripts/gUnk_0800FBFA.inc deleted file mode 100644 index 80ad3291..00000000 --- a/data/scripts/gUnk_0800FBFA.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBFA -.byte 0x1 diff --git a/data/scripts/gUnk_0800FBFB.inc b/data/scripts/gUnk_0800FBFB.inc deleted file mode 100644 index 72e45f0b..00000000 --- a/data/scripts/gUnk_0800FBFB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBFB -.byte 0x0 diff --git a/data/scripts/gUnk_0800FBFC.inc b/data/scripts/gUnk_0800FBFC.inc deleted file mode 100644 index c514be46..00000000 --- a/data/scripts/gUnk_0800FBFC.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FBFC -.byte 0x28 -.byte 0xc -.byte 0x4 diff --git a/data/scripts/gUnk_0800FBFF.inc b/data/scripts/gUnk_0800FBFF.inc deleted file mode 100644 index 7324b708..00000000 --- a/data/scripts/gUnk_0800FBFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FBFF -.byte 0x0 diff --git a/data/scripts/gUnk_0800FC00.inc b/data/scripts/gUnk_0800FC00.inc deleted file mode 100644 index 8bb598f9..00000000 --- a/data/scripts/gUnk_0800FC00.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FC00 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FC01.inc b/data/scripts/gUnk_0800FC01.inc deleted file mode 100644 index e991fed2..00000000 --- a/data/scripts/gUnk_0800FC01.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FC01 -.short 0x7900 -.short 0x0a08 diff --git a/data/scripts/gUnk_0800FC05.inc b/data/scripts/gUnk_0800FC05.inc deleted file mode 100644 index 58d00fc8..00000000 --- a/data/scripts/gUnk_0800FC05.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FC05 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FC06.inc b/data/scripts/gUnk_0800FC06.inc deleted file mode 100644 index 2df03479..00000000 --- a/data/scripts/gUnk_0800FC06.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FC06 -_0807E30C diff --git a/data/scripts/gUnk_0800FC08.inc b/data/scripts/gUnk_0800FC08.inc deleted file mode 100644 index 394fef96..00000000 --- a/data/scripts/gUnk_0800FC08.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FC08 -.byte 0x5 diff --git a/data/scripts/gUnk_0800FC09.inc b/data/scripts/gUnk_0800FC09.inc deleted file mode 100644 index 39b96508..00000000 --- a/data/scripts/gUnk_0800FC09.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800FC09 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x79 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FC0E.inc b/data/scripts/gUnk_0800FC0E.inc deleted file mode 100644 index ca3a3558..00000000 --- a/data/scripts/gUnk_0800FC0E.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800FC0E -.short 0x000b -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FC24.inc b/data/scripts/gUnk_0800FC24.inc deleted file mode 100644 index 66f5447b..00000000 --- a/data/scripts/gUnk_0800FC24.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START gUnk_0800FC24 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x00f8, 0x01a8 -SetEntityPositionRelative 0x01c80118 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -_0807E30C -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x0118, 0x0260 -SetEntityPositionRelative 0x027000f8 -_0807EB44 0x0000 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -CheckEntityInteractType -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -_0807EF80 0x0004 -WaitForSomething2 0x00000002 -_0807EF80 0x000d -SetEntityNonPlanarMovement 0x0040 -_0807EC94 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EF80 0x000c -SetEntityNonPlanarMovement 0x0040 -.short 0x0871 diff --git a/data/scripts/gUnk_0800FCEA.inc b/data/scripts/gUnk_0800FCEA.inc deleted file mode 100644 index b7a6d6b9..00000000 --- a/data/scripts/gUnk_0800FCEA.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FCEA -.short 0x0020 -.short 0x0861 diff --git a/data/scripts/gUnk_0800FCEE.inc b/data/scripts/gUnk_0800FCEE.inc deleted file mode 100644 index 19e10314..00000000 --- a/data/scripts/gUnk_0800FCEE.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FCEE -.short 0x0006 -.short 0x0879 diff --git a/data/scripts/gUnk_0800FCF2.inc b/data/scripts/gUnk_0800FCF2.inc deleted file mode 100644 index dee9566c..00000000 --- a/data/scripts/gUnk_0800FCF2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCF2 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FCF3.inc b/data/scripts/gUnk_0800FCF3.inc deleted file mode 100644 index 0d8e6f96..00000000 --- a/data/scripts/gUnk_0800FCF3.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCF3 -.short 0x2800 diff --git a/data/scripts/gUnk_0800FCF5.inc b/data/scripts/gUnk_0800FCF5.inc deleted file mode 100644 index dd3ea251..00000000 --- a/data/scripts/gUnk_0800FCF5.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCF5 -.short 0x040c diff --git a/data/scripts/gUnk_0800FCF7.inc b/data/scripts/gUnk_0800FCF7.inc deleted file mode 100644 index e979829f..00000000 --- a/data/scripts/gUnk_0800FCF7.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCF7 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FCF8.inc b/data/scripts/gUnk_0800FCF8.inc deleted file mode 100644 index db7535d3..00000000 --- a/data/scripts/gUnk_0800FCF8.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCF8 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FCFA.inc b/data/scripts/gUnk_0800FCFA.inc deleted file mode 100644 index 336031e2..00000000 --- a/data/scripts/gUnk_0800FCFA.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCFA -.byte 0x33 diff --git a/data/scripts/gUnk_0800FCFB.inc b/data/scripts/gUnk_0800FCFB.inc deleted file mode 100644 index 74d38000..00000000 --- a/data/scripts/gUnk_0800FCFB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCFB -.byte 0xc diff --git a/data/scripts/gUnk_0800FCFC.inc b/data/scripts/gUnk_0800FCFC.inc deleted file mode 100644 index e9bd84a0..00000000 --- a/data/scripts/gUnk_0800FCFC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCFC -.short 0x0002 diff --git a/data/scripts/gUnk_0800FCFE.inc b/data/scripts/gUnk_0800FCFE.inc deleted file mode 100644 index a9de73b3..00000000 --- a/data/scripts/gUnk_0800FCFE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCFE -.byte 0x0 diff --git a/data/scripts/gUnk_0800FCFF.inc b/data/scripts/gUnk_0800FCFF.inc deleted file mode 100644 index 33aefa42..00000000 --- a/data/scripts/gUnk_0800FCFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FCFF -.byte 0x0 diff --git a/data/scripts/gUnk_0800FD00.inc b/data/scripts/gUnk_0800FD00.inc deleted file mode 100644 index d5a025ca..00000000 --- a/data/scripts/gUnk_0800FD00.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FD00 -.byte 0xb diff --git a/data/scripts/gUnk_0800FD01.inc b/data/scripts/gUnk_0800FD01.inc deleted file mode 100644 index 67d4d124..00000000 --- a/data/scripts/gUnk_0800FD01.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FD01 -.byte 0xc -.byte 0x4d -.byte 0x6d diff --git a/data/scripts/gUnk_0800FD04.inc b/data/scripts/gUnk_0800FD04.inc deleted file mode 100644 index 99de7f42..00000000 --- a/data/scripts/gUnk_0800FD04.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FD04 -.byte 0x6 diff --git a/data/scripts/gUnk_0800FD05.inc b/data/scripts/gUnk_0800FD05.inc deleted file mode 100644 index 26d17a5f..00000000 --- a/data/scripts/gUnk_0800FD05.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800FD05 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc index fc4feb68..fbf7f336 100644 --- a/data/scripts/gUnk_0800FD0C.inc +++ b/data/scripts/gUnk_0800FD0C.inc @@ -1,4 +1,41 @@ SCRIPT_START gUnk_0800FD0C CheckLocalFlag 0x00cd JumpIf 0x003e -.short 0x0c33 +WaitForSomething2 0x00000010 +CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 +JumpIfNot 0xfff6 +CheckLocalFlag 0x00cd +JumpIf 0x0030 +_0807E864 +Call 0x0807f9a5 +TextboxNoOverlapFollowPos +.short 0x2506 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800fd80 +WaitForSomething2 0x00000008 +_0807E878 +Jump 0xffcc +CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +TextboxNoOverlapFollowPos +.short 0x106c +.short 0x0000 +@ End of 2 parameters +_0807EA94 +StartPlayerScript 0x0800fd80 +WaitForSomething2 0x00000008 +_0807E878 +Jump 0xffd4 +.short 0x0000 +SetEntityNonPlanarMovement 0x0080 +_0807EC64 0x0020 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800FD16.inc b/data/scripts/gUnk_0800FD16.inc deleted file mode 100644 index 8bea3c87..00000000 --- a/data/scripts/gUnk_0800FD16.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800FD16 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x16 -.byte 0x10 -.byte 0xc8 -.byte 0x0 -.byte 0xc0 -.byte 0x3 -.byte 0x40 diff --git a/data/scripts/gUnk_0800FD21.inc b/data/scripts/gUnk_0800FD21.inc deleted file mode 100644 index da112cc2..00000000 --- a/data/scripts/gUnk_0800FD21.inc +++ /dev/null @@ -1,96 +0,0 @@ -SCRIPT_START gUnk_0800FD21 -.byte 0x10 -.byte 0x5 -.byte 0x8 -.byte 0xf6 -.byte 0xff -.byte 0x12 -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x30 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0x5c -.byte 0xc -.byte 0x6 -.byte 0x25 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0x80 -.byte 0xfd -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xcc -.byte 0xff -.byte 0x16 -.byte 0x10 -.byte 0xc8 -.byte 0x0 -.byte 0xc0 -.byte 0x3 -.byte 0x40 -.byte 0x10 -.byte 0x5 -.byte 0x8 -.byte 0xf6 -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0x5c -.byte 0xc -.byte 0x6c -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0x80 -.byte 0xfd -.byte 0x0 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xd4 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/gUnk_0800FD80.inc deleted file mode 100644 index b01200e6..00000000 --- a/data/scripts/gUnk_0800FD80.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_0800FD80 -SetEntityNonPlanarMovement 0x0080 -_0807EC64 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call sub_080791BC -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc index 2722de54..74256346 100644 --- a/data/scripts/gUnk_0800FDA0.inc +++ b/data/scripts/gUnk_0800FDA0.inc @@ -9,8 +9,107 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_08069888 +Call 0x08069889 _0807EA94 _0807E878 Jump 0xffea .short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E9D4 +SetEntityNonPlanarMovement 0x0040 +StopScript +Call 0x08069a61 +Call 0x0806991d +StopScript +StartScript +Call 0x08069acd +JumpIf 0x000c +_0807EE30 +JumpIfNot 0xffee +Jump 0xffde +StopScript +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0006 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0006 +_0807EF80 0x0000 +Wait 0x003c +Call 0x08069a3d +Jump 0xffa8 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E9D4 +SetEntityNonPlanarMovement 0x0040 +StopScript +Call 0x08069aa9 +Call 0x080699ad +StopScript +StartScript +Call 0x08069acd +JumpIf 0x000c +_0807EE30 +JumpIfNot 0xffee +Jump 0xffde +StopScript +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0006 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x001e +_0807EB44 0x0006 +_0807EF80 0x0000 +Wait 0x003c +Call 0x08069a85 +Jump 0xffa8 +.short 0x0000 +StartScript +CheckInventory1 0x0012 +JumpIf 0x004a +_0807EB44 0x0006 +_0807E9D4 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +StopScript +StopScript +StartScript +_0807EF80 0x000b +Call 0x080642b9 +CheckEntityInteractType +JumpIfNot 0xffee +StopScript +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Call 0x08064429 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffcc +_0807EF80 0x0008 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800FDCC.inc b/data/scripts/gUnk_0800FDCC.inc deleted file mode 100644 index 55fccfd9..00000000 --- a/data/scripts/gUnk_0800FDCC.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800FDCC -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -SetEntityNonPlanarMovement 0x0040 -StopScript -Call sub_08069A60 -Call sub_0806991C -StopScript -StartScript diff --git a/data/scripts/gUnk_0800FDF2.inc b/data/scripts/gUnk_0800FDF2.inc deleted file mode 100644 index afb0db10..00000000 --- a/data/scripts/gUnk_0800FDF2.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FDF2 -.byte 0xb diff --git a/data/scripts/gUnk_0800FDF3.inc b/data/scripts/gUnk_0800FDF3.inc deleted file mode 100644 index c35fa031..00000000 --- a/data/scripts/gUnk_0800FDF3.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800FDF3 -.byte 0xc -.byte 0xcd -.byte 0x9a -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FDFA.inc b/data/scripts/gUnk_0800FDFA.inc deleted file mode 100644 index d423efaf..00000000 --- a/data/scripts/gUnk_0800FDFA.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FDFA -.short 0x000c diff --git a/data/scripts/gUnk_0800FDFC.inc b/data/scripts/gUnk_0800FDFC.inc deleted file mode 100644 index 44b9a2f2..00000000 --- a/data/scripts/gUnk_0800FDFC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FDFC -_0807EE30 diff --git a/data/scripts/gUnk_0800FDFE.inc b/data/scripts/gUnk_0800FDFE.inc deleted file mode 100644 index 05cbc9f7..00000000 --- a/data/scripts/gUnk_0800FDFE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FDFE -.byte 0x5 diff --git a/data/scripts/gUnk_0800FDFF.inc b/data/scripts/gUnk_0800FDFF.inc deleted file mode 100644 index a751c61c..00000000 --- a/data/scripts/gUnk_0800FDFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FDFF -.byte 0x8 diff --git a/data/scripts/gUnk_0800FE00.inc b/data/scripts/gUnk_0800FE00.inc deleted file mode 100644 index 1e5aa79f..00000000 --- a/data/scripts/gUnk_0800FE00.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE00 -.byte 0xee diff --git a/data/scripts/gUnk_0800FE01.inc b/data/scripts/gUnk_0800FE01.inc deleted file mode 100644 index dc0a4b1f..00000000 --- a/data/scripts/gUnk_0800FE01.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE01 -.byte 0xff diff --git a/data/scripts/gUnk_0800FE02.inc b/data/scripts/gUnk_0800FE02.inc deleted file mode 100644 index b02cc101..00000000 --- a/data/scripts/gUnk_0800FE02.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE02 -.short 0x0803 diff --git a/data/scripts/gUnk_0800FE04.inc b/data/scripts/gUnk_0800FE04.inc deleted file mode 100644 index 27f5f86a..00000000 --- a/data/scripts/gUnk_0800FE04.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE04 -.short 0xffde diff --git a/data/scripts/gUnk_0800FE06.inc b/data/scripts/gUnk_0800FE06.inc deleted file mode 100644 index dde1e4b5..00000000 --- a/data/scripts/gUnk_0800FE06.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE06 -.byte 0x2 diff --git a/data/scripts/gUnk_0800FE07.inc b/data/scripts/gUnk_0800FE07.inc deleted file mode 100644 index 77deec42..00000000 --- a/data/scripts/gUnk_0800FE07.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE07 -.byte 0x4 diff --git a/data/scripts/gUnk_0800FE08.inc b/data/scripts/gUnk_0800FE08.inc deleted file mode 100644 index 8aed1d89..00000000 --- a/data/scripts/gUnk_0800FE08.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FE08 -.byte 0x61 diff --git a/data/scripts/gUnk_0800FE09.inc b/data/scripts/gUnk_0800FE09.inc deleted file mode 100644 index 819f3a14..00000000 --- a/data/scripts/gUnk_0800FE09.inc +++ /dev/null @@ -1,56 +0,0 @@ -SCRIPT_START gUnk_0800FE09 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0x9a -.byte 0x6 -.byte 0x8 -.byte 0x3 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FE40.inc b/data/scripts/gUnk_0800FE40.inc deleted file mode 100644 index 2c66c8e8..00000000 --- a/data/scripts/gUnk_0800FE40.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0800FE40 -.short 0xffa8 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FE44.inc b/data/scripts/gUnk_0800FE44.inc deleted file mode 100644 index 3b95f478..00000000 --- a/data/scripts/gUnk_0800FE44.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0800FE44 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -SetEntityNonPlanarMovement 0x0040 -StopScript -Call sub_08069AA8 -.short 0x0c0b -.short 0x99ad diff --git a/data/scripts/gUnk_0800FE64.inc b/data/scripts/gUnk_0800FE64.inc deleted file mode 100644 index 03f17235..00000000 --- a/data/scripts/gUnk_0800FE64.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0800FE64 -_0807E078 0x0402 -StartScript -Call sub_08069ACC -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffee -Jump 0xffde -StopScript -_0807EB44 0x0002 -.short 0x0879 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FE88.inc b/data/scripts/gUnk_0800FE88.inc deleted file mode 100644 index 9dfb7dbd..00000000 --- a/data/scripts/gUnk_0800FE88.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0800FE88 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x003c -Call sub_08069A84 -Jump 0xffa8 -.short 0x0000 diff --git a/data/scripts/gUnk_0800FEBC.inc b/data/scripts/gUnk_0800FEBC.inc deleted file mode 100644 index 2596aca9..00000000 --- a/data/scripts/gUnk_0800FEBC.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_0800FEBC -StartScript -CheckInventory1 0x0012 -JumpIf 0x004a -_0807EB44 0x0006 -_0807E9D4 -CallWithArg sub_0807F3D8, 0x00000008 -StopScript -StopScript -StartScript -_0807EF80 0x000b -Call sub_080642B8 -CheckEntityInteractType -JumpIfNot 0xffee -StopScript -_0807E864 diff --git a/data/scripts/gUnk_0800FEF0.inc b/data/scripts/gUnk_0800FEF0.inc deleted file mode 100644 index 94aa905f..00000000 --- a/data/scripts/gUnk_0800FEF0.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FEF0 -_0807EB74 diff --git a/data/scripts/gUnk_0800FEF2.inc b/data/scripts/gUnk_0800FEF2.inc deleted file mode 100644 index d625c7d9..00000000 --- a/data/scripts/gUnk_0800FEF2.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0800FEF2 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FEF9.inc b/data/scripts/gUnk_0800FEF9.inc deleted file mode 100644 index 1f786b7c..00000000 --- a/data/scripts/gUnk_0800FEF9.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FEF9 -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0800FEFC.inc b/data/scripts/gUnk_0800FEFC.inc deleted file mode 100644 index b4a70e1a..00000000 --- a/data/scripts/gUnk_0800FEFC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FEFC -.short 0x0c0b diff --git a/data/scripts/gUnk_0800FEFE.inc b/data/scripts/gUnk_0800FEFE.inc deleted file mode 100644 index 2a770ed0..00000000 --- a/data/scripts/gUnk_0800FEFE.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FEFE -.byte 0x29 -.byte 0x44 -.byte 0x6 diff --git a/data/scripts/gUnk_0800FF01.inc b/data/scripts/gUnk_0800FF01.inc deleted file mode 100644 index 01b6dc34..00000000 --- a/data/scripts/gUnk_0800FF01.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FF01 -.short 0x5908 diff --git a/data/scripts/gUnk_0800FF03.inc b/data/scripts/gUnk_0800FF03.inc deleted file mode 100644 index 884ddfb3..00000000 --- a/data/scripts/gUnk_0800FF03.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FF03 -.byte 0x4 diff --git a/data/scripts/gUnk_0800FF04.inc b/data/scripts/gUnk_0800FF04.inc deleted file mode 100644 index 28f5293d..00000000 --- a/data/scripts/gUnk_0800FF04.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FF04 -.byte 0x31 diff --git a/data/scripts/gUnk_0800FF05.inc b/data/scripts/gUnk_0800FF05.inc deleted file mode 100644 index c03ba842..00000000 --- a/data/scripts/gUnk_0800FF05.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FF05 -.byte 0x8 diff --git a/data/scripts/gUnk_0800FF06.inc b/data/scripts/gUnk_0800FF06.inc deleted file mode 100644 index 0c5ecc22..00000000 --- a/data/scripts/gUnk_0800FF06.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FF06 -.short 0x000f diff --git a/data/scripts/gUnk_0800FF08.inc b/data/scripts/gUnk_0800FF08.inc deleted file mode 100644 index 854f0268..00000000 --- a/data/scripts/gUnk_0800FF08.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0800FF08 -_0807E878 -Jump 0xffcc -_0807EF80 0x0008 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc index e3c6eed5..bf31cb48 100644 --- a/data/scripts/gUnk_0800FF18.inc +++ b/data/scripts/gUnk_0800FF18.inc @@ -4,4 +4,33 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -.short 0x140c +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +StopScript +StopScript +StartScript +_0807EF80 0x000b +Call 0x08064199 +CheckEntityInteractType +JumpIfNot 0xffee +StopScript +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Call 0x08064429 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffcc +_0807EF80 0x0008 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800FF2A.inc b/data/scripts/gUnk_0800FF2A.inc deleted file mode 100644 index 3a4ea9a8..00000000 --- a/data/scripts/gUnk_0800FF2A.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_0800FF2A -.short 0xf3d9 -.short 0x0807 -.short 0x0008 -.short 0x0000 -.short 0x0402 -.short 0x0402 -.short 0x0401 -.short 0x0879 -.short 0x000b -.short 0x0c0b -.short 0x4199 -.short 0x0806 -.short 0x0418 -.short 0x0805 -.short 0xffee -.short 0x0402 -.short 0x0443 -.short 0x0463 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0008 -.short 0x0000 -.short 0x0c0b -.short 0x4429 -.short 0x0806 -.short 0x0459 -.short 0x0831 -.short 0x000f -.short 0x0444 -.short 0x0803 -.short 0xffcc -.short 0x0879 -.short 0x0008 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc index f9826974..e990d07e 100644 --- a/data/scripts/gUnk_0800FF74.inc +++ b/data/scripts/gUnk_0800FF74.inc @@ -2,8 +2,13 @@ SCRIPT_START gUnk_0800FF74 StartScript _0807EB44 0x0002 _0807E9D4 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_080644A4 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Call 0x080644a5 ClearLocalFlag 0x00c7 StopScript StopScript @@ -12,6 +17,112 @@ _0807EF80 0x000a CheckLocalFlag 0x00ce JumpIf 0x002c _0807EF80 0x000b -Call sub_08064198 -.short 0x0812 -.short 0x00c7 +Call 0x08064199 +CheckLocalFlag 0x00c7 +JumpIfNot 0x001a +Call 0x08064489 +CheckPlayerInRegion2 0x4040 +JumpIfNot 0x000c +Call 0x08064471 +JumpIf 0x004a +CheckEntityInteractType +JumpIfNot 0xffc2 +StopScript +SetLocalFlag 0x00c7 +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +CheckInventory1 0x0048 +JumpIf 0x000c +TextboxNoOverlap 0x3401 +_0807EA94 +Jump 0x006a +CheckLocalFlag 0x00ce +JumpIfNot 0x000c +TextboxNoOverlap 0x340b +_0807EA94 +Jump 0x0058 +TextboxNoOverlap 0x3402 +_0807EA94 +Jump 0x004e +StopScript +_0807E888 +Call 0x0807f595 +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x00cd +TextboxNoOverlap 0x340a +_0807EA94 +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x000c +.short 0x0000 +@ End of 4 parameters +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0018, 0x0108 +_0807EB44 0x0002 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +SetLocalFlag 0x00ce +Call 0x080644a5 +CallWithArg +.short 0xf5b1 +.short 0x0807 +.short 0x000a +.short 0x0000 +@ End of 4 parameters +_0807E878 +Jump 0xff1e +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +_0807EB44 0x0004 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd0 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800FFB0.inc b/data/scripts/gUnk_0800FFB0.inc deleted file mode 100644 index da0ea75d..00000000 --- a/data/scripts/gUnk_0800FFB0.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FFB0 -JumpIfNot 0x001a -Call sub_08064488 -.byte 0x17 diff --git a/data/scripts/gUnk_0800FFBB.inc b/data/scripts/gUnk_0800FFBB.inc deleted file mode 100644 index 1f1d07c0..00000000 --- a/data/scripts/gUnk_0800FFBB.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_0800FFBB -.byte 0x8 -.byte 0x40 -.byte 0x40 -.byte 0x5 -.byte 0x8 -.byte 0xc -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x71 -.byte 0x44 -.byte 0x6 -.byte 0x8 -.byte 0x4 -.byte 0x8 -.byte 0x4a -.byte 0x0 -.byte 0x18 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xc2 -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x2a -.byte 0x8 diff --git a/data/scripts/gUnk_0800FFD6.inc b/data/scripts/gUnk_0800FFD6.inc deleted file mode 100644 index fed76005..00000000 --- a/data/scripts/gUnk_0800FFD6.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START gUnk_0800FFD6 -.short 0x00c7 -.short 0x0443 -.short 0x0463 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0008 -.short 0x0000 -.short 0x080f -.short 0x0048 -.short 0x0804 -.short 0x000c diff --git a/data/scripts/gUnk_0800FFEE.inc b/data/scripts/gUnk_0800FFEE.inc deleted file mode 100644 index 70a8ec79..00000000 --- a/data/scripts/gUnk_0800FFEE.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FFEE -TextboxNoOverlap 0x3401 -_0807EA94 -.short 0x0803 diff --git a/data/scripts/gUnk_0800FFF6.inc b/data/scripts/gUnk_0800FFF6.inc deleted file mode 100644 index 9a227734..00000000 --- a/data/scripts/gUnk_0800FFF6.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0800FFF6 -.short 0x006a -.short 0x0812 -.short 0x00ce diff --git a/data/scripts/gUnk_0800FFFC.inc b/data/scripts/gUnk_0800FFFC.inc deleted file mode 100644 index 8d498d5f..00000000 --- a/data/scripts/gUnk_0800FFFC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FFFC -.byte 0x5 diff --git a/data/scripts/gUnk_0800FFFD.inc b/data/scripts/gUnk_0800FFFD.inc deleted file mode 100644 index a128975b..00000000 --- a/data/scripts/gUnk_0800FFFD.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FFFD -.short 0x0c08 diff --git a/data/scripts/gUnk_0800FFFF.inc b/data/scripts/gUnk_0800FFFF.inc deleted file mode 100644 index ebd79cd4..00000000 --- a/data/scripts/gUnk_0800FFFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0800FFFF -.byte 0x0 diff --git a/data/scripts/gUnk_08010000.inc b/data/scripts/gUnk_08010000.inc deleted file mode 100644 index 1cd1f602..00000000 --- a/data/scripts/gUnk_08010000.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010000 -.byte 0x5b diff --git a/data/scripts/gUnk_08010001.inc b/data/scripts/gUnk_08010001.inc deleted file mode 100644 index cae61ada..00000000 --- a/data/scripts/gUnk_08010001.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010001 -.byte 0x8 diff --git a/data/scripts/gUnk_08010002.inc b/data/scripts/gUnk_08010002.inc deleted file mode 100644 index c9ae46bc..00000000 --- a/data/scripts/gUnk_08010002.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010002 -.byte 0xb diff --git a/data/scripts/gUnk_08010003.inc b/data/scripts/gUnk_08010003.inc deleted file mode 100644 index 5d0de773..00000000 --- a/data/scripts/gUnk_08010003.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010003 -.short 0x5934 diff --git a/data/scripts/gUnk_08010005.inc b/data/scripts/gUnk_08010005.inc deleted file mode 100644 index 8ce7e773..00000000 --- a/data/scripts/gUnk_08010005.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010005 -.short 0x0304 diff --git a/data/scripts/gUnk_08010007.inc b/data/scripts/gUnk_08010007.inc deleted file mode 100644 index d648f0dd..00000000 --- a/data/scripts/gUnk_08010007.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010007 -.byte 0x8 diff --git a/data/scripts/gUnk_08010008.inc b/data/scripts/gUnk_08010008.inc deleted file mode 100644 index de2257b7..00000000 --- a/data/scripts/gUnk_08010008.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010008 -.byte 0x58 diff --git a/data/scripts/gUnk_08010009.inc b/data/scripts/gUnk_08010009.inc deleted file mode 100644 index 113ed8c9..00000000 --- a/data/scripts/gUnk_08010009.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010009 -.byte 0x0 diff --git a/data/scripts/gUnk_0801000A.inc b/data/scripts/gUnk_0801000A.inc deleted file mode 100644 index 4080b6d6..00000000 --- a/data/scripts/gUnk_0801000A.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801000A -.short 0x085b diff --git a/data/scripts/gUnk_0801000C.inc b/data/scripts/gUnk_0801000C.inc deleted file mode 100644 index 3e3efeea..00000000 --- a/data/scripts/gUnk_0801000C.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801000C -.byte 0x2 diff --git a/data/scripts/gUnk_0801000D.inc b/data/scripts/gUnk_0801000D.inc deleted file mode 100644 index 9c9307db..00000000 --- a/data/scripts/gUnk_0801000D.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801000D -.byte 0x34 diff --git a/data/scripts/gUnk_0801000E.inc b/data/scripts/gUnk_0801000E.inc deleted file mode 100644 index e9e445b3..00000000 --- a/data/scripts/gUnk_0801000E.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801000E -.byte 0x59 diff --git a/data/scripts/gUnk_0801000F.inc b/data/scripts/gUnk_0801000F.inc deleted file mode 100644 index 82484056..00000000 --- a/data/scripts/gUnk_0801000F.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_0801000F -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0x4e -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x45 -.byte 0x4 diff --git a/data/scripts/gUnk_08010018.inc b/data/scripts/gUnk_08010018.inc deleted file mode 100644 index d5fb7c34..00000000 --- a/data/scripts/gUnk_08010018.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08010018 -.byte 0xb -.byte 0xc -.byte 0x95 diff --git a/data/scripts/gUnk_0801001B.inc b/data/scripts/gUnk_0801001B.inc deleted file mode 100644 index 071bb38c..00000000 --- a/data/scripts/gUnk_0801001B.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801001B -.short 0x07f5 diff --git a/data/scripts/gUnk_0801001D.inc b/data/scripts/gUnk_0801001D.inc deleted file mode 100644 index b68e92d8..00000000 --- a/data/scripts/gUnk_0801001D.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0801001D -.short 0x4308 -.short 0x6304 -.short 0x0c04 diff --git a/data/scripts/gUnk_08010023.inc b/data/scripts/gUnk_08010023.inc deleted file mode 100644 index e0ae33ff..00000000 --- a/data/scripts/gUnk_08010023.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_08010023 -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0xa -.byte 0x34 -.byte 0x59 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010044.inc b/data/scripts/gUnk_08010044.inc deleted file mode 100644 index 4fe595b5..00000000 --- a/data/scripts/gUnk_08010044.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_08010044 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0018, 0x0108 -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000008 -SetLocalFlag 0x00ce -Call sub_080644A4 -CallWithArg sub_0807F5B0, 0x0000000a -_0807E878 -Jump 0xff1e -.short 0x0000 -.short 0x0401 -.short 0x0453 -.short 0x0879 -.short 0x000a -.short 0x0861 -.short 0x0004 -.short 0x140c -.short 0x72b1 -.short 0x0806 -.short 0x0000 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 diff --git a/data/scripts/gUnk_08010098.inc b/data/scripts/gUnk_08010098.inc deleted file mode 100644 index d7fcc70d..00000000 --- a/data/scripts/gUnk_08010098.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010098 -.byte 0x63 diff --git a/data/scripts/gUnk_08010099.inc b/data/scripts/gUnk_08010099.inc deleted file mode 100644 index 5ce5f5be..00000000 --- a/data/scripts/gUnk_08010099.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_08010099 -.short 0x0c04 -.short 0xb114 -.short 0x0672 -.short 0x0408 -.short 0x0000 -.short 0x5a00 -.short 0x0108 -.short 0x590a -.short 0x3104 -.short 0x0f08 -.short 0x4400 -.short 0x6104 -.short 0x0408 -.short 0x0c00 -.short 0xb114 -.short 0x0672 -.short 0x0008 -.short 0x0000 -.short 0x0300 -.short 0xd008 diff --git a/data/scripts/gUnk_080100C1.inc b/data/scripts/gUnk_080100C1.inc deleted file mode 100644 index 9f9977f0..00000000 --- a/data/scripts/gUnk_080100C1.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_080100C1 -.byte 0xff -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc index b9bce9cf..186fda84 100644 --- a/data/scripts/gUnk_080100C8.inc +++ b/data/scripts/gUnk_080100C8.inc @@ -1,14 +1,132 @@ SCRIPT_START gUnk_080100C8 StartScript -Call sub_08061FE4 -Call sub_08061E70 +Call 0x08061fe5 +Call 0x08061e71 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_08061FE4 -Call sub_08062048 +Call 0x08061fe5 +Call 0x08062049 _0807EA94 -.byte 0x44 +_0807E878 +Jump 0xffe4 +.short 0x0000 +StartScript +Call 0x08061fe5 +Call 0x08061e71 +_0807EF80 0x000a +StopScript +Wait 0x003c +Call 0x08061e91 +Jump 0xfff4 +.short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlapFollow 0x4f22 +_0807EA94 +_0807E878 +Jump 0xffec +StartScript +_0807EF80 0x0001 +Call 0x0806c355 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CheckRoomFlag 0x0001 +JumpIf 0x0034 +TextboxNoOverlapFollowPos +.short 0x3001 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807E3E8 +JumpIfNot 0x002e +Call 0x080a1609 +_0807EA94 +_0807E878 +CallWithArg +.short 0x1551 +.short 0x080a +.short 0x01ac +.short 0x0801 +@ End of 4 parameters +JumpIfNot 0xffca +SoundReq2 0x0015 +SetRoomFlag 0x0001 +Jump 0xffbe +Call 0x080a1609 +_0807EA94 +_0807E878 +Jump 0xffb0 +StartScript +_0807EF80 0x0008 +Call 0x080a1649 +StopScript +Call 0x080a1271 +_0807E864 +Call 0x0807df29 +TextboxNoOverlapFollowPos +.short 0x3004 +.short 0x0007 +@ End of 2 parameters +_0807EA94 +SoundReq0x80100000 +_0807E778 0x0004 +DoFade5 +WaitFor_2 +CallWithArg +.short 0xf75d +.short 0x0807 +.short 0x0378 +.short 0x0340 +@ End of 4 parameters +Call 0x080791bd +Call 0x0807fb75 +_0807E8E4_1 +Call 0x0807f169 +Call 0x080a1389 +Call 0x0806ec39 +StartScript +MoveEntityToPlayer +Call 0x0807f845 +CameraTargetPlayer +StopScript +_0807E778 0x0004 +DoFade4 +WaitFor_2 +SoundReq2 0xffff +Call 0x080a13b5 +_0807EA94 +JumpIfNot 0x0018 +Call 0x080a13e9 +WaitPlayerAction8 +Call 0x080a1461 +_0807EA94 +Call 0x080a14a9 +Call 0x0807df51 +_0807E878 +CallWithArg +.short 0xf5b1 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +ClearRoomFlag 0x0001 +Call 0x080a169d +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080100F5.inc b/data/scripts/gUnk_080100F5.inc deleted file mode 100644 index 8a8ad5fa..00000000 --- a/data/scripts/gUnk_080100F5.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_080100F5 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xe4 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_080100FC.inc b/data/scripts/gUnk_080100FC.inc deleted file mode 100644 index 291eb908..00000000 --- a/data/scripts/gUnk_080100FC.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080100FC -StartScript diff --git a/data/scripts/gUnk_080100FE.inc b/data/scripts/gUnk_080100FE.inc deleted file mode 100644 index 1712947c..00000000 --- a/data/scripts/gUnk_080100FE.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080100FE -.byte 0xb diff --git a/data/scripts/gUnk_080100FF.inc b/data/scripts/gUnk_080100FF.inc deleted file mode 100644 index 0f7d435c..00000000 --- a/data/scripts/gUnk_080100FF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080100FF -.byte 0xc diff --git a/data/scripts/gUnk_08010100.inc b/data/scripts/gUnk_08010100.inc deleted file mode 100644 index d03a986a..00000000 --- a/data/scripts/gUnk_08010100.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010100 -.short 0x1fe5 diff --git a/data/scripts/gUnk_08010102.inc b/data/scripts/gUnk_08010102.inc deleted file mode 100644 index 5994ce71..00000000 --- a/data/scripts/gUnk_08010102.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010102 -.byte 0x6 diff --git a/data/scripts/gUnk_08010103.inc b/data/scripts/gUnk_08010103.inc deleted file mode 100644 index 6cf4510d..00000000 --- a/data/scripts/gUnk_08010103.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010103 -.short 0x0b08 diff --git a/data/scripts/gUnk_08010105.inc b/data/scripts/gUnk_08010105.inc deleted file mode 100644 index d8139a83..00000000 --- a/data/scripts/gUnk_08010105.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010105 -.byte 0xc diff --git a/data/scripts/gUnk_08010106.inc b/data/scripts/gUnk_08010106.inc deleted file mode 100644 index 2f861ad9..00000000 --- a/data/scripts/gUnk_08010106.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_08010106 -.short 0x1e71 -.short 0x0806 diff --git a/data/scripts/gUnk_0801010A.inc b/data/scripts/gUnk_0801010A.inc deleted file mode 100644 index 5143a001..00000000 --- a/data/scripts/gUnk_0801010A.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_0801010A -_0807EF80 0x000a -StopScript -.byte 0x31 diff --git a/data/scripts/gUnk_08010111.inc b/data/scripts/gUnk_08010111.inc deleted file mode 100644 index 4f897f7a..00000000 --- a/data/scripts/gUnk_08010111.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08010111 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x91 -.byte 0x1e -.byte 0x6 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0xf4 -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010120.inc b/data/scripts/gUnk_08010120.inc deleted file mode 100644 index b1bb210e..00000000 --- a/data/scripts/gUnk_08010120.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_08010120 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -.short 0x0879 -.short 0x000a diff --git a/data/scripts/gUnk_08010130.inc b/data/scripts/gUnk_08010130.inc deleted file mode 100644 index b3348e00..00000000 --- a/data/scripts/gUnk_08010130.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_08010130 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x4f22 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffec diff --git a/data/scripts/gUnk_08010148.inc b/data/scripts/gUnk_08010148.inc deleted file mode 100644 index 79a7781f..00000000 --- a/data/scripts/gUnk_08010148.inc +++ /dev/null @@ -1,47 +0,0 @@ -SCRIPT_START gUnk_08010148 -StartScript -_0807EF80 0x0001 -Call sub_0806C354 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CheckRoomFlag 0x0001 -JumpIf 0x0034 -TextboxNoOverlapFollowPos 0x3001, 0x0000 -_0807EA94 -_0807E3E8 -JumpIfNot 0x002e -Call sub_080A1608 -_0807EA94 -_0807E878 -CallWithArg sub_080A1550, 0x080101ac -JumpIfNot 0xffca -SoundReq2 0x0015 -SetRoomFlag 0x0001 -Jump 0xffbe -Call sub_080A1608 -_0807EA94 -_0807E878 -Jump 0xffb0 -StartScript -_0807EF80 0x0008 -Call sub_080A1648 -StopScript -Call sub_080A1270 -_0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x3004, 0x0007 -_0807EA94 -SoundReq0x80100000 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -CallWithArg sub_0807F75C, 0x03400378 -Call sub_080791BC -Call sub_0807FB74 -_0807E8E4_1 -Call sub_0807F168 -.short 0x0c0b diff --git a/data/scripts/gUnk_080101FA.inc b/data/scripts/gUnk_080101FA.inc deleted file mode 100644 index dd309431..00000000 --- a/data/scripts/gUnk_080101FA.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_080101FA -.byte 0x89 -.byte 0x13 -.byte 0xa diff --git a/data/scripts/gUnk_080101FD.inc b/data/scripts/gUnk_080101FD.inc deleted file mode 100644 index 779edf8a..00000000 --- a/data/scripts/gUnk_080101FD.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080101FD -.short 0x0b08 diff --git a/data/scripts/gUnk_080101FF.inc b/data/scripts/gUnk_080101FF.inc deleted file mode 100644 index efb3de9c..00000000 --- a/data/scripts/gUnk_080101FF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080101FF -.byte 0xc diff --git a/data/scripts/gUnk_08010200.inc b/data/scripts/gUnk_08010200.inc deleted file mode 100644 index d148e2b0..00000000 --- a/data/scripts/gUnk_08010200.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08010200 -.byte 0x39 -.byte 0xec -.byte 0x6 diff --git a/data/scripts/gUnk_08010203.inc b/data/scripts/gUnk_08010203.inc deleted file mode 100644 index 0e68e4d1..00000000 --- a/data/scripts/gUnk_08010203.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_08010203 -.short 0x0108 -.short 0x6b04 diff --git a/data/scripts/gUnk_08010207.inc b/data/scripts/gUnk_08010207.inc deleted file mode 100644 index a4f46d80..00000000 --- a/data/scripts/gUnk_08010207.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010207 -.byte 0x4 diff --git a/data/scripts/gUnk_08010208.inc b/data/scripts/gUnk_08010208.inc deleted file mode 100644 index 84630568..00000000 --- a/data/scripts/gUnk_08010208.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_08010208 -.short 0x0c0b -.short 0xf845 diff --git a/data/scripts/gUnk_0801020C.inc b/data/scripts/gUnk_0801020C.inc deleted file mode 100644 index 7eab1e47..00000000 --- a/data/scripts/gUnk_0801020C.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_0801020C -.short 0x0807 -.short 0x0488 -.short 0x0402 -.short 0x0838 -.short 0x0004 -.short 0x043c -.short 0x0437 -.short 0x087c -.short 0xffff -.short 0x0c0b diff --git a/data/scripts/gUnk_08010220.inc b/data/scripts/gUnk_08010220.inc deleted file mode 100644 index ac8d2032..00000000 --- a/data/scripts/gUnk_08010220.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08010220 -.short 0x13b5 -.short 0x080a -.short 0x0459 -.short 0x0805 -.short 0x0018 -.short 0x0c0b -.short 0x13e9 -.short 0x080a -.short 0x0434 -.short 0x0c0b -.short 0x1461 diff --git a/data/scripts/gUnk_08010236.inc b/data/scripts/gUnk_08010236.inc deleted file mode 100644 index 9e8ddc21..00000000 --- a/data/scripts/gUnk_08010236.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_08010236 -.short 0x080a -.short 0x0459 -.short 0x0c0b -.short 0x14a9 -.short 0x080a -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x140c -.short 0xf5b1 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0830 -.short 0x0001 -.short 0x0c0b -.short 0x169d -.short 0x080a -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc index c935ed9d..60243475 100644 --- a/data/scripts/gUnk_08010264.inc +++ b/data/scripts/gUnk_08010264.inc @@ -10,8 +10,551 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_08065F64 +Call 0x08065f65 _0807EA94 _0807E878 Jump 0xffea .short 0x0000 +StartScript +_0807EF80 0x0000 +Call 0x08062a49 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +CheckRoomFlag 0x0009 +JumpIfNot 0x001a +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +_0807E878 +Call 0x08062501 +Jump 0xffdc +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +_0807E878 +Jump 0xffca +.short 0x0000 +StartScript +_0807EF80 0x0000 +Call 0x08062a49 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806265d +_0807EA94 +_0807E878 +Jump 0xffea +.short 0x0000 +StartScript +_0807EF80 0x0000 +StopScript +StopScript +Call 0x08062699 +Call 0x080626ad +CallWithArg +.short 0xf0ed +.short 0x0807 +.short 0x0009 +.short 0x0000 +@ End of 4 parameters +_0807E078 +.short 0x0012 +.short 0x001a +.short 0x0022 +.short 0x002a +.short 0x0032 +.short 0x003a +.short 0x0042 +.short 0x004a +.short 0x0052 +@ End of 9 parameters +_0807EE04 0x0358, 0x0078 +Jump 0x004e +_0807EE04 0x0390, 0x0078 +Jump 0x0044 +_0807EE04 0x03c8, 0x0078 +Jump 0x003a +_0807EE04 0x0358, 0x0098 +Jump 0x0030 +_0807EE04 0x0390, 0x0098 +Jump 0x0026 +_0807EE04 0x03c8, 0x0098 +Jump 0x001c +_0807EE04 0x0358, 0x00b8 +Jump 0x0012 +_0807EE04 0x0390, 0x00b8 +Jump 0x0008 +_0807EE04 0x03c8, 0x00b8 +StopScript +StartScript +Call 0x080626c1 +JumpIf 0xff72 +_0807EE30 +JumpIfNot 0xffee +Jump 0xff68 +.short 0x0000 +StartScript +_0807EF80 0x0000 +Call 0x08062a49 +_0807EF80 0x000a +StopScript +Wait 0x001e +Call 0x08062949 +Jump 0xfff4 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +Wait 0x003c +Call 0x0806407d +Jump 0xfff4 +.short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08064429 +_0807EA94 +_0807E878 +Jump 0xffea +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807E914 0x08064689 +Call 0x08064645 +StopScript +Wait 0x003c +Call 0x080646a5 +Jump 0xfff4 +StartScript +_0807EB44 0x0004 +_0807E930 0x0000 +Call 0x080636f5 +_0807EF80 0x000a +Call 0x0807f349 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x080636d9 +_0807EA94 +Wait 0x000f +_0807E878 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd2 +StartScript +_0807EB44 0x0004 +_0807E930 0x0000 +Call 0x08063cad +_0807EF80 0x000a +Call 0x0807f349 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x08063c91 +_0807EA94 +Wait 0x000f +_0807E878 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd2 +StartScript +_0807EB44 0x0004 +_0807E930 0x0000 +_0807EF80 0x000a +Call 0x0807f349 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807df29 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +CheckRoomFlag 0x000e +JumpIf 0x000c +SetRoomFlag 0x000e +TextboxNoOverlap 0x2b10 +_0807EA94 +Call 0x080634e5 +_0807E078 +.short 0x000e +.short 0x0020 +.short 0x0036 +.short 0x0034 +.short 0x000e +.short 0x0024 +.short 0x002e +@ End of 7 parameters +TextboxNoOverlap 0x2b0d +Jump 0x0096 +CheckGlobalFlag 0x003d +JumpIfNot 0x008a +Jump 0x001a +CheckGlobalFlag 0x003c +JumpIfNot 0x007e +Jump 0x000e +CheckGlobalFlag 0x003b +JumpIfNot 0x0072 +Jump 0x0002 +Call 0x080634ed +CallWithArg +.short 0xf78d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807EA94 +_0807E3E8 +JumpIfNot 0x005a +CallWithArg +.short 0xf7c5 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +JumpIfNot 0x0030 +_0807E48C 0x0020 +JumpIfNot 0x0030 +Call 0x08063505 +JumpIf 0x002e +TextboxNoOverlap 0x2b07 +_0807EA94 +CallWithArg +.short 0xf801 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +WaitPlayerAction8 +_0807EA94 +TextboxNoOverlap 0x2b0c +Jump 0x001e +TextboxNoOverlap 0x2b09 +Jump 0x0016 +TextboxNoOverlap 0x2b0a +Jump 0x000e +TextboxNoOverlap 0x2b0b +Jump 0x0006 +TextboxNoOverlap 0x2b0e +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xff16 +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +Jump 0xffe8 +StartScript +_0807E930 0x0008 +Call 0x08062a49 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0806265d +_0807EA94 +_0807E878 +Jump 0xffec +StartScript +_0807E930 0x0009 +Jump 0xffd6 +.short 0x0000 +StartScript +_0807E930 0x000b +Jump 0xffca +.short 0x0000 +StartScript +_0807E930 0x000c +Jump 0xffbe +.short 0x0000 +StartScript +_0807E930 0x000d +Jump 0xffb2 +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +HasRoomItemForSale +Call 0x0807f77d +_0807EAF0 +.short 0x3c08 +.short 0x3c09 +@ End of 2 parameters +_0807EA94 +_0807E878 +_0807EB44 0x0004 +Jump 0xffde +.short 0x0000 +StartScript +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0807f2d5 +_0807EF80 0x0000 +HasRoomItemForSale +JumpIf 0x000a +TextboxNoOverlap 0x3c07 +Jump 0x0048 +Call 0x08062eb9 +CallWithArg +.short 0xf78d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807EA94 +_0807E3E8 +JumpIfNot 0x0030 +_0807EA94 +BuyItem 0x0000, 0x0000 +JumpIf 0x000a +TextboxNoOverlap 0x3c04 +Jump 0x001c +WaitPlayerAction8 +ModHealth 0x0008 +Call 0x08062edd +JumpIf 0x000a +TextboxNoOverlap 0x3c06 +Jump 0x0004 +WaitPlayerAction8 +_0807EA94 +_0807E878 +_0807EF80 0x0001 +Jump 0xff8e +.short 0x0000 +StartScript +_0807EF80 0x0007 +_0807E9D4 +_0807EF80 0x000a +_0807E930 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807E930 0x0004 +StartScript +Call 0x08062d19 +JumpIfNot 0x002a +StopScript +_0807EA94 +_0807E3E8 +JumpIfNot 0x0020 +HasRupees 0x00c8 +JumpIf 0x000a +TextboxNoOverlap 0x4008 +Jump 0x0010 +ModRupees 0xff38 +Call 0x08062e15 +TextboxNoOverlap 0x4007 +StopScript +_0807EA94 +_0807E878 +_0807E930 0x0008 +Jump 0xffb4 +StartScript +_0807EF80 0x0007 +_0807E9D4 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807f2d5 +_0807EF80 0x0001 +Call 0x08062cbd +_0807EA94 +_0807E878 +_0807EF80 0x0000 +Jump 0xffde +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +_0807EF80 0x0007 +_0807E9D4 +Call 0x0807f349 +Call 0x08069685 +StopScript +StopScript +StartScript +CheckPlayerInRegion2 0x3030 +JumpIfNot 0xfff6 +Call 0x080696b1 +StopScript +StartScript +CheckPlayerInRegion2 0x3030 +JumpIfNot 0xffe4 +HasRoomItemForSale +JumpIf 0x004c +CheckEntityInteractType +JumpIfNot 0xffea +StopScript +_0807E864 +Call 0x0807df29 +_0807EB74 +CheckGlobalFlag 0x0042 +JumpIfNot 0x002a +CheckGlobalFlag 0x0043 +JumpIfNot 0x0022 +CheckGlobalFlag 0x0044 +JumpIfNot 0x001a +CheckGlobalFlag 0x0041 +JumpIfNot 0x000a +TextboxNoOverlap 0x3f39 +Jump 0x006c +TextboxNoOverlap 0x2c1b +Jump 0x0064 +TextboxNoOverlap 0x2c1a +Jump 0x005c +StopScript +_0807E864 +Call 0x0807df39 +_0807EB74 +Call 0x08069661 +_0807EA94 +_0807E3E8 +JumpIfNot 0x003a +Call 0x08069719 +JumpIfNot 0x0030 +WaitPlayerAction8 +_0807EA94 +_0807EB8C +CheckGlobalFlag 0x0042 +JumpIfNot 0x001a +CheckGlobalFlag 0x0043 +JumpIfNot 0x0012 +CheckGlobalFlag 0x0044 +JumpIfNot 0x000a +TextboxNoOverlap 0x2c21 +Jump 0x000a +SetLocalFlag 0x00fa +TextboxNoOverlap 0x2c20 +_0807EA94 +Call 0x0807f83d +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0000 +Jump 0xff36 +CheckPlayerInRegion2 0x0808 +JumpIfNot 0xfffa +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x080109f0 +WaitForSomething2 0x00000001 +CheckRoomFlag 0x0001 +JumpIf 0x0008 +_0807EB28 0x0b63 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xffc6 +StartScript +_0807EF80 0x0007 +CheckKinstoneFused 0x001b +JumpIf 0xe67a +StopScript +Call 0x080869a5 +JumpIfNot 0xfff8 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +CheckRoomFlag 0x0001 +JumpIf 0x0008 +_0807EB28 0x0b62 +_0807EA94 +StartPlayerScript 0x080109f0 +WaitForSomething2 0x00000001 +Call 0x0807df51 +_0807E878 +Jump 0xffc4 +Call 0x0808692d +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08010294.inc b/data/scripts/gUnk_08010294.inc deleted file mode 100644 index bc2727c2..00000000 --- a/data/scripts/gUnk_08010294.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_08010294 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CheckRoomFlag 0x0009 -JumpIfNot 0x001a -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -Call sub_08062500 -Jump 0xffdc -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -Jump 0xffca -.short 0x0000 diff --git a/data/scripts/gUnk_080102E0.inc b/data/scripts/gUnk_080102E0.inc deleted file mode 100644 index 2e9f2ea3..00000000 --- a/data/scripts/gUnk_080102E0.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_080102E0 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -.byte 0x63 diff --git a/data/scripts/gUnk_080102FB.inc b/data/scripts/gUnk_080102FB.inc deleted file mode 100644 index 2b492607..00000000 --- a/data/scripts/gUnk_080102FB.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080102FB -.short 0x0b04 diff --git a/data/scripts/gUnk_080102FD.inc b/data/scripts/gUnk_080102FD.inc deleted file mode 100644 index 87eb5162..00000000 --- a/data/scripts/gUnk_080102FD.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080102FD -.byte 0xc diff --git a/data/scripts/gUnk_080102FE.inc b/data/scripts/gUnk_080102FE.inc deleted file mode 100644 index 1a1206d9..00000000 --- a/data/scripts/gUnk_080102FE.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_080102FE -.byte 0x5d -.byte 0x26 -.byte 0x6 -.byte 0x8 -.byte 0x59 diff --git a/data/scripts/gUnk_08010303.inc b/data/scripts/gUnk_08010303.inc deleted file mode 100644 index ebe7d11d..00000000 --- a/data/scripts/gUnk_08010303.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010303 -.byte 0x4 diff --git a/data/scripts/gUnk_08010304.inc b/data/scripts/gUnk_08010304.inc deleted file mode 100644 index ca26c485..00000000 --- a/data/scripts/gUnk_08010304.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010304 -.byte 0x44 diff --git a/data/scripts/gUnk_08010305.inc b/data/scripts/gUnk_08010305.inc deleted file mode 100644 index f30a6549..00000000 --- a/data/scripts/gUnk_08010305.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08010305 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xea -.byte 0xff diff --git a/data/scripts/gUnk_0801030A.inc b/data/scripts/gUnk_0801030A.inc deleted file mode 100644 index 8a6e1943..00000000 --- a/data/scripts/gUnk_0801030A.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801030A -.short 0x0000 diff --git a/data/scripts/gUnk_0801030C.inc b/data/scripts/gUnk_0801030C.inc deleted file mode 100644 index 73c73cc4..00000000 --- a/data/scripts/gUnk_0801030C.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0801030C -StartScript -_0807EF80 0x0000 -StopScript -StopScript -Call sub_08062698 -.short 0x0c0b -.short 0x26ad diff --git a/data/scripts/gUnk_08010320.inc b/data/scripts/gUnk_08010320.inc deleted file mode 100644 index a6d079e5..00000000 --- a/data/scripts/gUnk_08010320.inc +++ /dev/null @@ -1,72 +0,0 @@ -SCRIPT_START gUnk_08010320 -_0807E078 0x140c -.short 0xf0ed -.short 0x0807 -.short 0x0009 -.short 0x0000 -.short 0x2806 -.short 0x0012 -.short 0x001a -.short 0x0022 -.short 0x002a -.short 0x0032 -.short 0x003a -.short 0x0042 -.short 0x004a -.short 0x0052 -.short 0x0c74 -.short 0x0358 -.short 0x0078 -.short 0x0803 -.short 0x004e -.short 0x0c74 -.short 0x0390 -.short 0x0078 -.short 0x0803 -.short 0x0044 -.short 0x0c74 -.short 0x03c8 -.short 0x0078 -.short 0x0803 -.short 0x003a -.short 0x0c74 -.short 0x0358 -.short 0x0098 -.short 0x0803 -.short 0x0030 -.short 0x0c74 -.short 0x0390 -.short 0x0098 -.short 0x0803 -.short 0x0026 -.short 0x0c74 -.short 0x03c8 -.short 0x0098 -.short 0x0803 -.short 0x001c -.short 0x0c74 -.short 0x0358 -.short 0x00b8 -.short 0x0803 -.short 0x0012 -.short 0x0c74 -.short 0x0390 -.short 0x00b8 -.short 0x0803 -.short 0x0008 -.short 0x0c74 -.short 0x03c8 -.short 0x00b8 -.short 0x0402 -.short 0x0401 -.short 0x0c0b -.short 0x26c1 -.short 0x0806 -.short 0x0804 -.short 0xff72 -.short 0x0475 -.short 0x0805 -.short 0xffee -.short 0x0803 -.short 0xff68 -.short 0x0000 diff --git a/data/scripts/gUnk_080103B0.inc b/data/scripts/gUnk_080103B0.inc deleted file mode 100644 index 3452e41c..00000000 --- a/data/scripts/gUnk_080103B0.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_080103B0 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -Wait 0x001e -Call sub_08062948 -.short 0x0803 -.short 0xfff4 diff --git a/data/scripts/gUnk_080103D0.inc b/data/scripts/gUnk_080103D0.inc deleted file mode 100644 index 52d533b3..00000000 --- a/data/scripts/gUnk_080103D0.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_080103D0 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000004 -StopScript -Wait 0x003c -Call sub_0806407C -Jump 0xfff4 -.short 0x0000 diff --git a/data/scripts/gUnk_080103F8.inc b/data/scripts/gUnk_080103F8.inc deleted file mode 100644 index 1c37a174..00000000 --- a/data/scripts/gUnk_080103F8.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_080103F8 -StartScript -_0807E9D4 -.byte 0x61 diff --git a/data/scripts/gUnk_080103FD.inc b/data/scripts/gUnk_080103FD.inc deleted file mode 100644 index 373fdd74..00000000 --- a/data/scripts/gUnk_080103FD.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_080103FD -.byte 0x8 -.byte 0x4 -.byte 0x0 diff --git a/data/scripts/gUnk_08010400.inc b/data/scripts/gUnk_08010400.inc deleted file mode 100644 index c179786a..00000000 --- a/data/scripts/gUnk_08010400.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_08010400 -_0807EF80 0x000a -.short 0x140c diff --git a/data/scripts/gUnk_08010406.inc b/data/scripts/gUnk_08010406.inc deleted file mode 100644 index c6bc0a11..00000000 --- a/data/scripts/gUnk_08010406.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010406 -.byte 0xd9 diff --git a/data/scripts/gUnk_08010407.inc b/data/scripts/gUnk_08010407.inc deleted file mode 100644 index 94b10c62..00000000 --- a/data/scripts/gUnk_08010407.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08010407 -.byte 0xf3 -.byte 0x7 -.byte 0x8 diff --git a/data/scripts/gUnk_0801040A.inc b/data/scripts/gUnk_0801040A.inc deleted file mode 100644 index ec8fcf81..00000000 --- a/data/scripts/gUnk_0801040A.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_0801040A -.short 0x0000 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 -.short 0x0463 -.short 0x0c0b -.short 0x4429 -.short 0x0806 -.short 0x0459 -.short 0x0444 -.short 0x0803 -.short 0xffea diff --git a/data/scripts/gUnk_08010428.inc b/data/scripts/gUnk_08010428.inc deleted file mode 100644 index 7af9206e..00000000 --- a/data/scripts/gUnk_08010428.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START gUnk_08010428 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E914 0x08064689 -Call sub_08064644 -StopScript -Wait 0x003c -Call sub_080646A4 -.short 0x0803 -.short 0xfff4 diff --git a/data/scripts/gUnk_08010454.inc b/data/scripts/gUnk_08010454.inc deleted file mode 100644 index 49c46b95..00000000 --- a/data/scripts/gUnk_08010454.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_08010454 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -Call sub_080636F4 -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -.short 0x140c -.short 0xf3d9 -.short 0x0807 diff --git a/data/scripts/gUnk_08010480.inc b/data/scripts/gUnk_08010480.inc deleted file mode 100644 index b658751a..00000000 --- a/data/scripts/gUnk_08010480.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08010480 -.short 0x0004 -.short 0x0000 -.short 0x0c0b -.short 0x36d9 -.short 0x0806 -.short 0x0459 -.short 0x0831 -.short 0x000f -.short 0x0444 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0803 -.short 0xffd2 diff --git a/data/scripts/gUnk_080104A0.inc b/data/scripts/gUnk_080104A0.inc deleted file mode 100644 index 76258d60..00000000 --- a/data/scripts/gUnk_080104A0.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START gUnk_080104A0 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -Call sub_08063CAC -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -Call sub_08063C90 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000000 -.short 0x0803 -.short 0xffd2 diff --git a/data/scripts/gUnk_080104EC.inc b/data/scripts/gUnk_080104EC.inc deleted file mode 100644 index c719c1f6..00000000 --- a/data/scripts/gUnk_080104EC.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_080104EC -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -_0807EF80 0x000a -.byte 0xb -.byte 0xc -.byte 0x49 -.byte 0xf3 -.byte 0x7 diff --git a/data/scripts/gUnk_080104FF.inc b/data/scripts/gUnk_080104FF.inc deleted file mode 100644 index 15db1023..00000000 --- a/data/scripts/gUnk_080104FF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080104FF -.short 0x0208 diff --git a/data/scripts/gUnk_08010501.inc b/data/scripts/gUnk_08010501.inc deleted file mode 100644 index 2611c18f..00000000 --- a/data/scripts/gUnk_08010501.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010501 -.byte 0x4 diff --git a/data/scripts/gUnk_08010502.inc b/data/scripts/gUnk_08010502.inc deleted file mode 100644 index c73cb139..00000000 --- a/data/scripts/gUnk_08010502.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010502 -.byte 0x18 diff --git a/data/scripts/gUnk_08010503.inc b/data/scripts/gUnk_08010503.inc deleted file mode 100644 index cb2d8df5..00000000 --- a/data/scripts/gUnk_08010503.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_08010503 -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0xfc -.byte 0xff -.byte 0x43 -.byte 0x4 diff --git a/data/scripts/gUnk_0801050A.inc b/data/scripts/gUnk_0801050A.inc deleted file mode 100644 index 258ea077..00000000 --- a/data/scripts/gUnk_0801050A.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801050A -.byte 0xb diff --git a/data/scripts/gUnk_0801050B.inc b/data/scripts/gUnk_0801050B.inc deleted file mode 100644 index 11a8536a..00000000 --- a/data/scripts/gUnk_0801050B.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_0801050B -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xd9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x15 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0xc -.byte 0x0 -.byte 0x2f -.byte 0x8 diff --git a/data/scripts/gUnk_08010526.inc b/data/scripts/gUnk_08010526.inc deleted file mode 100644 index a24869fe..00000000 --- a/data/scripts/gUnk_08010526.inc +++ /dev/null @@ -1,122 +0,0 @@ -SCRIPT_START gUnk_08010526 -.byte 0xe -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x10 -.byte 0x2b -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xe5 -.byte 0x34 -.byte 0x6 -.byte 0x8 -.byte 0x6 -.byte 0x20 -.byte 0xe -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x36 -.byte 0x0 -.byte 0x34 -.byte 0x0 -.byte 0xe -.byte 0x0 -.byte 0x24 -.byte 0x0 -.byte 0x2e -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0xd -.byte 0x2b -.byte 0x3 -.byte 0x8 -.byte 0x96 -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x3d -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x8a -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x1a -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x7e -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x3b -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x72 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xed -.byte 0x34 -.byte 0x6 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x8d -.byte 0xf7 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x5a -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0xc5 -.byte 0xf7 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x30 -.byte 0x0 -.byte 0x1f -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x30 -.byte 0x0 -.byte 0xb diff --git a/data/scripts/gUnk_0801059F.inc b/data/scripts/gUnk_0801059F.inc deleted file mode 100644 index 79a5f085..00000000 --- a/data/scripts/gUnk_0801059F.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_0801059F -.short 0x050c -.short 0x0635 -.short 0x0408 -.short 0x2e08 -.short 0x5b00 -.short 0x0708 -.short 0x592b -.short 0x0c04 -.short 0x0114 -.short 0x07f8 -.short 0x0008 -.short 0x0000 -.short 0x3400 -.short 0x5904 -.short 0x5b04 -.short 0x0c08 -.short 0x032b -.short 0x1e08 -.short 0x5b00 -.short 0x0908 -.short 0x032b diff --git a/data/scripts/gUnk_080105C9.inc b/data/scripts/gUnk_080105C9.inc deleted file mode 100644 index 72741aeb..00000000 --- a/data/scripts/gUnk_080105C9.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_080105C9 -.short 0x1608 -.short 0x5b00 -.short 0x0a08 -.short 0x032b -.short 0x0e08 -.short 0x5b00 -.short 0x0b08 -.short 0x032b -.short 0x0608 -.short 0x5b00 -.short 0x0e08 -.short 0x592b -.short 0x0b04 -.short 0x510c -.short 0x07df -.short 0x4408 -.short 0x0304 -.short 0x1608 -.short 0x00ff -.short 0x0100 -.short 0x5304 -.short 0x7904 -.short 0x0a08 -.short 0x6100 -.short 0x0408 diff --git a/data/scripts/gUnk_080105FB.inc b/data/scripts/gUnk_080105FB.inc deleted file mode 100644 index 44ee5099..00000000 --- a/data/scripts/gUnk_080105FB.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_080105FB -.short 0x7900 -.short 0x0008 diff --git a/data/scripts/gUnk_080105FF.inc b/data/scripts/gUnk_080105FF.inc deleted file mode 100644 index bb4e73f1..00000000 --- a/data/scripts/gUnk_080105FF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_080105FF -.byte 0x0 diff --git a/data/scripts/gUnk_08010600.inc b/data/scripts/gUnk_08010600.inc deleted file mode 100644 index 7ad3a139..00000000 --- a/data/scripts/gUnk_08010600.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08010600 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 diff --git a/data/scripts/gUnk_0801060A.inc b/data/scripts/gUnk_0801060A.inc deleted file mode 100644 index 3290a296..00000000 --- a/data/scripts/gUnk_0801060A.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0801060A -_0807EB74 -.byte 0x5a diff --git a/data/scripts/gUnk_0801060D.inc b/data/scripts/gUnk_0801060D.inc deleted file mode 100644 index 23014324..00000000 --- a/data/scripts/gUnk_0801060D.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0801060D -.short 0x0108 -.short 0x590a -.short 0x4404 -.short 0x6104 -.short 0x0408 diff --git a/data/scripts/gUnk_08010617.inc b/data/scripts/gUnk_08010617.inc deleted file mode 100644 index 16e00132..00000000 --- a/data/scripts/gUnk_08010617.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08010617 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0xe8 -.byte 0xff diff --git a/data/scripts/gUnk_0801061C.inc b/data/scripts/gUnk_0801061C.inc deleted file mode 100644 index 2a98dd79..00000000 --- a/data/scripts/gUnk_0801061C.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_0801061C -StartScript -_0807E930 0x0008 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0806265C -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffec diff --git a/data/scripts/gUnk_08010644.inc b/data/scripts/gUnk_08010644.inc deleted file mode 100644 index 122663b5..00000000 --- a/data/scripts/gUnk_08010644.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08010644 -StartScript -_0807E930 0x0009 -Jump 0xffd6 -.short 0x0000 diff --git a/data/scripts/gUnk_08010650.inc b/data/scripts/gUnk_08010650.inc deleted file mode 100644 index 0b754402..00000000 --- a/data/scripts/gUnk_08010650.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08010650 -StartScript -_0807E930 0x000b -Jump 0xffca -.short 0x0000 -.short 0x0401 -.short 0x0850 -.short 0x000c -.short 0x0803 -.short 0xffbe -.short 0x0000 -.short 0x0401 -.short 0x0850 -.short 0x000d -.short 0x0803 -.short 0xffb2 -.short 0x0000 diff --git a/data/scripts/gUnk_08010674.inc b/data/scripts/gUnk_08010674.inc deleted file mode 100644 index 26548735..00000000 --- a/data/scripts/gUnk_08010674.inc +++ /dev/null @@ -1,25 +0,0 @@ -SCRIPT_START gUnk_08010674 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -.short 0x0411 -.short 0x0c0b -.short 0xf77d -.short 0x0807 -.short 0x0c5d -.short 0x3c08 -.short 0x3c09 -.short 0x0459 -.short 0x0444 -.short 0x0861 -.short 0x0004 -.short 0x0803 -.short 0xffde -.short 0x0000 diff --git a/data/scripts/gUnk_080106AC.inc b/data/scripts/gUnk_080106AC.inc deleted file mode 100644 index d62c28b0..00000000 --- a/data/scripts/gUnk_080106AC.inc +++ /dev/null @@ -1,36 +0,0 @@ -SCRIPT_START gUnk_080106AC -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0807F2D4 -_0807EF80 0x0000 -.short 0x0411 -.short 0x0804 -.short 0x000a -.short 0x085b -.short 0x3c07 -.short 0x0803 -.short 0x0048 -.short 0x0c0b -.short 0x2eb9 -.short 0x0806 -.short 0x140c -.short 0xf78d -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0459 -.short 0x041c -.short 0x0805 -.short 0x0030 -.short 0x0459 -.short 0x0c1e -.short 0x0000 -.short 0x0000 diff --git a/data/scripts/gUnk_08010700.inc b/data/scripts/gUnk_08010700.inc deleted file mode 100644 index 85baa923..00000000 --- a/data/scripts/gUnk_08010700.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010700 -.byte 0x4 diff --git a/data/scripts/gUnk_08010701.inc b/data/scripts/gUnk_08010701.inc deleted file mode 100644 index b664b498..00000000 --- a/data/scripts/gUnk_08010701.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_08010701 -.short 0x0a08 -.short 0x5b00 diff --git a/data/scripts/gUnk_08010705.inc b/data/scripts/gUnk_08010705.inc deleted file mode 100644 index f1404ea2..00000000 --- a/data/scripts/gUnk_08010705.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_08010705 -.byte 0x8 -.byte 0x4 -.byte 0x3c -.byte 0x3 -.byte 0x8 -.byte 0x1c -.byte 0x0 -.byte 0x34 -.byte 0x4 diff --git a/data/scripts/gUnk_0801070E.inc b/data/scripts/gUnk_0801070E.inc deleted file mode 100644 index 0e579364..00000000 --- a/data/scripts/gUnk_0801070E.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0801070E -ModHealth 0x0008 -Call sub_08062EDC -JumpIf 0x000a -TextboxNoOverlap 0x3c06 -Jump 0x0004 -WaitPlayerAction8 -_0807EA94 -_0807E878 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 diff --git a/data/scripts/gUnk_08010734.inc b/data/scripts/gUnk_08010734.inc deleted file mode 100644 index 933e7517..00000000 --- a/data/scripts/gUnk_08010734.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_08010734 -StartScript -_0807EF80 0x0007 -_0807E9D4 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0004 -StartScript -Call sub_08062D18 -JumpIfNot 0x002a -StopScript -_0807EA94 -_0807E3E8 -JumpIfNot 0x0020 -HasRupees 0x00c8 -JumpIf 0x000a -TextboxNoOverlap 0x4008 -Jump 0x0010 -ModRupees 0xff38 -Call sub_08062E14 -TextboxNoOverlap 0x4007 -StopScript -_0807EA94 -_0807E878 -_0807E930 0x0008 -.short 0x0803 -.short 0xffb4 diff --git a/data/scripts/gUnk_08010794.inc b/data/scripts/gUnk_08010794.inc deleted file mode 100644 index dd310869..00000000 --- a/data/scripts/gUnk_08010794.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08010794 -StartScript -_0807EF80 0x0007 -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807F2D4 -_0807EF80 0x0001 -Call sub_08062CBC -_0807EA94 -_0807E878 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 diff --git a/data/scripts/gUnk_080107D0.inc b/data/scripts/gUnk_080107D0.inc deleted file mode 100644 index 5b25dc91..00000000 --- a/data/scripts/gUnk_080107D0.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_080107D0 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807EF80 0x0007 -_0807E9D4 -Call sub_0807F348 -Call sub_08069684 -StopScript -StopScript -StartScript -CheckPlayerInRegion2 0x3030 -JumpIfNot 0xfff6 -Call sub_080696B0 -StopScript -StartScript -.short 0x0817 diff --git a/data/scripts/gUnk_0801080A.inc b/data/scripts/gUnk_0801080A.inc deleted file mode 100644 index c856312b..00000000 --- a/data/scripts/gUnk_0801080A.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_0801080A -.byte 0x30 diff --git a/data/scripts/gUnk_0801080B.inc b/data/scripts/gUnk_0801080B.inc deleted file mode 100644 index aa65a41e..00000000 --- a/data/scripts/gUnk_0801080B.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_0801080B -.short 0x0530 -.short 0xe408 -.short 0x11ff -.short 0x0404 -.short 0x4c08 diff --git a/data/scripts/gUnk_08010815.inc b/data/scripts/gUnk_08010815.inc deleted file mode 100644 index 0797910a..00000000 --- a/data/scripts/gUnk_08010815.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START gUnk_08010815 -.short 0x1800 -.short 0x0504 -.short 0xea08 diff --git a/data/scripts/gUnk_0801081B.inc b/data/scripts/gUnk_0801081B.inc deleted file mode 100644 index 4d5dbb9d..00000000 --- a/data/scripts/gUnk_0801081B.inc +++ /dev/null @@ -1,182 +0,0 @@ -SCRIPT_START gUnk_0801081B -.byte 0xff -.byte 0x2 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0x14 -.byte 0x8 -.byte 0x42 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x2a -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x43 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x22 -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x44 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x1a -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x41 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x39 -.byte 0x3f -.byte 0x3 -.byte 0x8 -.byte 0x6c -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x1b -.byte 0x2c -.byte 0x3 -.byte 0x8 -.byte 0x64 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x1a -.byte 0x2c -.byte 0x3 -.byte 0x8 -.byte 0x5c -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x39 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x63 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0x96 -.byte 0x6 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x3a -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x19 -.byte 0x97 -.byte 0x6 -.byte 0x8 -.byte 0x5 -.byte 0x8 -.byte 0x30 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x59 -.byte 0x4 -.byte 0x64 -.byte 0x4 -.byte 0x14 -.byte 0x8 -.byte 0x42 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x1a -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x43 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x12 -.byte 0x0 -.byte 0x14 -.byte 0x8 -.byte 0x44 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x21 -.byte 0x2c -.byte 0x3 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0xfa -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x20 -.byte 0x2c -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0xf8 -.byte 0x7 -.byte 0x8 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x36 -.byte 0xff diff --git a/data/scripts/gUnk_080108D0.inc b/data/scripts/gUnk_080108D0.inc deleted file mode 100644 index 2e2ff739..00000000 --- a/data/scripts/gUnk_080108D0.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_080108D0 -CheckPlayerInRegion2 0x0808 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript 0x080109f0 -WaitForSomething2 0x00000001 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b63 -.byte 0x59 diff --git a/data/scripts/gUnk_080108FF.inc b/data/scripts/gUnk_080108FF.inc deleted file mode 100644 index a3f0a622..00000000 --- a/data/scripts/gUnk_080108FF.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_080108FF -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xc6 -.byte 0xff diff --git a/data/scripts/gUnk_0801090C.inc b/data/scripts/gUnk_0801090C.inc deleted file mode 100644 index 9c211086..00000000 --- a/data/scripts/gUnk_0801090C.inc +++ /dev/null @@ -1,3 +0,0 @@ -SCRIPT_START gUnk_0801090C -StartScript -.byte 0x79 diff --git a/data/scripts/gUnk_0801090F.inc b/data/scripts/gUnk_0801090F.inc deleted file mode 100644 index 83da14e6..00000000 --- a/data/scripts/gUnk_0801090F.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_0801090F -.short 0x0708 -.short 0x1d00 -.short 0x1b08 -.short 0x0400 diff --git a/data/scripts/gUnk_08010917.inc b/data/scripts/gUnk_08010917.inc deleted file mode 100644 index 6b4b6066..00000000 --- a/data/scripts/gUnk_08010917.inc +++ /dev/null @@ -1,78 +0,0 @@ -SCRIPT_START gUnk_08010917 -.byte 0x8 -.byte 0x7a -.byte 0xe6 -.byte 0x2 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0x69 -.byte 0x8 -.byte 0x8 -.byte 0x5 -.byte 0x8 -.byte 0xf8 -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x15 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x5f -.byte 0x8 -.byte 0x62 -.byte 0xb -.byte 0x59 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0xf0 -.byte 0x9 -.byte 0x1 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x3 -.byte 0x8 -.byte 0xc4 -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0x2d -.byte 0x69 -.byte 0x8 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/gUnk_08010964.inc index b81a190a..2f63d2b3 100644 --- a/data/scripts/gUnk_08010964.inc +++ b/data/scripts/gUnk_08010964.inc @@ -2,15 +2,35 @@ SCRIPT_START gUnk_08010964 CheckPlayerInRegion2 0x0808 JumpIfNot 0xfffa _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 StartPlayerScript 0x08010a38 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b63 _0807EA94 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 -.short 0x0803 -.short 0xffc6 +Jump 0xffc6 +StartScript +StopScript +CheckLocalFlag 0x00d1 +JumpIf 0x0040 +CheckPlayerInRegion2 0x0808 +JumpIfNot 0xffee +StopScript +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x08010a38 +WaitForSomething2 0x00000001 +CheckRoomFlag 0x0001 +JumpIf 0x0008 +_0807EB28 0x0b64 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xffb8 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080109A0.inc b/data/scripts/gUnk_080109A0.inc deleted file mode 100644 index f4af9a29..00000000 --- a/data/scripts/gUnk_080109A0.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_080109A0 -StartScript -StopScript -CheckLocalFlag 0x00d1 -JumpIf 0x0040 -CheckPlayerInRegion2 0x0808 -JumpIfNot 0xffee -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript 0x08010a38 -WaitForSomething2 0x00000001 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b64 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffb8 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/gUnk_080109F0.inc index fe757f1d..05097e85 100644 --- a/data/scripts/gUnk_080109F0.inc +++ b/data/scripts/gUnk_080109F0.inc @@ -1,4 +1,11 @@ SCRIPT_START gUnk_080109F0 StartScript -.short 0x0867 -.short 0x0100 +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807ECC4 0x0010 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080109F6.inc b/data/scripts/gUnk_080109F6.inc deleted file mode 100644 index a0d515fc..00000000 --- a/data/scripts/gUnk_080109F6.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080109F6 -StopScript -_0807ECC4 0x0010 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/gUnk_08010A14.inc index d533dca7..2a01dc4f 100644 --- a/data/scripts/gUnk_08010A14.inc +++ b/data/scripts/gUnk_08010A14.inc @@ -2,6 +2,10 @@ SCRIPT_START gUnk_08010A14 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -.byte 0x6e -.byte 0x8 -.byte 0x10 +_0807EC64 0x0010 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08010A1F.inc b/data/scripts/gUnk_08010A1F.inc deleted file mode 100644 index a6e7ccdc..00000000 --- a/data/scripts/gUnk_08010A1F.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_08010A1F -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/gUnk_08010A38.inc index 9687579a..77c712ad 100644 --- a/data/scripts/gUnk_08010A38.inc +++ b/data/scripts/gUnk_08010A38.inc @@ -6,6 +6,6 @@ _0807EC94 0x0010 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/gUnk_08010A5C.inc index 298feea6..e454f7a6 100644 --- a/data/scripts/gUnk_08010A5C.inc +++ b/data/scripts/gUnk_08010A5C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08010A5C StartScript -Call sub_0807DF28 +Call 0x0807df29 _0807E864 ModHealth 0x00a0 StopScript @@ -8,11 +8,11 @@ Wait 0x003c _0807E778 0x0004 DoFade4 WaitFor_2 -Call sub_0807F0D8 +Call 0x0807f0d9 JumpIfNot 0xfff8 _0807EF80 0x0014 _0807E878 -Call sub_0807DF50 -Call sub_080791D0 +Call 0x0807df51 +Call 0x080791d1 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc index cdddcece..57150ba0 100644 --- a/data/scripts/gUnk_08010A98.inc +++ b/data/scripts/gUnk_08010A98.inc @@ -1,19 +1,80 @@ SCRIPT_START gUnk_08010A98 StartScript _0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807EF80 0x000a -Call sub_08067314 +Call 0x08067315 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg sub_080672B0, 0x00000004 -Call sub_08067304 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +Call 0x08067305 _0807EA94 _0807E878 _0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 -.short 0x0803 -.short 0xffd2 +CallWithArg +.short 0x72b1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd2 +StartScript +CheckInventory1 0x0067 +JumpIfNot 0x0076 +_0807EB44 0x0004 +_0807EF80 0x0000 +SetEntityNonPlanarMovement 0x0180 +CallWithArg +.short 0xf349 +.short 0x0807 +@ End of 2 parameters +Call 0x0806075d +StopScript +_0807EA94 +Call 0x080606c1 +StopScript +Call 0x0806076d +_0807EF80 0x0007 +Call 0x08060701 +StopScript +StartScript +_0807E564 +JumpIf 0x0010 +CallWithArg +.short 0x08e5 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x000c +_0807EE30 +JumpIfNot 0xffe4 +Jump 0xffce +StopScript +_0807EF80 0x0000 +StopScript +StartScript +CallWithArg +.short 0x08e5 +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +JumpIf 0xfff0 +StopScript +Jump 0xffbc +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08010AE4.inc b/data/scripts/gUnk_08010AE4.inc deleted file mode 100644 index d5eb2458..00000000 --- a/data/scripts/gUnk_08010AE4.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08010AE4 -StartScript -CheckInventory1 0x0067 -JumpIfNot 0x0076 -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0180 -.short 0x0c0c -.short 0xf349 -.short 0x0807 -.short 0x0c0b -.short 0x075d diff --git a/data/scripts/gUnk_08010B04.inc b/data/scripts/gUnk_08010B04.inc deleted file mode 100644 index bd07881d..00000000 --- a/data/scripts/gUnk_08010B04.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_08010B04 -_0807E078 0x0402 -_0807EA94 -Call sub_080606C0 -StopScript -Call sub_0806076C -_0807EF80 0x0007 -Call sub_08060700 -StopScript -StartScript -_0807E564 -JumpIf 0x0010 -CallWithArg sub_080608E4, 0x00000000 -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffe4 -Jump 0xffce -StopScript -_0807EF80 0x0000 -StopScript -StartScript -CallWithArg sub_080608E4, 0x00000001 -JumpIf 0xfff0 -StopScript -Jump 0xffbc -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/gUnk_08010B68.inc index 36afe5e4..cdeb2447 100644 --- a/data/scripts/gUnk_08010B68.inc +++ b/data/scripts/gUnk_08010B68.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08010B68 StartScript _0807E564 JumpIfNot 0x003e -Call sub_0807F924 +Call 0x0807f925 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x0007 @@ -17,7 +17,7 @@ JumpIfNot 0xfff2 StopScript _0807E864 _0807EB74 -Call sub_0806E2DC +Call 0x0806e2dd _0807EA94 _0807E878 Jump 0xffde diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc index fce27cee..ab37e3fa 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/gUnk_08010BB4.inc @@ -3,16 +3,176 @@ StartScript _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 -Call sub_0806E440 +Call 0x0806e441 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0000 -Call sub_0806E418 +Call 0x0806e419 _0807EA94 _0807E878 _0807E930 0x0008 Jump 0xffe2 .short 0x0000 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x08011074 +WaitForSomething2 0x00000400 +_0807F078 0x0034, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1036 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +TextboxNoOverlapFollowPos +.short 0x1037 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +TextboxNoOverlapFollowPos +.short 0x1038 +.short 0x000c +@ End of 2 parameters +_0807EA94 +SoundReq0x80100000 +_0807E778 0x0004 +DoFade5 +WaitFor_2 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +Call 0x08064181 +LoadRoomEntityList 0x080f06e0 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +StartPlayerScript 0x08011098 +WaitForSomething2 0x00000400 +SetEntityPositionRelative 0x005001f8 +_0807F0B4 0x0007 +CameraTargetEntity +Wait 0x000a +_0807F0B4 0x0001 +_0807E778 0x0001 +DoFade4 +_0807E5F8 0x0002a800 +WaitForSomething2 0x00055000 +SetEntityPositionRelative 0x007801f8 +Wait 0x003c +_0807E5F8 0x00800000 +WaitForSomething2 0x01000000 +_0807E5F8 0x0002a800 +WaitForSomething2 0x00055000 +_0807E8E4_1 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +TextboxNoOverlapFollowPos +.short 0x1039 +.short 0x000c +@ End of 2 parameters +_0807EA94 +SoundReq2 0x0001 +_0807E8E4_2 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000010 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000020 +WaitForSomething2 0x00000080 +Wait 0x012c +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +TextboxNoOverlapFollowPos +.short 0x103a +.short 0x000c +@ End of 2 parameters +_0807EA94 +SetEntityPositionRelative 0x01c001f8 +_0807F0B4 0x0004 +Wait 0x0078 +_0807E5F8 0x00280000 +WaitForSomething2 0x00500000 +_0807E5F8 0x00000100 +SetEntityPositionRelative 0x022001f8 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x01f8, 0x0098 +Wait 0x003c +WaitForSomething2 0x00000200 +_0807E5F8 0x00280000 +SoundReq0x80100000 +SoundReq 0x009b +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +TextboxNoOverlapFollowPos +.short 0x1043 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +SoundReq2 0x000d +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +_0807E5F8 0x0002a800 +WaitForSomething2 0x00055000 +SoundReq 0x01c7 +SoundReq 0x00e5 +_0807E5F8 0x00000100 +_0807E5F8 0x00002800 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +WaitForSomething2 0x00000200 +WaitForSomething2 0x00005000 +_0807E5F8 0x00028000 +WaitForSomething2 0x00050000 +TextboxNoOverlapFollowPos +.short 0x1044 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +SetEntityPositionRelative 0x009801f8 +SoundReq0x80100000 +Wait 0x003c +SoundReq2 0x002f +_0807E5F8 0x00028000 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +WaitForSomething2 0x00050000 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x00e5 +_0807E5F8 0x00028000 +WaitForSomething2 0x00050000 +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +_0807E5F8 0x08000000 +_0807E5F8 0x00800000 +WaitForSomething2 0x01000000 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010BEC.inc b/data/scripts/gUnk_08010BEC.inc deleted file mode 100644 index 702de0a5..00000000 --- a/data/scripts/gUnk_08010BEC.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_08010BEC -_0807E864 -Call sub_0807F9A4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 diff --git a/data/scripts/gUnk_08010BF9.inc b/data/scripts/gUnk_08010BF9.inc deleted file mode 100644 index 039aa440..00000000 --- a/data/scripts/gUnk_08010BF9.inc +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_START gUnk_08010BF9 -.byte 0x8 -.byte 0x47 -.byte 0xc -.byte 0x74 -.byte 0x10 diff --git a/data/scripts/gUnk_08010BFE.inc b/data/scripts/gUnk_08010BFE.inc deleted file mode 100644 index 67042c7d..00000000 --- a/data/scripts/gUnk_08010BFE.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_08010BFE -.short 0x0801 -.short 0x0c33 -.short 0x0400 -.short 0x0000 -.short 0x0c85 -.short 0x0034 -.short 0x0002 -.short 0x0c5c -.short 0x1036 -.short 0x000c -.short 0x0459 -.short 0x0c28 -.short 0x0010 -.short 0x0000 diff --git a/data/scripts/gUnk_08010C1A.inc b/data/scripts/gUnk_08010C1A.inc deleted file mode 100644 index fc363f6b..00000000 --- a/data/scripts/gUnk_08010C1A.inc +++ /dev/null @@ -1,53 +0,0 @@ -SCRIPT_START gUnk_08010C1A -WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos 0x1037, 0x0002 -_0807EA94 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos 0x1038, 0x000c -_0807EA94 -SoundReq0x80100000 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -Call sub_08064180 -LoadRoomEntityList 0x080f06e0 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -StartPlayerScript 0x08011098 -WaitForSomething2 0x00000400 -SetEntityPositionRelative 0x005001f8 -_0807F0B4 0x0007 -CameraTargetEntity -Wait 0x000a -_0807F0B4 0x0001 -_0807E778 0x0001 -DoFade4 -_0807E5F8 0x0002a800 -WaitForSomething2 0x00055000 -SetEntityPositionRelative 0x007801f8 -Wait 0x003c -_0807E5F8 0x00800000 -WaitForSomething2 0x01000000 -_0807E5F8 0x0002a800 -WaitForSomething2 0x00055000 -_0807E8E4_1 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos 0x1039, 0x000c -_0807EA94 -SoundReq2 0x0001 -_0807E8E4_2 -_0807E5F8 0x00000004 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010D03.inc b/data/scripts/gUnk_08010D03.inc deleted file mode 100644 index 289798d4..00000000 --- a/data/scripts/gUnk_08010D03.inc +++ /dev/null @@ -1,254 +0,0 @@ -SCRIPT_START gUnk_08010D03 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x2c -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x3a -.byte 0x10 -.byte 0xc -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x69 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0xc0 -.byte 0x1 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x69 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x20 -.byte 0x2 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x73 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x98 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0x0 -.byte 0x7e -.byte 0x4 -.byte 0x7b -.byte 0x8 -.byte 0x9b -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x43 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x7c -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0xa8 -.byte 0x2 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x50 -.byte 0x5 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xc7 -.byte 0x1 -.byte 0x7b -.byte 0x8 -.byte 0xe5 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x28 -.byte 0x0 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x50 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x2 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x44 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x69 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x98 -.byte 0x0 -.byte 0x7e -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7c -.byte 0x8 -.byte 0x2f -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x2 -.byte 0x0 -.byte 0x28 -.byte 0xc diff --git a/data/scripts/gUnk_08010E00.inc b/data/scripts/gUnk_08010E00.inc deleted file mode 100644 index 3c90433d..00000000 --- a/data/scripts/gUnk_08010E00.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START gUnk_08010E00 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 diff --git a/data/scripts/gUnk_08010E0D.inc b/data/scripts/gUnk_08010E0D.inc deleted file mode 100644 index 73e24ad0..00000000 --- a/data/scripts/gUnk_08010E0D.inc +++ /dev/null @@ -1,244 +0,0 @@ -SCRIPT_START gUnk_08010E0D -.byte 0x0 -.byte 0x5 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xe5 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x2 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x25 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0xed -.byte 0xdd -.byte 0x5 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x25 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x25 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x25 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x2c -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x38 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x3f -.byte 0x4 -.byte 0x37 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xab -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xc2 -.byte 0x1 -.byte 0xd -.byte 0xc -.byte 0x70 -.byte 0x7 -.byte 0xf -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x38 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x3e -.byte 0x4 -.byte 0x37 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0x19 -.byte 0xde -.byte 0x5 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0xdc -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x45 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x9d -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0xf6 -.byte 0x49 diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc new file mode 100644 index 00000000..0154c425 --- /dev/null +++ b/data/scripts/gUnk_08010E5A.inc @@ -0,0 +1,101 @@ +SCRIPT_START gUnk_08010E5A +Wait 0x001e +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +Wait 0x003c +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +Wait 0x0004 +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +Wait 0x001e +SoundReq 0x012c +_0807E5F8 0x00800000 +WaitForSomething2 0x01000000 +_0807E778 0x0004 +DoFade7 +WaitFor_2 +Wait 0x003c +SoundReq 0x00ab +SoundReq 0x01c2 +LoadRoomEntityList 0x080f0770 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +_0807E778 0x0002 +DoFade6 +WaitFor_2 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +Call 0x0806dc3d +Call 0x080791bd +CallWithArg +.short 0xf245 +.short 0x0807 +.short 0x000d +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x49f6 +.short 0x0800 +@ End of 4 parameters +_0807F0B4 0x0001 +SetEntityPositionRelative 0x006801f8 +_0807E5F8 0x00000004 +Wait 0x001e +_0807E5F8 0x00000040 +WaitForSomething2 0x00000008 +WaitForSomething2 0x00000080 +SoundReq 0x01c3 +_0807E5F8 0x20000000 +Wait 0x0078 +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0806dc59 +_0807E5F8 0x40000000 +_0807E5F8 0x00000010 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000020 +WaitForSomething2 0x00000200 +TextboxNoOverlapFollowPos +.short 0x1045 +.short 0x000c +@ End of 2 parameters +_0807EA94 +TextboxNoOverlapFollowPos +.short 0x1046 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010F00.inc b/data/scripts/gUnk_08010F00.inc deleted file mode 100644 index 90b72291..00000000 --- a/data/scripts/gUnk_08010F00.inc +++ /dev/null @@ -1,256 +0,0 @@ -SCRIPT_START gUnk_08010F00 -.byte 0x0 -.byte 0x8 -.byte 0x89 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x69 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x68 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xc3 -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x20 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x9d -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0xdc -.byte 0x6 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x40 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x45 -.byte 0x10 -.byte 0xc -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x5c -.byte 0xc -.byte 0x46 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xed -.byte 0xdd -.byte 0x5 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8a -.byte 0xc -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x47 -.byte 0xc -.byte 0xbc -.byte 0x10 -.byte 0x1 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x47 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0xdc -.byte 0x6 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x45 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x9d -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0xf6 -.byte 0x49 -.byte 0x0 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x9d -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0xdc -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0x25 -.byte 0x1 -.byte 0xc -.byte 0x14 -.byte 0x29 -.byte 0xfb -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc new file mode 100644 index 00000000..84c28023 --- /dev/null +++ b/data/scripts/gUnk_08010F84.inc @@ -0,0 +1,83 @@ +SCRIPT_START gUnk_08010F84 +Wait 0x003c +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +StartPlayerScript 0x080110bc +WaitForSomething2 0x00000400 +TextboxNoOverlapFollowPos +.short 0x1047 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +Call 0x0806dc3d +Call 0x080791bd +CallWithArg +.short 0xf245 +.short 0x0807 +.short 0x000d +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x49f6 +.short 0x0800 +@ End of 4 parameters +Wait 0x001e +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0806dc59 +Wait 0x003c +_0807E5F8 0x08000000 +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +Wait 0x000f +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +SoundReq0x80100000 +Wait 0x003c +TextboxNoOverlapFollowPos +.short 0x104a +.short 0x0000 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +TextboxNoOverlapFollowPos +.short 0x1049 +.short 0x0000 +@ End of 2 parameters +_0807EA94 +SetEntityPositionRelative 0x009801f8 +Wait 0x0078 +_0807E5F8 0x00000100 +WaitForSomething2 0x00000200 +Call 0x0804bcdd +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08010FFF.inc b/data/scripts/gUnk_08010FFF.inc deleted file mode 100644 index d319abb4..00000000 --- a/data/scripts/gUnk_08010FFF.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08010FFF -.byte 0x0 diff --git a/data/scripts/gUnk_08011000.inc b/data/scripts/gUnk_08011000.inc deleted file mode 100644 index 4a387917..00000000 --- a/data/scripts/gUnk_08011000.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08011000 -.byte 0x31 diff --git a/data/scripts/gUnk_08011001.inc b/data/scripts/gUnk_08011001.inc deleted file mode 100644 index 1c184d98..00000000 --- a/data/scripts/gUnk_08011001.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08011001 -.short 0x0f08 -.short 0x7b00 -.short 0x2508 -.short 0x0c01 -.short 0x2914 -.short 0x07fb -.short 0x0308 -.short 0x0000 -.short 0x0c00 -.short 0x1914 -.short 0x05de -.short 0x0208 -.short 0x0000 -.short 0x8a00 -.short 0x000c diff --git a/data/scripts/gUnk_0801101F.inc b/data/scripts/gUnk_0801101F.inc deleted file mode 100644 index 6a0e859a..00000000 --- a/data/scripts/gUnk_0801101F.inc +++ /dev/null @@ -1,86 +0,0 @@ -SCRIPT_START gUnk_0801101F -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x7e -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x4a -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x5c -.byte 0xc -.byte 0x49 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x59 -.byte 0x4 -.byte 0x69 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x98 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xdd -.byte 0xbc -.byte 0x4 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/gUnk_08011074.inc index 76e1eb81..38da146f 100644 --- a/data/scripts/gUnk_08011074.inc +++ b/data/scripts/gUnk_08011074.inc @@ -3,4 +3,8 @@ StartScript SetEntityNonPlanarMovement 0x0080 StopScript _0807EDD4 0x01e8, 0x0050 -.byte 0x61 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08011083.inc b/data/scripts/gUnk_08011083.inc deleted file mode 100644 index e398b2fe..00000000 --- a/data/scripts/gUnk_08011083.inc +++ /dev/null @@ -1,90 +0,0 @@ -SCRIPT_START gUnk_08011083 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x69 -.byte 0xc -.byte 0xa8 -.byte 0x1 -.byte 0x58 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x29 -.byte 0xc -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xbd -.byte 0x91 -.byte 0x7 -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0x1 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x2 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xd8 -.byte 0x1 -.byte 0x68 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc diff --git a/data/scripts/gUnk_08011098.inc b/data/scripts/gUnk_08011098.inc new file mode 100644 index 00000000..a86bbcb8 --- /dev/null +++ b/data/scripts/gUnk_08011098.inc @@ -0,0 +1,9 @@ +SCRIPT_START gUnk_08011098 +SetEntityPositionRelative 0x005801a8 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000400 +_0807E610 0x00000002 +StopScript +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_080110BC.inc b/data/scripts/gUnk_080110BC.inc new file mode 100644 index 00000000..5ff9e2a6 --- /dev/null +++ b/data/scripts/gUnk_080110BC.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_080110BC +StartScript +SetEntityNonPlanarMovement 0x0040 +StopScript +SetEntityNonPlanarMovement 0x0200 +_0807EF80 0x0001 +_0807EDD4 0x01d8, 0x0068 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000400 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_080110DC.inc b/data/scripts/gUnk_080110DC.inc deleted file mode 100644 index 2378181b..00000000 --- a/data/scripts/gUnk_080110DC.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START gUnk_080110DC -ScriptCommandNop -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/gUnk_080110E8.inc index 888fb7cd..340d4165 100644 --- a/data/scripts/gUnk_080110E8.inc +++ b/data/scripts/gUnk_080110E8.inc @@ -3,14 +3,14 @@ SoundReq 0x007a _0807EB44 0x0004 _0807EF80 0x000d SoundReq 0x0086 -Call sub_0807F36C +Call 0x0807f36d SetEntityNonPlanarMovement 0x0400 _0807ECF4 0x0008 StartScript -Call sub_0807F1E8 +Call 0x0807f1e9 _0807EF80 0x0011 StopScript -Call sub_0807F2D4 +Call 0x0807f2d5 WaitForSomething 0x80000000 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc index 9ff7e44a..9f6aef32 100644 --- a/data/scripts/gUnk_08011128.inc +++ b/data/scripts/gUnk_08011128.inc @@ -27,7 +27,7 @@ WaitForSomething2 0x00000004 _0807EF80 0x0010 Wait 0x001e _0807EF80 0x0010 -Call sub_0807F3C8 +Call 0x0807f3c9 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/gUnk_080111CC.inc index 8b1d7f41..7f1b7db9 100644 --- a/data/scripts/gUnk_080111CC.inc +++ b/data/scripts/gUnk_080111CC.inc @@ -2,14 +2,52 @@ SCRIPT_START gUnk_080111CC StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 -Call sub_08066D04 +Call 0x08066d05 StopScript -Call sub_0807F338 +Call 0x0807f339 WaitForSomething2 0x00000010 -Call sub_08066D14 +Call 0x08066d15 JumpIf 0x0004 MoveEntityToPlayer -Call sub_0807F8BC +Call 0x0807f8bd JumpIf 0x0008 SetEntityPositionRelative 0x00b801f8 -.short 0x0879 +_0807EF80 0x0007 +_0807EF80 0x0001 +_0807EDD4 0x01f8, 0x0050 +_0807EB74 +_0807EF80 0x0000 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +_0807EF80 0x0001 +_0807EDD4 0x01f8, 0x0020 +_0807EF80 0x0008 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +_0807EF80 0x0007 +_0807EF80 0x0001 +SetEntityNonPlanarMovement 0x0040 +_0807EDD4 0x01e8, 0x0040 +_0807EF80 0x0000 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +Call 0x08095811 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +_0807EF80 0x0001 +_0807EDD4 0x01d8, 0x0058 +_0807EF80 0x0000 +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +SoundReq 0x01c9 +_0807EF80 0x0010 +Wait 0x0014 +Call 0x08066e21 +Wait 0x0014 +_0807EF80 0x0010 +Call 0x0807f2d5 +SoundReq 0x01ca +_0807E5F8 0x00000020 +WaitForSomething2 0x00000010 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08011208.inc b/data/scripts/gUnk_08011208.inc deleted file mode 100644 index 59486065..00000000 --- a/data/scripts/gUnk_08011208.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_08011208 -.byte 0x7 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x50 -.byte 0x0 -.byte 0x63 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 diff --git a/data/scripts/gUnk_0801121D.inc b/data/scripts/gUnk_0801121D.inc deleted file mode 100644 index 193f502a..00000000 --- a/data/scripts/gUnk_0801121D.inc +++ /dev/null @@ -1,168 +0,0 @@ -SCRIPT_START gUnk_0801121D -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xf8 -.byte 0x1 -.byte 0x20 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xe8 -.byte 0x1 -.byte 0x40 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0x58 -.byte 0x9 -.byte 0x8 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0xd8 -.byte 0x1 -.byte 0x58 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0xc9 -.byte 0x1 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x21 -.byte 0x6e -.byte 0x6 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xd5 -.byte 0xf2 -.byte 0x7 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xca -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc index 0286410e..69153313 100644 --- a/data/scripts/gUnk_080112C4.inc +++ b/data/scripts/gUnk_080112C4.inc @@ -2,8 +2,8 @@ SCRIPT_START gUnk_080112C4 StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 -Call sub_08095244 -Call sub_0807F338 +Call 0x08095245 +Call 0x0807f339 StopScript WaitForSomething 0x0002a800 _0807EF80 0x0007 @@ -14,11 +14,43 @@ _0807ECC4 0x0010 Wait 0x003c _0807ECC4 0x0010 _0807E930 0x0002 -Call sub_08064050 -.byte 0x6 -.byte 0x14 -.byte 0x8 -.byte 0x0 -.byte 0x9e -.byte 0x0 -.byte 0x34 +Call 0x08064051 +_0807E078 +.short 0x0008 +.short 0x009e +.short 0x0134 +.short 0x01f8 +@ End of 4 parameters +_0807E610 0x00000800 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +_0807E930 0x0007 +_0807EB44 0x0006 +_0807ECF4 0x0010 +_0807EB44 0x0004 +_0807E930 0x0002 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0012 +SoundReq 0x011e +Wait 0x003c +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x01f0, 0x0098 +_0807EDD4 0x01f0, 0x00c8 +_0807E930 0x0013 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +_0807EF80 0x0010 +Wait 0x000a +_0807EF80 0x0010 +Call 0x0807f3c9 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0400 +SetEntityDirection 0x001e +_0807EC1C 0x003c +_0807E5F8 0x00001000 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0801130F.inc b/data/scripts/gUnk_0801130F.inc deleted file mode 100644 index 38738813..00000000 --- a/data/scripts/gUnk_0801130F.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START gUnk_0801130F -.byte 0x1 -.byte 0xf8 -.byte 0x1 -.byte 0x29 -.byte 0xc -.byte 0x0 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x7 -.byte 0x0 diff --git a/data/scripts/gUnk_08011328.inc b/data/scripts/gUnk_08011328.inc deleted file mode 100644 index 7f80777c..00000000 --- a/data/scripts/gUnk_08011328.inc +++ /dev/null @@ -1,119 +0,0 @@ -SCRIPT_START gUnk_08011328 -_0807EB44 0x0006 -_0807ECF4 0x0010 -_0807EB44 0x0004 -_0807E930 0x0002 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0012 -SoundReq 0x011e -Wait 0x003c -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x01f0, 0x0098 -_0807EDD4 0x01f0, 0x00c8 -_0807E930 0x0013 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EF80 0x0010 -Wait 0x000a -_0807EF80 0x0010 -Call sub_0807F3C8 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x001e -_0807EC1C 0x003c -_0807E5F8 0x00001000 -_0807EF80 0x0006 -SCRIPT_END -.byte 0x29 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x6f -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x12 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x1e -.byte 0x1 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x73 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x98 -.byte 0x0 -.byte 0x73 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0xc8 diff --git a/data/scripts/gUnk_080113AA.inc b/data/scripts/gUnk_080113AA.inc new file mode 100644 index 00000000..7eee5c8d --- /dev/null +++ b/data/scripts/gUnk_080113AA.inc @@ -0,0 +1,34 @@ +SCRIPT_START gUnk_080113AA +_0807E610 0x00002000 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +_0807E930 0x0005 +_0807EB44 0x0002 +_0807EC94 0x0010 +_0807EB44 0x0004 +_0807E930 0x0002 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0012 +SoundReq 0x011e +Wait 0x003c +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0200, 0x0098 +_0807EDD4 0x0200, 0x00c8 +_0807E930 0x0013 +_0807E5F8 0x00004000 +WaitForSomething2 0x00002000 +_0807EF80 0x0010 +Wait 0x000a +_0807EF80 0x0010 +Call 0x0807f3c9 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0400 +SetEntityDirection 0x0002 +_0807EC1C 0x003c +_0807E5F8 0x00004000 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08011403.inc b/data/scripts/gUnk_08011403.inc deleted file mode 100644 index 2ac5a910..00000000 --- a/data/scripts/gUnk_08011403.inc +++ /dev/null @@ -1,462 +0,0 @@ -SCRIPT_START gUnk_08011403 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x13 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x20 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xc9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x4 -.byte 0x65 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x6d -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x40 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x29 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x7 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x71 -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x70 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x12 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x1e -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x73 -.byte 0xc -.byte 0xe8 -.byte 0x1 -.byte 0x98 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x13 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xf0 -.byte 0xff -.byte 0x50 -.byte 0x8 -.byte 0x13 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x80 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xc9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x4 -.byte 0x65 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x6d -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x29 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x6f -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x70 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x12 -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x1e -.byte 0x1 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x73 -.byte 0xc -.byte 0x8 -.byte 0x2 -.byte 0x98 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x40 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x10 -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x13 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x77 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0xf0 -.byte 0xff -.byte 0x50 -.byte 0x8 -.byte 0x13 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x10 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xc9 -.byte 0xf3 -.byte 0x7 -.byte 0x8 -.byte 0x50 -.byte 0x8 -.byte 0x14 -.byte 0x0 -.byte 0x67 -.byte 0x8 -.byte 0x0 -.byte 0x4 -.byte 0x65 -.byte 0x8 -.byte 0x2 -.byte 0x0 -.byte 0x6d -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08011442.inc b/data/scripts/gUnk_08011442.inc new file mode 100644 index 00000000..ce71ee93 --- /dev/null +++ b/data/scripts/gUnk_08011442.inc @@ -0,0 +1,43 @@ +SCRIPT_START gUnk_08011442 +_0807E610 0x00008000 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807E930 0x0007 +_0807EB44 0x0006 +_0807ECF4 0x0020 +_0807EB44 0x0004 +_0807E930 0x0006 +_0807ECC4 0x0010 +_0807E930 0x0002 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0012 +SoundReq 0x011e +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x01e8, 0x0098 +SetEntityNonPlanarMovement 0x0040 +_0807EEF4 0x0000, 0x0010 +_0807E930 0x0013 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807EF80 0x000d +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0020 +_0807EEF4 0x0000, 0xfff0 +_0807E930 0x0013 +_0807EF80 0x0010 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +Call 0x0807f3c9 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0400 +SetEntityDirection 0x001e +_0807EC1C 0x003c +_0807E5F8 0x00010000 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08011508.inc b/data/scripts/gUnk_08011508.inc new file mode 100644 index 00000000..5eda78db --- /dev/null +++ b/data/scripts/gUnk_08011508.inc @@ -0,0 +1,44 @@ +SCRIPT_START gUnk_08011508 +_0807E610 0x00020000 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +_0807E930 0x0005 +_0807EB44 0x0002 +_0807EC94 0x0020 +_0807EB44 0x0004 +_0807E930 0x0006 +_0807ECC4 0x0010 +_0807E930 0x0002 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0012 +SoundReq 0x011e +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0208, 0x0098 +SetEntityNonPlanarMovement 0x0040 +_0807EEF4 0x0000, 0x0010 +_0807E930 0x0013 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +_0807EF80 0x000d +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0020 +_0807EEF4 0x0000, 0xfff0 +_0807E930 0x0013 +_0807EF80 0x0010 +_0807E5F8 0x00040000 +WaitForSomething2 0x00020000 +Call 0x0807f3c9 +_0807E930 0x0014 +SetEntityNonPlanarMovement 0x0400 +SetEntityDirection 0x0002 +_0807EC1C 0x003c +_0807E5F8 0x00040000 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/gUnk_08011640.inc index a78e490d..c80b52e3 100644 --- a/data/scripts/gUnk_08011640.inc +++ b/data/scripts/gUnk_08011640.inc @@ -4,7 +4,7 @@ _0807EF80 0x0008 _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 StopScript -Call sub_0807F338 +Call 0x0807f339 WaitForSomething2 0x00000040 _0807EF80 0x0007 _0807EF80 0x0001 @@ -16,7 +16,7 @@ WaitForSomething2 0x00000040 _0807EF80 0x0010 Wait 0x001e _0807EF80 0x0010 -Call sub_0807F3C8 +Call 0x0807f3c9 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc index 6d6462f1..88896410 100644 --- a/data/scripts/gUnk_080116A8.inc +++ b/data/scripts/gUnk_080116A8.inc @@ -3,7 +3,7 @@ StartScript _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0100 StopScript -Call sub_0807F338 +Call 0x0807f339 WaitForSomething2 0x00000100 _0807EF80 0x0001 _0807EDD4 0x01f8, 0x00d0 @@ -12,28 +12,33 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0004 _0807EF80 0x001c -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x001c -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x001a -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x0014 SoundReq 0x0120 -CallWithArg sub_08095420, 0x08011890 +CallWithArg +.short 0x5421 +.short 0x0809 +.short 0x1890 +.short 0x0801 +@ End of 4 parameters Wait 0x00f0 _0807EF80 0x0016 SoundReq 0x01cb @@ -50,7 +55,12 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EF80 0x0014 SoundReq 0x01c4 -CallWithArg sub_0809545C, 0x080118d4 +CallWithArg +.short 0x545d +.short 0x0809 +.short 0x18d4 +.short 0x0801 +@ End of 4 parameters _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Wait 0x003c @@ -70,5 +80,16 @@ _0807EF80 0x0004 Wait 0x005a _0807EB44 0x0004 _0807EF80 0x001c -Call sub_0807F2D4 -.byte 0x61 +Call 0x0807f2d5 +_0807EB44 0x0004 +_0807EF80 0x0000 +Wait 0x001e +_0807E5F8 0x00000200 +WaitForSomething2 0x00000100 +Call 0x08066ca5 +_0807EF80 0x0008 +Wait 0x0078 +_0807E5F8 0x00000200 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08011809.inc b/data/scripts/gUnk_08011809.inc deleted file mode 100644 index 74582ec9..00000000 --- a/data/scripts/gUnk_08011809.inc +++ /dev/null @@ -1,52 +0,0 @@ -SCRIPT_START gUnk_08011809 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x0 -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0x6c -.byte 0x6 -.byte 0x8 -.byte 0x79 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x78 -.byte 0x0 -.byte 0x28 -.byte 0xc -.byte 0x0 -.byte 0x2 -.byte 0x0 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/gUnk_0801183C.inc index f0ae1d32..2eb2de7b 100644 --- a/data/scripts/gUnk_0801183C.inc +++ b/data/scripts/gUnk_0801183C.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_0801183C StartScript -Call sub_08095330 +Call 0x08095331 StopScript WaitForSomething2 0x00800000 _0807EF3C 0x0000, 0x0020 _0807E5F8 0x01000000 WaitForSomething2 0x00800000 -Call sub_08095364 +Call 0x08095365 SoundReq 0x0122 Wait 0x003c _0807E5F8 0x01000000 @@ -17,37 +17,3 @@ WaitForSomething2 0x00800000 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0850 -.short 0x0000 -.short 0x0867 -.short 0x0200 -.short 0x0c0b -.short 0x5459 -.short 0x0809 -.short 0x0c0b -.short 0x4b81 -.short 0x0809 -.short 0x0402 -.short 0x0831 -.short 0x00f0 -.short 0x0c0b -.short 0x4b6d -.short 0x0809 -.short 0x0c73 -.short 0x01f8 -.short 0x0088 -.short 0x0c0b -.short 0x4b81 -.short 0x0809 -.short 0x087b -.short 0x01cc -.short 0x0c28 -.short 0x0000 -.short 0x1000 -.short 0x0c33 -.short 0x0000 -.short 0x0800 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_08011890.inc b/data/scripts/gUnk_08011890.inc new file mode 100644 index 00000000..116e1599 --- /dev/null +++ b/data/scripts/gUnk_08011890.inc @@ -0,0 +1,16 @@ +SCRIPT_START gUnk_08011890 +StartScript +_0807E930 0x0000 +SetEntityNonPlanarMovement 0x0200 +Call 0x08095459 +Call 0x08094b81 +StopScript +Wait 0x00f0 +Call 0x08094b6d +_0807EDD4 0x01f8, 0x0088 +Call 0x08094b81 +SoundReq 0x01cc +_0807E5F8 0x10000000 +WaitForSomething2 0x08000000 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/gUnk_080118D4.inc index 057f405b..ccd69ee2 100644 --- a/data/scripts/gUnk_080118D4.inc +++ b/data/scripts/gUnk_080118D4.inc @@ -2,15 +2,15 @@ SCRIPT_START gUnk_080118D4 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call nullsub_527 -Call sub_08094B80 +Call 0x08095459 +Call 0x08094b81 StopScript WaitForSomething2 0x08000000 -Call sub_08094B6C +Call 0x08094b6d _0807EDD4 0x01d8, 0x0078 StartPlayerScript 0x080110e8 _0807EDD4 0x01d8, 0x0058 -Call sub_08094B80 +Call 0x08094b81 SoundReq 0x009a SoundReq 0x01c6 _0807E5F8 0x10000000 diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/gUnk_08011930.inc index 586cc75a..909e9250 100644 --- a/data/scripts/gUnk_08011930.inc +++ b/data/scripts/gUnk_08011930.inc @@ -1,5 +1,5 @@ SCRIPT_START gUnk_08011930 WaitForSomething 0x20000000 -Call sub_0809567C +Call 0x0809567d SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc index 4d8ee99c..eaf6c38a 100644 --- a/data/scripts/gUnk_0801194C.inc +++ b/data/scripts/gUnk_0801194C.inc @@ -3,3 +3,191 @@ StartScript _0807EB44 0x0002 Jump 0x0016 .short 0x0000 +StartScript +_0807EB44 0x0006 +Jump 0x000a +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +CheckGlobalFlag 0x0015 +JumpIf 0x000a +TextboxNoOverlapFollow 0x103d +Jump 0x0006 +TextboxNoOverlapFollow 0x103f +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffce +StartScript +_0807E9D4 +_0807EB44 0x0004 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x000c +.short 0x0000 +@ End of 4 parameters +StopScript +Wait 0x003c +Call 0x0806407d +Jump 0xfff4 +.short 0x0000 +StartScript +_0807EB44 0x0002 +Jump 0x0016 +.short 0x0000 +StartScript +_0807EB44 0x0004 +Jump 0x000a +.short 0x0000 +StartScript +_0807EB44 0x0006 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x08064429 +_0807EA94 +_0807E878 +Jump 0xffe0 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlapFollow 0x1320 +_0807EA94 +_0807E878 +Jump 0xffe2 +StartScript +_0807EB44 0x0002 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0x44b5 +.short 0x0806 +.short 0x0006 +.short 0x0000 +@ End of 4 parameters +JumpIf 0x005e +TextboxNoOverlapFollow 0x1320 +_0807EA94 +_0807E878 +Jump 0xffd4 +.short 0x0000 +StartScript +_0807EB44 0x0004 +_0807E9D4 +_0807EF80 0x000a +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +TextboxNoOverlapFollow 0x1322 +_0807EA94 +_0807E878 +Jump 0xffe2 +CheckRoomFlag 0x000f +JumpIfNot 0xfffa +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +TextboxNoOverlapFollowPos +.short 0x1321 +.short 0x0007 +@ End of 2 parameters +_0807EA94 +SetLocalFlag 0x0010 +CallWithArg +.short 0xda1d +.short 0x0806 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +_0807E878 +Call 0x0807df51 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08011958.inc b/data/scripts/gUnk_08011958.inc deleted file mode 100644 index 0683cad2..00000000 --- a/data/scripts/gUnk_08011958.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08011958 -StartScript -_0807EB44 0x0006 -Jump 0x000a -.short 0x0000 diff --git a/data/scripts/gUnk_08011964.inc b/data/scripts/gUnk_08011964.inc deleted file mode 100644 index c2176022..00000000 --- a/data/scripts/gUnk_08011964.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_08011964 -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -CheckGlobalFlag 0x0015 -JumpIf 0x000a -TextboxNoOverlapFollow 0x103d -Jump 0x0006 -TextboxNoOverlapFollow 0x103f -_0807EA94 -Wait 0x000f -_0807E878 -.short 0x0803 -.short 0xffce diff --git a/data/scripts/gUnk_080119B0.inc b/data/scripts/gUnk_080119B0.inc deleted file mode 100644 index 76d4b5ab..00000000 --- a/data/scripts/gUnk_080119B0.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_080119B0 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x0000000c -StopScript -Wait 0x003c -Call sub_0806407C -Jump 0xfff4 -.short 0x0000 diff --git a/data/scripts/gUnk_080119D8.inc b/data/scripts/gUnk_080119D8.inc deleted file mode 100644 index 59e2a558..00000000 --- a/data/scripts/gUnk_080119D8.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_080119D8 -StartScript -_0807EB44 0x0002 -Jump 0x0016 -.short 0x0000 diff --git a/data/scripts/gUnk_080119E4.inc b/data/scripts/gUnk_080119E4.inc deleted file mode 100644 index 5d6df4fd..00000000 --- a/data/scripts/gUnk_080119E4.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_080119E4 -StartScript -_0807EB44 0x0004 -Jump 0x000a -.short 0x0000 diff --git a/data/scripts/gUnk_080119F0.inc b/data/scripts/gUnk_080119F0.inc deleted file mode 100644 index 46614110..00000000 --- a/data/scripts/gUnk_080119F0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080119F0 -StartScript -_0807EB44 0x0006 -_0807E9D4 -_0807EF80 0x000a -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 diff --git a/data/scripts/gUnk_08011A04.inc b/data/scripts/gUnk_08011A04.inc deleted file mode 100644 index 64d320a2..00000000 --- a/data/scripts/gUnk_08011A04.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_08011A04 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 -.short 0x0463 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0c0b -.short 0x4429 -.short 0x0806 -.short 0x0459 -.short 0x0444 -.short 0x0803 -.short 0xffe0 -.short 0x0000 diff --git a/data/scripts/gUnk_08011A2C.inc b/data/scripts/gUnk_08011A2C.inc deleted file mode 100644 index a1d29930..00000000 --- a/data/scripts/gUnk_08011A2C.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08011A2C -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlapFollow 0x1320 -_0807EA94 -_0807E878 -.short 0x0803 -.short 0xffe2 diff --git a/data/scripts/gUnk_08011A64.inc b/data/scripts/gUnk_08011A64.inc deleted file mode 100644 index d0163977..00000000 --- a/data/scripts/gUnk_08011A64.inc +++ /dev/null @@ -1,47 +0,0 @@ -SCRIPT_START gUnk_08011A64 -StartScript -_0807EB44 0x0002 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -CallWithArg sub_080644B4, 0x00000006 -JumpIf 0x005e -TextboxNoOverlapFollow 0x1320 -_0807EA94 -_0807E878 -Jump 0xffd4 -.short 0x0000 -.short 0x0401 -.short 0x0861 -.short 0x0004 -.short 0x0453 -.short 0x0879 -.short 0x000a -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 -.short 0x0463 -.short 0x140c -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -.short 0x085a -.short 0x1322 -.short 0x0459 -.short 0x0444 -.short 0x0803 -.short 0xffe2 diff --git a/data/scripts/gUnk_08011AE4.inc b/data/scripts/gUnk_08011AE4.inc deleted file mode 100644 index 231bc978..00000000 --- a/data/scripts/gUnk_08011AE4.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_08011AE4 -CheckRoomFlag 0x000f -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x1321, 0x0007 -_0807EA94 -.short 0x082a diff --git a/data/scripts/gUnk_08011B04.inc b/data/scripts/gUnk_08011B04.inc deleted file mode 100644 index dea2fc94..00000000 --- a/data/scripts/gUnk_08011B04.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_08011B04 -.short 0x0010 -.short 0x140c -.short 0xda1d -.short 0x0806 -.short 0x0003 -.short 0x0000 -.short 0x0444 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc index a33c964a..49463dff 100644 --- a/data/scripts/gUnk_08011B20.inc +++ b/data/scripts/gUnk_08011B20.inc @@ -1,10 +1,13 @@ SCRIPT_START gUnk_08011B20 _0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x1320, 0x000c +Call 0x0807df29 +TextboxNoOverlapFollowPos +.short 0x1320 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E878 -Call sub_0807DF50 +Call 0x0807df51 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc index c69b2845..df282424 100644 --- a/data/scripts/gUnk_08011B40.inc +++ b/data/scripts/gUnk_08011B40.inc @@ -16,7 +16,7 @@ TextboxNoOverlap 0x3d07 _0807EA94 _0807EB44 0x0004 ClearGlobalFlag 0x0050 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 CheckEntityInteractType JumpIfNot 0xfffc @@ -39,9 +39,53 @@ ModRupees 0xfff6 Wait 0x001e TextboxNoOverlap 0x3d06 _0807EA94 -CallWithArg sub_0806C2A0, 0x00000000 +CallWithArg +.short 0xc2a1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters WaitFor_2 Wait 0x003c -Call sub_0806C224 -.short 0x0803 -.short 0xffb8 +Call 0x0806c225 +Jump 0xffb8 +StartScript +_0807E888 +StopScript +CallWithArg +.short 0xc2a1 +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +WaitFor_2 +Wait 0x003c +_0807E878 +SetRoomFlag 0x0000 +SoundReq2 0x0033 +CheckRoomFlag 0x0064 +JumpIfNot 0xfffa +SoundReq0x80100000 +_0807E864 +Wait 0x003c +CameraTargetEntity +Wait 0x003c +Call 0x0806c23d +Wait 0x003c +CameraTargetPlayer +_0807E878 +CheckLocalFlag 0x0001 +JumpIfNot 0xfffa +_0807E888 +WaitPlayerAction8 +Wait 0x001e +CallWithArg +.short 0xc2a1 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +WaitFor_2 +Wait 0x003c +Call 0x0806c281 +SCRIPT_END diff --git a/data/scripts/gUnk_08011BE4.inc b/data/scripts/gUnk_08011BE4.inc deleted file mode 100644 index 4a474683..00000000 --- a/data/scripts/gUnk_08011BE4.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START gUnk_08011BE4 -StartScript -_0807E888 -StopScript -CallWithArg sub_0806C2A0, 0x00000001 -WaitFor_2 -Wait 0x003c -_0807E878 -SetRoomFlag 0x0000 -.short 0x087c -.short 0x0033 diff --git a/data/scripts/gUnk_08011C04.inc b/data/scripts/gUnk_08011C04.inc deleted file mode 100644 index 235fcfeb..00000000 --- a/data/scripts/gUnk_08011C04.inc +++ /dev/null @@ -1,22 +0,0 @@ -SCRIPT_START gUnk_08011C04 -CheckRoomFlag 0x0064 -JumpIfNot 0xfffa -SoundReq0x80100000 -_0807E864 -Wait 0x003c -CameraTargetEntity -Wait 0x003c -Call Simon_CreateChest -Wait 0x003c -CameraTargetPlayer -_0807E878 -CheckLocalFlag 0x0001 -JumpIfNot 0xfffa -_0807E888 -WaitPlayerAction8 -Wait 0x001e -CallWithArg sub_0806C2A0, 0x00000000 -WaitFor_2 -Wait 0x003c -Call sub_0806C280 -SCRIPT_END diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc index 3ef468d6..aacd2d70 100644 --- a/data/scripts/gUnk_08011C50.inc +++ b/data/scripts/gUnk_08011C50.inc @@ -3,7 +3,12 @@ StartScript _0807E864 StopScript Wait 0x003c -CallWithArg sub_0806C2A0, 0x00000001 +CallWithArg +.short 0xc2a1 +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters WaitFor_2 Wait 0x003c _0807EF80 0x0014 diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc index 1c3bac33..9ada852c 100644 --- a/data/scripts/gUnk_08011C7C.inc +++ b/data/scripts/gUnk_08011C7C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08011C7C StartScript -Call sub_08064828 +Call 0x08064829 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -54,3 +54,472 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffdc .short 0x0000 +StartScript +Call 0x08064929 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +CheckGlobalFlag 0x0047 +JumpIf 0x002c +StopScript +StopScript +StartScript +CheckEntityInteractType +JumpIfNot 0xfff8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x4513 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffda +StopScript +StartScript +CheckGlobalFlag 0x002b +JumpIf 0xffce +CheckGlobalFlag 0x002d +JumpIf 0xffc6 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3103 +_0807EA94 +_0807E3E8 +JumpIf 0x001e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffc4 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3106 +_0807EA94 +SetGlobalFlag 0x002c +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffdc +.short 0x0000 +StartScript +Call 0x08064a29 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +CheckGlobalFlag 0x0047 +JumpIf 0x002c +StopScript +StopScript +StartScript +CheckEntityInteractType +JumpIfNot 0xfff8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x4514 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffda +StopScript +StartScript +CheckGlobalFlag 0x002b +JumpIf 0xffce +CheckGlobalFlag 0x002c +JumpIf 0xffc6 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3104 +_0807EA94 +_0807E3E8 +JumpIf 0x001e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffc4 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3107 +_0807EA94 +SetGlobalFlag 0x002d +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffdc +.short 0x0000 +StartScript +Call 0x08064829 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +StopScript +StartScript +CheckGlobalFlag 0x002f +JumpIf 0xfdfa +CheckGlobalFlag 0x0030 +JumpIf 0xfdf2 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckGlobalFlag 0x0048 +JumpIf 0x000c +TextboxNoOverlap 0x4524 +_0807EA94 +Jump 0x000e +TextboxNoOverlap 0x3111 +_0807EA94 +_0807E3E8 +JumpIf 0x001e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffb2 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3114 +_0807EA94 +SetGlobalFlag 0x002e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffdc +StartScript +Call 0x08064929 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +StopScript +StartScript +CheckGlobalFlag 0x002e +JumpIf 0xfe1a +CheckGlobalFlag 0x0030 +JumpIf 0xfe12 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckGlobalFlag 0x0048 +JumpIf 0x000c +TextboxNoOverlap 0x4522 +_0807EA94 +Jump 0x000e +TextboxNoOverlap 0x310f +_0807EA94 +_0807E3E8 +JumpIf 0x001e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffb2 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3112 +_0807EA94 +SetGlobalFlag 0x002f +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffdc +StartScript +Call 0x08064a29 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +StopScript +StartScript +CheckGlobalFlag 0x002e +JumpIf 0xfe3a +CheckGlobalFlag 0x002f +JumpIf 0xfe32 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckGlobalFlag 0x0048 +JumpIf 0x000c +TextboxNoOverlap 0x4523 +_0807EA94 +Jump 0x000e +TextboxNoOverlap 0x3110 +_0807EA94 +_0807E3E8 +JumpIf 0x001e +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffb2 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x3113 +_0807EA94 +SetGlobalFlag 0x0030 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffdc +StartScript +Call 0x08064829 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckLocalFlag 0x0094 +JumpIf 0x0010 +TextboxNoOverlap 0x3122 +_0807EA94 +SetLocalFlag 0x0094 +Jump 0x0042 +_0807E48C 0x0031 +JumpIfNot 0x000c +TextboxNoOverlap 0x3123 +_0807EA94 +Jump 0x0030 +TextboxNoOverlap 0x3124 +_0807EA94 +_0807E3E8 +JumpIfNot 0x0024 +_0807E48C 0x0020 +JumpIfNot 0x0018 +TextboxNoOverlap 0x3125 +_0807EA94 +_0807F034 0x0031 +WaitPlayerAction8 +Call 0x0807fc25 +Jump 0x0006 +TextboxNoOverlap 0x3127 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xff8e +.short 0x0000 +StartScript +Call 0x08064929 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckLocalFlag 0x0095 +JumpIf 0x0010 +TextboxNoOverlap 0x3116 +_0807EA94 +SetLocalFlag 0x0095 +Jump 0x0042 +_0807E48C 0x002f +JumpIfNot 0x000c +TextboxNoOverlap 0x3117 +_0807EA94 +Jump 0x0030 +TextboxNoOverlap 0x3118 +_0807EA94 +_0807E3E8 +JumpIfNot 0x0024 +_0807E48C 0x0020 +JumpIfNot 0x0018 +TextboxNoOverlap 0x3119 +_0807EA94 +_0807F034 0x002f +WaitPlayerAction8 +Call 0x0807fc25 +Jump 0x0006 +TextboxNoOverlap 0x311b +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xff8e +.short 0x0000 +StartScript +Call 0x08064a29 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +CheckLocalFlag 0x0096 +JumpIf 0x0010 +TextboxNoOverlap 0x311c +_0807EA94 +SetLocalFlag 0x0096 +Jump 0x0042 +_0807E48C 0x0030 +JumpIfNot 0x000c +TextboxNoOverlap 0x311d +_0807EA94 +Jump 0x0030 +TextboxNoOverlap 0x311e +_0807EA94 +_0807E3E8 +JumpIfNot 0x0024 +_0807E48C 0x0020 +JumpIfNot 0x0018 +TextboxNoOverlap 0x311f +_0807EA94 +_0807F034 0x0030 +WaitPlayerAction8 +Call 0x0807fc25 +Jump 0x0006 +TextboxNoOverlap 0x3121 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xff8e +.short 0x0000 +StartScript +Call 0x08064829 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x4527 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffe0 +StartScript +Call 0x08064929 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x4525 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffe0 +StartScript +Call 0x08064a29 +_0807EB44 0x0004 +_0807EF80 0x0001 +_0807EF80 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x4526 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0001 +Jump 0xffe0 +StartScript +_0807EB44 0x0004 +Call 0x08061fd9 +_0807E9D4 +_0807EF80 0x000a +StopScript +StopScript +StartScript +CheckGlobalFlag 0x001e +JumpIfNot 0x000a +CheckInventory1 0x0015 +JumpIf 0x0024 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807EB74 +_0807E864 +Call 0x08061fd9 +TextboxNoOverlapFollow 0x2302 +_0807EA94 +_0807E878 +SetGlobalFlag 0x001e +Jump 0xffcc +StopScript +StartScript +CheckRoomFlag 0x0000 +JumpIfNot 0x000a +CheckRoomFlag 0x0001 +JumpIf 0x0020 +CheckEntityInteractType +JumpIfNot 0xffe8 +StopScript +_0807EB74 +_0807E864 +Call 0x08061fd9 +TextboxNoOverlapFollow 0x2303 +_0807EA94 +_0807E878 +Jump 0xffd0 +StopScript +_0807EB74 +_0807E864 +Call 0x08061fd9 +_0807EF80 0x000b +Call 0x08061fb1 +Call 0x08061f95 +LoadRoomEntityList 0x080f2758 +_0807EF80 0x0008 +Wait 0x003c +SoundReq 0x0072 +SetLocalFlag 0x0043 +Wait 0x001e +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08011D28.inc b/data/scripts/gUnk_08011D28.inc deleted file mode 100644 index 9d12e8ce..00000000 --- a/data/scripts/gUnk_08011D28.inc +++ /dev/null @@ -1,56 +0,0 @@ -SCRIPT_START gUnk_08011D28 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -CheckGlobalFlag 0x0047 -JumpIf 0x002c -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0xfff8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4513 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffda -StopScript -StartScript -CheckGlobalFlag 0x002b -JumpIf 0xffce -CheckGlobalFlag 0x002d -JumpIf 0xffc6 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3103 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffc4 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3106 -_0807EA94 -SetGlobalFlag 0x002c -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -.short 0x0000 diff --git a/data/scripts/gUnk_08011DD4.inc b/data/scripts/gUnk_08011DD4.inc deleted file mode 100644 index c8b2ce29..00000000 --- a/data/scripts/gUnk_08011DD4.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08011DD4 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -CheckGlobalFlag 0x0047 -JumpIf 0x002c -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0xfff8 -StopScript -_0807E864 -_0807EB74 -.short 0x0879 diff --git a/data/scripts/gUnk_08011E04.inc b/data/scripts/gUnk_08011E04.inc deleted file mode 100644 index 5ce63dae..00000000 --- a/data/scripts/gUnk_08011E04.inc +++ /dev/null @@ -1,63 +0,0 @@ -SCRIPT_START gUnk_08011E04 -.short 0x0000 -.short 0x085b -.short 0x4514 -.short 0x0459 -.short 0x0444 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0001 -.short 0x0803 -.short 0xffda -.short 0x0402 -.short 0x0401 -.short 0x0814 -.short 0x002b -.short 0x0804 -.short 0xffce -.short 0x0814 -.short 0x002c -.short 0x0804 -.short 0xffc6 -.short 0x0418 -.short 0x0805 -.short 0xffe8 -.short 0x0402 -.short 0x0443 -.short 0x0463 -.short 0x0879 -.short 0x0000 -.short 0x085b -.short 0x3104 -.short 0x0459 -.short 0x041c -.short 0x0804 -.short 0x001e -.short 0x0444 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0001 -.short 0x0803 -.short 0xffc4 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 -.short 0x0463 -.short 0x0879 -.short 0x0000 -.short 0x085b -.short 0x3107 -.short 0x0459 -.short 0x082d -.short 0x002d -.short 0x0444 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0001 -.short 0x0803 -.short 0xffdc -.short 0x0000 diff --git a/data/scripts/gUnk_08011E80.inc b/data/scripts/gUnk_08011E80.inc deleted file mode 100644 index b8bd932f..00000000 --- a/data/scripts/gUnk_08011E80.inc +++ /dev/null @@ -1,45 +0,0 @@ -SCRIPT_START gUnk_08011E80 -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002f -JumpIf 0xfdfa -CheckGlobalFlag 0x0030 -JumpIf 0xfdf2 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4524 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x3111 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3114 -_0807EA94 -SetGlobalFlag 0x002e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffdc diff --git a/data/scripts/gUnk_08011F0C.inc b/data/scripts/gUnk_08011F0C.inc deleted file mode 100644 index 9c1ebe00..00000000 --- a/data/scripts/gUnk_08011F0C.inc +++ /dev/null @@ -1,45 +0,0 @@ -SCRIPT_START gUnk_08011F0C -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002e -JumpIf 0xfe1a -CheckGlobalFlag 0x0030 -JumpIf 0xfe12 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4522 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x310f -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3112 -_0807EA94 -SetGlobalFlag 0x002f -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffdc diff --git a/data/scripts/gUnk_08011F98.inc b/data/scripts/gUnk_08011F98.inc deleted file mode 100644 index 0b11163d..00000000 --- a/data/scripts/gUnk_08011F98.inc +++ /dev/null @@ -1,45 +0,0 @@ -SCRIPT_START gUnk_08011F98 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002e -JumpIf 0xfe3a -CheckGlobalFlag 0x002f -JumpIf 0xfe32 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4523 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x3110 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3113 -_0807EA94 -SetGlobalFlag 0x0030 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffdc diff --git a/data/scripts/gUnk_08012024.inc b/data/scripts/gUnk_08012024.inc deleted file mode 100644 index e27a1327..00000000 --- a/data/scripts/gUnk_08012024.inc +++ /dev/null @@ -1,34 +0,0 @@ -SCRIPT_START gUnk_08012024 -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0094 -JumpIf 0x0010 -TextboxNoOverlap 0x3122 -_0807EA94 -SetLocalFlag 0x0094 -Jump 0x0042 -_0807E48C 0x0031 -JumpIfNot 0x000c -TextboxNoOverlap 0x3123 -_0807EA94 -Jump 0x0030 -TextboxNoOverlap 0x3124 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0024 -_0807E48C 0x0020 -JumpIfNot 0x0018 -TextboxNoOverlap 0x3125 -_0807EA94 -_0807F034 0x0031 -WaitPlayerAction8 -.byte 0xb diff --git a/data/scripts/gUnk_08012091.inc b/data/scripts/gUnk_08012091.inc deleted file mode 100644 index 46015845..00000000 --- a/data/scripts/gUnk_08012091.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_08012091 -.byte 0xc -.byte 0x25 -.byte 0xfc -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x27 -.byte 0x31 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x8e -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_080120B0.inc b/data/scripts/gUnk_080120B0.inc deleted file mode 100644 index b3cc5cfd..00000000 --- a/data/scripts/gUnk_080120B0.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_080120B0 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0095 -JumpIf 0x0010 -TextboxNoOverlap 0x3116 -_0807EA94 -SetLocalFlag 0x0095 -Jump 0x0042 -.byte 0x1f -.byte 0x8 -.byte 0x2f diff --git a/data/scripts/gUnk_080120ED.inc b/data/scripts/gUnk_080120ED.inc deleted file mode 100644 index cfe95096..00000000 --- a/data/scripts/gUnk_080120ED.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_080120ED -.short 0x0500 -.short 0x0c08 -.short 0x5b00 -.short 0x1708 -.short 0x5931 -.short 0x0304 -.short 0x3008 diff --git a/data/scripts/gUnk_080120FB.inc b/data/scripts/gUnk_080120FB.inc deleted file mode 100644 index 0313b6b4..00000000 --- a/data/scripts/gUnk_080120FB.inc +++ /dev/null @@ -1,66 +0,0 @@ -SCRIPT_START gUnk_080120FB -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x18 -.byte 0x31 -.byte 0x59 -.byte 0x4 -.byte 0x1c -.byte 0x4 -.byte 0x5 -.byte 0x8 -.byte 0x24 -.byte 0x0 -.byte 0x1f -.byte 0x8 -.byte 0x20 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0x18 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x19 -.byte 0x31 -.byte 0x59 -.byte 0x4 -.byte 0x82 -.byte 0x8 -.byte 0x2f -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x25 -.byte 0xfc -.byte 0x7 -.byte 0x8 -.byte 0x3 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0x5b -.byte 0x8 -.byte 0x1b -.byte 0x31 -.byte 0x59 -.byte 0x4 -.byte 0x44 -.byte 0x4 -.byte 0x61 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x1 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x8e -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_0801213C.inc b/data/scripts/gUnk_0801213C.inc deleted file mode 100644 index 3e584133..00000000 --- a/data/scripts/gUnk_0801213C.inc +++ /dev/null @@ -1,42 +0,0 @@ -SCRIPT_START gUnk_0801213C -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0096 -JumpIf 0x0010 -TextboxNoOverlap 0x311c -_0807EA94 -SetLocalFlag 0x0096 -Jump 0x0042 -_0807E48C 0x0030 -JumpIfNot 0x000c -TextboxNoOverlap 0x311d -_0807EA94 -Jump 0x0030 -TextboxNoOverlap 0x311e -_0807EA94 -_0807E3E8 -JumpIfNot 0x0024 -_0807E48C 0x0020 -JumpIfNot 0x0018 -TextboxNoOverlap 0x311f -_0807EA94 -_0807F034 0x0030 -WaitPlayerAction8 -Call sub_0807FC24 -Jump 0x0006 -TextboxNoOverlap 0x3121 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 diff --git a/data/scripts/gUnk_080121C8.inc b/data/scripts/gUnk_080121C8.inc deleted file mode 100644 index c37ef7e8..00000000 --- a/data/scripts/gUnk_080121C8.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_080121C8 -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4527 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffe0 diff --git a/data/scripts/gUnk_08012200.inc b/data/scripts/gUnk_08012200.inc deleted file mode 100644 index 778d55f1..00000000 --- a/data/scripts/gUnk_08012200.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08012200 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4525 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffe0 diff --git a/data/scripts/gUnk_08012238.inc b/data/scripts/gUnk_08012238.inc deleted file mode 100644 index e8846aee..00000000 --- a/data/scripts/gUnk_08012238.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08012238 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4526 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -.short 0x0803 -.short 0xffe0 diff --git a/data/scripts/gUnk_08012270.inc b/data/scripts/gUnk_08012270.inc deleted file mode 100644 index 831f71ad..00000000 --- a/data/scripts/gUnk_08012270.inc +++ /dev/null @@ -1,57 +0,0 @@ -SCRIPT_START gUnk_08012270 -StartScript -_0807EB44 0x0004 -Call sub_08061FD8 -_0807E9D4 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x001e -JumpIfNot 0x000a -CheckInventory1 0x0015 -JumpIf 0x0024 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -TextboxNoOverlapFollow 0x2302 -_0807EA94 -_0807E878 -SetGlobalFlag 0x001e -Jump 0xffcc -StopScript -StartScript -CheckRoomFlag 0x0000 -JumpIfNot 0x000a -CheckRoomFlag 0x0001 -JumpIf 0x0020 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -TextboxNoOverlapFollow 0x2303 -_0807EA94 -_0807E878 -Jump 0xffd0 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -_0807EF80 0x000b -Call sub_08061FB0 -Call sub_08061F94 -LoadRoomEntityList 0x080f2758 -_0807EF80 0x0008 -Wait 0x003c -SoundReq 0x0072 -SetLocalFlag 0x0043 -Wait 0x001e -_0807E878 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc index 0dee1c37..cc9d6451 100644 --- a/data/scripts/gUnk_0801232C.inc +++ b/data/scripts/gUnk_0801232C.inc @@ -16,5 +16,57 @@ SetLocalFlag 0x0042 _0807F034 0x0057 WaitPlayerAction8 _0807E878 -.short 0x0803 -.short 0xffda +Jump 0xffda +StartScript +_0807EF80 0x0008 +StopScript +CheckLocalFlag 0x0004 +JumpIfNot 0xfffa +Call 0x0807df29 +_0807E864 +SoundReq0x80100000 +StartScript +_0807E778 0x0004 +_0807E788 0x00007fff +DoFade5 +_0807E858 +.short 0x0080 +@ End of 1 parameters +StopScript +WaitFor_2 +SoundReq2 0x002c +_0807EB28 0x1401 +_0807EA94 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x0007 +SoundReq 0x01ce +SetEntity0x20 0xffff8000 +Wait 0x003c +_0807E8E4_0 +StartPlayerScript 0x08012410 +WaitForSomething2 0x00000001 +TextboxNoOverlap 0x1402 +_0807EA94 +SoundReq0x80100000 +SetEntity0x20 0x00010000 +Wait 0x003c +StartScript +_0807E778 0x0004 +_0807E788 0xffffffff +DoFade4 +_0807E858 +.short 0x0080 +@ End of 1 parameters +StopScript +WaitFor_2 +SoundReq2 0xffff +_0807EB28 0x1403 +_0807EA94 +_0807E914 0x00000203 +Call 0x0807f421 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08012360.inc b/data/scripts/gUnk_08012360.inc deleted file mode 100644 index 34c4b8de..00000000 --- a/data/scripts/gUnk_08012360.inc +++ /dev/null @@ -1,50 +0,0 @@ -SCRIPT_START gUnk_08012360 -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x0004 -JumpIfNot 0xfffa -Call sub_0807DF28 -_0807E864 -SoundReq0x80100000 -StartScript -_0807E778 0x0004 -_0807E788 0x00007fff -DoFade5 -_0807E858 0x0080 -StopScript -WaitFor_2 -SoundReq2 0x002c -_0807EB28 0x1401 -_0807EA94 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x0007 -SoundReq 0x01ce -SetEntity0x20 0xffff8000 -Wait 0x003c -_0807E8E4_0 -StartPlayerScript 0x08012410 -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x1402 -_0807EA94 -SoundReq0x80100000 -SetEntity0x20 0x00010000 -Wait 0x003c -StartScript -_0807E778 0x0004 -_0807E788 0xffffffff -DoFade4 -_0807E858 0x0080 -StopScript -WaitFor_2 -SoundReq2 0xffff -_0807EB28 0x1403 -_0807EA94 -_0807E914 0x00000203 -Call sub_0807F420 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/gUnk_08012410.inc index 39c087b1..339a5051 100644 --- a/data/scripts/gUnk_08012410.inc +++ b/data/scripts/gUnk_08012410.inc @@ -5,6 +5,6 @@ StopScript _0807EF80 0x0004 Wait 0x003c _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc index 2c3efbfb..ff893ab3 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/gUnk_08012430.inc @@ -8,9 +8,9 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807E930 0x0008 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E930 0x0009 -Call sub_0806B2B4 +Call 0x0806b2b5 _0807EA94 CheckLocalFlag 0x00b3 JumpIf 0x0010 @@ -22,3 +22,144 @@ _0807E878 _0807E930 0x0000 Jump 0xffc4 .short 0x0000 +StartScript +Call 0x08054565 +StopScript +CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 +JumpIfNot 0xfff6 +SoundReq0x80100000 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +StartPlayerScript 0x08012ab0 +TextboxNoOverlapFollowPos +.short 0x1101 +.short 0x0007 +@ End of 2 parameters +_0807EA94 +CameraTargetPlayer +_0807E778 0x0004 +_0807E80C 0x00000000 +WaitFor_2 +_0807E858 +.short 0x0000 +@ End of 1 parameters +Call 0x080791bd +LoadRoomEntityList 0x080f4d70 +Call 0x0805ebcd +SetEntityPositionRelative 0x01680388 +Call 0x0807f845 +_0807E778 0x0004 +_0807E800 0x00000000 +WaitFor_2 +SoundReq2 0x000e +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +SoundReq0x80100000 +_0807E778 0x0004 +_0807E80C 0x00000000 +WaitFor_2 +MoveEntityToPlayer +Call 0x0807f845 +CameraTargetPlayer +_0807E788 0xffffffff +_0807E778 0x0004 +_0807E800 0x00000000 +WaitFor_2 +Call 0x0807df51 +_0807E878 +SoundReq2 0xffff +CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +Call 0x0806dc7d +SoundReq0x80100000 +StartPlayerScript 0x08012ac8 +WaitForSomething2 0x00000001 +SetEntityPositionRelative 0x01680388 +_0807F0B4 0x0001 +CameraTargetEntity +Wait 0x005a +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +SoundReq2 0x000e +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000040 +WaitForSomething2 0x00000080 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000010 +WaitForSomething2 0x00000020 +WaitForSomething2 0x00000100 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +SoundReq0x80100000 +SoundReq2 0x0033 +Call 0x0807df51 +_0807E878 +_0807E5F8 0x00000050 +LoadRoomEntityList 0x080f51d0 +WaitForSomething2 0x00000008 +_0807E864 +Call 0x0807fa41 +Call 0x0807df29 +SoundReq 0x0072 +SoundReq0x80100000 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +StartPlayerScript 0x08012af0 +WaitForSomething2 0x00000001 +_0807E8E4_0 +SoundReq2 0x000e +Wait 0x001e +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +SoundReq0x80100000 +Wait 0x003c +SoundReq2 0xffff +Call 0x0806dca1 +_0807F0B4 0x0004 +CameraTargetPlayer +Call 0x0807df51 +_0807E878 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +SoundReq0x80100000 +Wait 0x003c +SoundReq2 0xffff +Call 0x08054571 +SetGlobalFlag 0x0014 +CallWithArg +.short 0xf6f9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08012480.inc b/data/scripts/gUnk_08012480.inc deleted file mode 100644 index bbf9f288..00000000 --- a/data/scripts/gUnk_08012480.inc +++ /dev/null @@ -1,132 +0,0 @@ -SCRIPT_START gUnk_08012480 -StartScript -Call sub_08054564 -StopScript -CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 -JumpIfNot 0xfff6 -SoundReq0x80100000 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript 0x08012ab0 -TextboxNoOverlapFollowPos 0x1101, 0x0007 -_0807EA94 -CameraTargetPlayer -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -_0807E858 0x0000 -Call sub_080791BC -LoadRoomEntityList 0x080f4d70 -Call DeleteAllEnemies -SetEntityPositionRelative 0x01680388 -Call sub_0807F844 -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -SoundReq2 0x000e -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -MoveEntityToPlayer -Call sub_0807F844 -CameraTargetPlayer -_0807E788 0xffffffff -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -Call sub_0807DF50 -_0807E878 -SoundReq2 0xffff -CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0806DC7C -SoundReq0x80100000 -StartPlayerScript 0x08012ac8 -WaitForSomething2 0x00000001 -SetEntityPositionRelative 0x01680388 -_0807F0B4 0x0001 -CameraTargetEntity -Wait 0x005a -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq2 0x000e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -SoundReq2 0x0033 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000050 -LoadRoomEntityList 0x080f51d0 -WaitForSomething2 0x00000008 -_0807E864 -Call sub_0807FA40 -Call sub_0807DF28 -SoundReq 0x0072 -SoundReq0x80100000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -StartPlayerScript 0x08012af0 -WaitForSomething2 0x00000001 -_0807E8E4_0 -SoundReq2 0x000e -Wait 0x001e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -Wait 0x003c -SoundReq2 0xffff -Call sub_0806DCA0 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -Wait 0x003c -SoundReq2 0xffff -Call sub_08054570 -SetGlobalFlag 0x0014 -CallWithArg sub_0807F6F8, 0x00000008 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc new file mode 100644 index 00000000..f6b88cad --- /dev/null +++ b/data/scripts/gUnk_080126FC.inc @@ -0,0 +1,293 @@ +SCRIPT_START gUnk_080126FC +StartScript +SetEntityNonPlanarMovement 0x0040 +_0807EF80 0x0007 +StopScript +_0807E930 0x0020 +WaitForSomething2 0x00000004 +_0807E930 0x0022 +Call 0x0807f3c9 +TextboxNoOverlapFollowPos +.short 0x1102 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0021 +Call 0x0807f3c9 +TextboxNoOverlapFollowPos +.short 0x1103 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EF80 0x0004 +Wait 0x003c +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EF80 0x0011 +_0807E930 0x001c +TextboxNoOverlapFollowPos +.short 0x1105 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0022 +Call 0x0807f3c9 +TextboxNoOverlapFollowPos +.short 0x1106 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001c +Call 0x0806d96d +TextboxNoOverlapFollowPos +.short 0x1107 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0021 +Call 0x0807f3c9 +TextboxNoOverlapFollowPos +.short 0x1108 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001c +Call 0x0806d96d +TextboxNoOverlapFollowPos +.short 0x1109 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807EF80 0x000a +_0807E9D4 +_0807E5F8 0x00000008 +StopScript +StartScript +CheckRoomFlag 0x0000 +JumpIf 0x0028 +CheckEntityInteractType +JumpIfNot 0xfff0 +StopScript +_0807E864 +Call 0x0806d945 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x1114 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0020 +_0807E878 +Jump 0xffd0 +_0807E864 +_0807E9DC +CallWithArg +.short 0xf5b1 +.short 0x0807 +.short 0x003c +.short 0x0000 +@ End of 4 parameters +Call 0x080791d1 +StopScript +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EF80 0x000b +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +Call 0x0806d945 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110a +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001f +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110b +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001f +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807EF80 0x0004 +Wait 0x003c +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110c +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001f +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110d +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x001f +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110e +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0018 +SetEntityNonPlanarMovement 0x0080 +Call 0x0806d909 +_0807EC1C 0x0010 +_0807EF80 0x000a +_0807E9D4 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +StopScript +StartScript +Call 0x0806d945 +CheckEntityInteractType +JumpIf 0x000e +CheckPlayerInRegion2 0x3030 +JumpIfNot 0x0020 +Jump 0xffe6 +_0807E864 +_0807E930 0x0010 +StopScript +TextboxNoOverlapFollowPos +.short 0x1115 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0018 +_0807E878 +Jump 0xffcc +StopScript +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +_0807EB8C +Call 0x0806d945 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x110f +.short 0x000c +@ End of 2 parameters +_0807E930 0x0018 +SetEntityNonPlanarMovement 0x0080 +Call 0x0806d909 +_0807EC1C 0x0050 +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +StopScript +StartScript +Call 0x0806d945 +CheckEntityInteractType +JumpIf 0x000e +CheckPlayerInRegion2 0x3030 +JumpIfNot 0x0020 +Jump 0xffe6 +_0807E864 +_0807E930 0x0010 +StopScript +TextboxNoOverlapFollowPos +.short 0x1115 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0018 +_0807E878 +Jump 0xffcc +StopScript +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +_0807EB8C +Call 0x0806d945 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x1110 +.short 0x000c +@ End of 2 parameters +_0807E930 0x0018 +SetEntityNonPlanarMovement 0x0080 +Call 0x0806d909 +_0807EC1C 0x0050 +_0807E930 0x0018 +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000004 +StopScript +StartScript +Call 0x0806d945 +CheckEntityInteractType +JumpIf 0x000e +CheckPlayerInRegion2 0x3030 +JumpIfNot 0x0020 +Jump 0xffe6 +_0807E864 +_0807E930 0x0010 +StopScript +TextboxNoOverlapFollowPos +.short 0x1115 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E930 0x0018 +_0807E878 +Jump 0xffcc +StopScript +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +SoundReq0x80100000 +_0807EF80 0x000b +_0807EB8C +Call 0x0806d945 +_0807E930 0x0010 +TextboxNoOverlapFollowPos +.short 0x1111 +.short 0x000c +@ End of 2 parameters +_0807E930 0x0018 +SetEntityNonPlanarMovement 0x0080 +Call 0x0806d8a1 +_0807EE30 +JumpIfNot 0xfffc +_0807E930 0x001f +_0807EA94 +StartPlayerScript 0x08012b18 +Call 0x0806d9a5 +_0807EF80 0x0008 +Wait 0x0078 +SoundReq2 0x000e +StartScript +_0807E8E4_2 +_0807EB28 0x1112 +StopScript +_0807EA94 +_0807E5F8 0x00000008 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/gUnk_08012AB0.inc index 916f994c..3af969c2 100644 --- a/data/scripts/gUnk_08012AB0.inc +++ b/data/scripts/gUnk_08012AB0.inc @@ -6,115 +6,14 @@ _0807EB44 0x0006 Wait 0x000a Jump 0xffee .short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0080 -.short 0x0402 -.short 0x0861 +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807EF80 0x0004 +Wait 0x003c +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END .short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x0388 -.short 0x0180 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0879 -.short 0x0015 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0861 -.short 0x0004 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0870 -.short 0x0008 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x140c -.short 0xfb65 -.short 0x0807 -.short 0xffe2 -.short 0xffff -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0861 -.short 0x0000 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x086e -.short 0x0008 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x140c -.short 0xfb65 -.short 0x0807 -.short 0xffe2 -.short 0xffff -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0861 -.short 0x0002 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x086f -.short 0x0008 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x140c -.short 0xfb65 -.short 0x0807 -.short 0xffe2 -.short 0xffff -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08012AF0.inc b/data/scripts/gUnk_08012AF0.inc new file mode 100644 index 00000000..00bf8f5c --- /dev/null +++ b/data/scripts/gUnk_08012AF0.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_08012AF0 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x0388, 0x0180 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08012B18.inc b/data/scripts/gUnk_08012B18.inc new file mode 100644 index 00000000..afa03369 --- /dev/null +++ b/data/scripts/gUnk_08012B18.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_08012B18 +_0807EF80 0x0015 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc new file mode 100644 index 00000000..22d05e05 --- /dev/null +++ b/data/scripts/gUnk_08012B24.inc @@ -0,0 +1,16 @@ +SCRIPT_START gUnk_08012B24 +StartScript +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0004 +StopScript +_0807EF80 0x0001 +_0807ECC4 0x0008 +_0807E5F8 0x00000002 +CallWithArg +.short 0xfb65 +.short 0x0807 +.short 0xffe2 +.short 0xffff +@ End of 4 parameters +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc new file mode 100644 index 00000000..29284519 --- /dev/null +++ b/data/scripts/gUnk_08012B50.inc @@ -0,0 +1,16 @@ +SCRIPT_START gUnk_08012B50 +StartScript +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0000 +StopScript +_0807EF80 0x0001 +_0807EC64 0x0008 +_0807E5F8 0x00000002 +CallWithArg +.short 0xfb65 +.short 0x0807 +.short 0xffe2 +.short 0xffff +@ End of 4 parameters +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc new file mode 100644 index 00000000..7fe6c915 --- /dev/null +++ b/data/scripts/gUnk_08012B7C.inc @@ -0,0 +1,16 @@ +SCRIPT_START gUnk_08012B7C +StartScript +SetEntityNonPlanarMovement 0x0100 +_0807EB44 0x0002 +StopScript +_0807EF80 0x0001 +_0807EC94 0x0008 +_0807E5F8 0x00000002 +CallWithArg +.short 0xfb65 +.short 0x0807 +.short 0xffe2 +.short 0xffff +@ End of 4 parameters +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08012BF8.inc b/data/scripts/gUnk_08012BF8.inc index 0b089a01..9905cc29 100644 --- a/data/scripts/gUnk_08012BF8.inc +++ b/data/scripts/gUnk_08012BF8.inc @@ -4,5 +4,17 @@ _0807EB44 0x0006 _0807EF80 0x0007 _0807E930 0x0003 StopScript -.short 0x0c33 -.short 0x0010 +WaitForSomething2 0x00000010 +_0807E930 0x0007 +Wait 0x001e +_0807E5F8 0x00000020 +_0807E930 0x0003 +WaitForSomething2 0x00000010 +_0807E930 0x0007 +Wait 0x001e +_0807E5F8 0x00000020 +_0807E930 0x0003 +WaitForSomething2 0x00000010 +Wait 0x0001 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08012C0C.inc b/data/scripts/gUnk_08012C0C.inc deleted file mode 100644 index 534285f4..00000000 --- a/data/scripts/gUnk_08012C0C.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_08012C0C -.short 0x0000 -.short 0x0850 -.short 0x0007 -.short 0x0831 -.short 0x001e -.short 0x0c28 -.short 0x0020 -.short 0x0000 -.short 0x0850 -.short 0x0003 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x0850 -.short 0x0007 -.short 0x0831 -.short 0x001e -.short 0x0c28 -.short 0x0020 -.short 0x0000 -.short 0x0850 -.short 0x0003 -.short 0x0c33 -.short 0x0010 -.short 0x0000 -.short 0x0831 -.short 0x0001 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_08012C48.inc b/data/scripts/gUnk_08012C48.inc index 7be9b1be..2b1bcffb 100644 --- a/data/scripts/gUnk_08012C48.inc +++ b/data/scripts/gUnk_08012C48.inc @@ -8,27 +8,3 @@ _0807E5F8 0x00000100 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0453 -.short 0x0879 -.short 0x0008 -.short 0x0c4e -.short 0x0000 -.short 0x0000 -.short 0x0c0b -.short 0xda05 -.short 0x0806 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x0443 -.short 0x0449 -.short 0x085a -.short 0x111d -.short 0x0459 -.short 0x082d -.short 0x0022 -.short 0x0444 -.short 0x0803 -.short 0xffe8 diff --git a/data/scripts/gUnk_08012C68.inc b/data/scripts/gUnk_08012C68.inc new file mode 100644 index 00000000..9bc4b3a0 --- /dev/null +++ b/data/scripts/gUnk_08012C68.inc @@ -0,0 +1,34 @@ +SCRIPT_START gUnk_08012C68 +StartScript +_0807E9D4 +_0807EF80 0x0008 +_0807E914 0x00000000 +Call 0x0806da05 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807E8E4_0 +TextboxNoOverlapFollow 0x111d +_0807EA94 +SetGlobalFlag 0x0022 +_0807E878 +Jump 0xffe8 +CheckGlobalFlag 0x0014 +JumpIfNot 0xfffa +StopScript +StartScript +CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 +JumpIfNot 0xfff2 +_0807E564 +JumpIf 0x001e +StopScript +_0807E864 +Call 0x0807df29 +_0807EB28 0x2202 +_0807EA94 +SetLocalFlag 0x003b +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08012C98.inc b/data/scripts/gUnk_08012C98.inc deleted file mode 100644 index 2a19764d..00000000 --- a/data/scripts/gUnk_08012C98.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08012C98 -CheckGlobalFlag 0x0014 -JumpIfNot 0xfffa -StopScript -StartScript -CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 -JumpIfNot 0xfff2 -_0807E564 -JumpIf 0x001e -StopScript -_0807E864 -Call sub_0807DF28 -_0807EB28 0x2202 -_0807EA94 -SetLocalFlag 0x003b -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/gUnk_08012CD8.inc index 6f29b3b4..a25beeb9 100644 --- a/data/scripts/gUnk_08012CD8.inc +++ b/data/scripts/gUnk_08012CD8.inc @@ -8,12 +8,12 @@ JumpIfNot 0xffec ComparePlayerAction 0x0015 JumpIf 0xffe4 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StopScript _0807EB28 0x2203 _0807EA94 SetLocalFlag 0x003e -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/gUnk_08012D18.inc index 79940cb3..9abf4d3e 100644 --- a/data/scripts/gUnk_08012D18.inc +++ b/data/scripts/gUnk_08012D18.inc @@ -9,13 +9,13 @@ CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot 0xffe0 StopScript _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 _0807EB28 0x111a _0807EA94 StartPlayerScript 0x08010a38 WaitForSomething2 0x00000001 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffb2 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/gUnk_08012D70.inc index a594867f..a7c2018a 100644 --- a/data/scripts/gUnk_08012D70.inc +++ b/data/scripts/gUnk_08012D70.inc @@ -2,11 +2,15 @@ SCRIPT_START gUnk_08012D70 CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 StartPlayerScript 0x08012db0 WaitForSomething2 0x00000001 _0807EB28 0x132d _0807EA94 SetLocalFlag 0x0014 -.byte 0xb +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08012DA1.inc b/data/scripts/gUnk_08012DA1.inc deleted file mode 100644 index d23dd945..00000000 --- a/data/scripts/gUnk_08012DA1.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08012DA1 -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/gUnk_08012DB0.inc index 0a4d5b99..a5e56c45 100644 --- a/data/scripts/gUnk_08012DB0.inc +++ b/data/scripts/gUnk_08012DB0.inc @@ -7,5 +7,5 @@ _0807EB44 0x0000 _0807EF80 0x0000 Wait 0x001e _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/gUnk_08012DD8.inc index ec98d5e3..4d937700 100644 --- a/data/scripts/gUnk_08012DD8.inc +++ b/data/scripts/gUnk_08012DD8.inc @@ -9,23 +9,3 @@ WaitForSomething2 0x00000001 _0807E908 0x0002 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0861 -.short 0x0000 -.short 0x0867 -.short 0x0140 -.short 0x0402 -.short 0x0c73 -.short 0x00b8 -.short 0x0094 -.short 0x0831 -.short 0x0008 -.short 0x0879 -.short 0x0000 -.short 0x0831 -.short 0x0008 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08012DF8.inc b/data/scripts/gUnk_08012DF8.inc new file mode 100644 index 00000000..1e8c8cd7 --- /dev/null +++ b/data/scripts/gUnk_08012DF8.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_08012DF8 +StartScript +_0807EB44 0x0000 +SetEntityNonPlanarMovement 0x0140 +StopScript +_0807EDD4 0x00b8, 0x0094 +Wait 0x0008 +_0807EF80 0x0000 +Wait 0x0008 +_0807E5F8 0x00000001 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc index 237c8a8f..c37dd7b9 100644 --- a/data/scripts/gUnk_08012E88.inc +++ b/data/scripts/gUnk_08012E88.inc @@ -3,16 +3,87 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a -Call sub_0806B60C +Call 0x0806b60d StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0001 -Call sub_0806B4F0 +Call 0x0806b4f1 _0807EA94 _0807E878 _0807EF80 0x0000 Jump 0xffe2 .short 0x0000 +StartScript +_0807EB44 0x0004 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +_0807EF80 0x000a +Call 0x0806b60d +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x000c +.short 0x0000 +@ End of 4 parameters +Call 0x0806b4f1 +_0807EA94 +Wait 0x000f +_0807E878 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +Jump 0xffd2 + +.globl gUnk_08012F0C +gUnk_08012F0C: +StartScript +CallWithArg +.short 0xa93d +.short 0x0806 +.short 0x5678 +.short 0x1234 +@ End of 4 parameters +_0807EB44 0x0004 +_0807E930 0x0002 +CheckInventory1 0x0015 +JumpIf 0x0190 +CheckLocalFlag 0x0060 +JumpIf 0x00a4 +CheckGlobalFlag 0x001e +JumpIf 0x0050 +StopScript +CheckLocalFlag 0x0062 +JumpIfNot 0x0008 +Call 0x0806a9b1 +CheckLocalFlag 0x0061 +JumpIf 0x001e +Call 0x0806a96d +JumpIfNot 0xfff8 +_0807E864 +TextboxNoOverlap 0x4401 +_0807EA94 +SetLocalFlag 0x0061 +_0807E878 +_0807E908 0x0001 +Call 0x0806a96d +JumpIfNot 0xfff8 +TextboxNoOverlap 0x4402 +_0807EA94 +_0807E908 0x0001 +Jump 0xffea +SCRIPT_END diff --git a/data/scripts/gUnk_08012EC0.inc b/data/scripts/gUnk_08012EC0.inc deleted file mode 100644 index fec0518e..00000000 --- a/data/scripts/gUnk_08012EC0.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08012EC0 -StartScript -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000008 -_0807EF80 0x000a -Call sub_0806B60C -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x0000000c -Call sub_0806B4F0 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000008 -.short 0x0803 -.short 0xffd2 diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc deleted file mode 100644 index bca78990..00000000 --- a/data/scripts/gUnk_08012F0C.inc +++ /dev/null @@ -1,155 +0,0 @@ -SCRIPT_START gUnk_08012F0C -StartScript -CallWithArg sub_0806A93C, 0x12345678 -_0807EB44 0x0004 -_0807E930 0x0002 -CheckInventory1 0x0015 -JumpIf 0x0190 -CheckLocalFlag 0x0060 -JumpIf 0x00a4 -CheckGlobalFlag 0x001e -JumpIf 0x0050 -StopScript -CheckLocalFlag 0x0062 -JumpIfNot 0x0008 -Call sub_0806A9B0 -CheckLocalFlag 0x0061 -JumpIf 0x001e -Call sub_0806A96C -JumpIfNot 0xfff8 -_0807E864 -TextboxNoOverlap 0x4401 -_0807EA94 -SetLocalFlag 0x0061 -_0807E878 -_0807E908 0x0001 -Call sub_0806A96C -JumpIfNot 0xfff8 -TextboxNoOverlap 0x4402 -_0807EA94 -_0807E908 0x0001 -Jump 0xffea -SCRIPT_END -.byte 0x1 -.byte 0x4 -.byte 0x12 -.byte 0x8 -.byte 0x60 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0x44 -.byte 0x0 -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x47 -.byte 0xc -.byte 0xe4 -.byte 0x30 -.byte 0x1 -.byte 0x8 -.byte 0x2a -.byte 0x8 -.byte 0x60 -.byte 0x0 -.byte 0x2c -.byte 0x8 -.byte 0x61 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x33 -.byte 0xc -.byte 0x4 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x4d -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x59 -.byte 0xa9 -.byte 0x6 -.byte 0x8 -.byte 0xc -.byte 0x14 -.byte 0x3d -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0xf4 -.byte 0xf2 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x2a -.byte 0x8 -.byte 0x62 -.byte 0x0 -.byte 0x3 -.byte 0x8 -.byte 0x2a -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x50 -.byte 0x8 -.byte 0xd -.byte 0x0 -.byte 0x4d -.byte 0x8 -.byte 0x5 -.byte 0x0 -.byte 0x2a -.byte 0x8 -.byte 0x62 -.byte 0x0 -.byte 0xc -.byte 0x14 -.byte 0x3d -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0xf4 -.byte 0xf2 -.byte 0x0 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x11 -.byte 0xaa -.byte 0x6 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0xf -.byte 0x8 -.byte 0x38 -.byte 0x0 -.byte 0x4 -.byte 0x8 -.byte 0xe -.byte 0x0 -.byte 0x51 -.byte 0x4 -.byte 0x5b -.byte 0x8 -.byte 0x3 -.byte 0x44 -.byte 0x59 diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc new file mode 100644 index 00000000..3e55cd38 --- /dev/null +++ b/data/scripts/gUnk_08012F86.inc @@ -0,0 +1,114 @@ +SCRIPT_START gUnk_08012F86 +StartScript +CheckLocalFlag 0x0060 +JumpIf 0x0044 +_0807E864 +Call 0x0807df29 +StartPlayerScript 0x080130e4 +SetLocalFlag 0x0060 +ClearLocalFlag 0x0061 +StopScript +WaitForSomething2 0x00000004 +_0807E908 0x0004 +Call 0x0806a959 +CallWithArg +.short 0xf93d +.short 0x0807 +.short 0xf2f4 +.short 0x0000 +@ End of 4 parameters +Call 0x0807df51 +_0807E878 +SetLocalFlag 0x0062 +Jump 0x002a +StartScript +_0807E930 0x000d +_0807E908 0x0005 +SetLocalFlag 0x0062 +CallWithArg +.short 0xf93d +.short 0x0807 +.short 0xf2f4 +.short 0x0000 +@ End of 4 parameters +Call 0x0806aa11 +StopScript +CheckInventory1 0x0038 +JumpIf 0x000e +_0807E944 +TextboxNoOverlap 0x4403 +_0807EA94 +Jump 0xfff6 +_0807E944 +StartScript +_0807E864 +Call 0x0807df29 +StopScript +SoundReq 0x00cd +_0807F088 0x0038 +WaitPlayerAction8 +Wait 0x001e +_0807E8E4_0 +Call 0x0806ab9d +_0807E930 0x000b +Wait 0x003c +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x4404 +_0807EA94 +Wait 0x001e +_0807EF80 0x0004 +Wait 0x003c +TextboxNoOverlap 0x440e +_0807EA94 +Wait 0x001e +Call 0x0806a9e9 +_0807E930 0x000f +Wait 0x00f0 +TextboxNoOverlap 0x4405 +_0807EA94 +_0807E5F8 0x00000200 +_0807F034 0x0015 +WaitPlayerAction8 +_0807EB8C +TextboxNoOverlap 0x4406 +_0807EA94 +_0807E908 0x0001 +Call 0x0807df51 +_0807E878 +Call 0x0806a96d +JumpIfNot 0xfff8 +TextboxNoOverlap 0x4407 +_0807EA94 +_0807E908 0x0001 +Call 0x0806a96d +JumpIfNot 0xfff8 +TextboxNoOverlap 0x440d +_0807EA94 +_0807E908 0x0001 +Jump 0xffd6 +CheckLocalFlag 0x0062 +JumpIfNot 0x0008 +Call 0x0806a9b1 +StopScript +Call 0x0806a96d +JumpIfNot 0xfff8 +_0807E864 +Call 0x0806aa19 +_0807EA94 +_0807E878 +_0807E908 0x0001 +Jump 0xffe4 +StartScript +_0807EB44 0x0006 +SetEntityNonPlanarMovement 0x0140 +StopScript +_0807EDD4 0x00a8, 0x0060 +Wait 0x0008 +_0807EF80 0x0000 +Wait 0x0008 +_0807EF80 0x0004 +Wait 0x000f +_0807E5F8 0x00000004 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013001.inc b/data/scripts/gUnk_08013001.inc deleted file mode 100644 index 56b02222..00000000 --- a/data/scripts/gUnk_08013001.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_START gUnk_08013001 -.short 0x0304 diff --git a/data/scripts/gUnk_08013003.inc b/data/scripts/gUnk_08013003.inc deleted file mode 100644 index f91e8535..00000000 --- a/data/scripts/gUnk_08013003.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START gUnk_08013003 -.short 0xf608 -.short 0x51ff -.short 0x0104 -.short 0x4304 diff --git a/data/scripts/gUnk_0801300B.inc b/data/scripts/gUnk_0801300B.inc deleted file mode 100644 index 35f3e1ac..00000000 --- a/data/scripts/gUnk_0801300B.inc +++ /dev/null @@ -1,50 +0,0 @@ -SCRIPT_START gUnk_0801300B -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x2 -.byte 0x4 -.byte 0x7b -.byte 0x8 -.byte 0xcd -.byte 0x0 -.byte 0x86 -.byte 0x8 -.byte 0x38 -.byte 0x0 -.byte 0x34 -.byte 0x4 -.byte 0x31 -.byte 0x8 -.byte 0x1e -.byte 0x0 -.byte 0x49 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x9d -.byte 0xab -.byte 0x6 -.byte 0x8 -.byte 0x50 -.byte 0x8 -.byte 0xb -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x79 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x5b -.byte 0x8 diff --git a/data/scripts/gUnk_0801303C.inc b/data/scripts/gUnk_0801303C.inc deleted file mode 100644 index db5297a6..00000000 --- a/data/scripts/gUnk_0801303C.inc +++ /dev/null @@ -1,27 +0,0 @@ -SCRIPT_START gUnk_0801303C -.short 0x4404 -.short 0x0459 -.short 0x0831 -.short 0x001e -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x003c -.short 0x085b -.short 0x440e -.short 0x0459 -.short 0x0831 -.short 0x001e -.short 0x0c0b -.short 0xa9e9 -.short 0x0806 -.short 0x0850 -.short 0x000f -.short 0x0831 -.short 0x00f0 -.short 0x085b -.short 0x4405 -.short 0x0459 -.short 0x0c28 -.short 0x0200 -.short 0x0000 diff --git a/data/scripts/gUnk_08013070.inc b/data/scripts/gUnk_08013070.inc deleted file mode 100644 index 820bc664..00000000 --- a/data/scripts/gUnk_08013070.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_08013070 -_0807F034 0x0015 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlap 0x4406 -_0807EA94 -.byte 0x4d -.byte 0x8 -.byte 0x1 diff --git a/data/scripts/gUnk_08013081.inc b/data/scripts/gUnk_08013081.inc deleted file mode 100644 index 01b70f57..00000000 --- a/data/scripts/gUnk_08013081.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08013081 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x6d -.byte 0xa9 -.byte 0x6 -.byte 0x8 diff --git a/data/scripts/gUnk_08013090.inc b/data/scripts/gUnk_08013090.inc deleted file mode 100644 index 6abaa52d..00000000 --- a/data/scripts/gUnk_08013090.inc +++ /dev/null @@ -1,36 +0,0 @@ -SCRIPT_START gUnk_08013090 -JumpIfNot 0xfff8 -TextboxNoOverlap 0x4407 -_0807EA94 -_0807E908 0x0001 -Call sub_0806A96C -JumpIfNot 0xfff8 -TextboxNoOverlap 0x440d -_0807EA94 -_0807E908 0x0001 -Jump 0xffd6 -CheckLocalFlag 0x0062 -JumpIfNot 0x0008 -Call sub_0806A9B0 -StopScript -Call sub_0806A96C -JumpIfNot 0xfff8 -_0807E864 -Call sub_0806AA18 -_0807EA94 -_0807E878 -_0807E908 0x0001 -Jump 0xffe4 -StartScript -_0807EB44 0x0006 -SetEntityNonPlanarMovement 0x0140 -StopScript -_0807EDD4 0x00a8, 0x0060 -Wait 0x0008 -_0807EF80 0x0000 -Wait 0x0008 -_0807EF80 0x0004 -Wait 0x000f -_0807E5F8 0x00000004 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc index 67ead4ba..2ef0bc28 100644 --- a/data/scripts/gUnk_08013114.inc +++ b/data/scripts/gUnk_08013114.inc @@ -3,29 +3,49 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EF80 0x0012 -Call sub_0807F348 +Call 0x0807f349 StopScript StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call sub_0806AEE4 +Call 0x0806aee5 Jump 0xffee _0807E864 StopScript _0807EB74 -Call sub_0806AED8 -CallWithArg sub_0806AA50, 0x00000000 +Call 0x0806aed9 +CallWithArg +.short 0xaa51 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807EA94 -CallWithArg sub_0806AA50, 0x00000001 +CallWithArg +.short 0xaa51 +.short 0x0806 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters _0807EA94 -CallWithArg sub_0806AA50, 0x00000002 +CallWithArg +.short 0xaa51 +.short 0x0806 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters _0807EA94 JumpIf 0x0008 _0807E878 Jump 0xffb4 _0807E914 0x00000403 -Call sub_0807F420 +Call 0x0807f421 _0807E878 -.short 0x0803 -.short 0xffa2 +Jump 0xffa2 +StartScript +CheckLocalFlag 0x0062 +JumpIfNot 0x000a +_0807EF80 0x0006 +StopScript +SCRIPT_END diff --git a/data/scripts/gUnk_08013188.inc b/data/scripts/gUnk_08013188.inc deleted file mode 100644 index fb9ad32b..00000000 --- a/data/scripts/gUnk_08013188.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08013188 -StartScript -CheckLocalFlag 0x0062 -JumpIfNot 0x000a -_0807EF80 0x0006 -StopScript -SCRIPT_END -.short 0x0402 -.short 0x0401 -.short 0x0487 -.short 0x046b -.short 0x0c0b -.short 0xab75 -.short 0x0806 -.short 0x0803 -.short 0xfff0 diff --git a/data/scripts/gUnk_080131AC.inc b/data/scripts/gUnk_0801319A.inc similarity index 69% rename from data/scripts/gUnk_080131AC.inc rename to data/scripts/gUnk_0801319A.inc index b7608277..4d4408c9 100644 --- a/data/scripts/gUnk_080131AC.inc +++ b/data/scripts/gUnk_0801319A.inc @@ -1,9 +1,15 @@ -SCRIPT_START gUnk_080131AC +SCRIPT_START gUnk_0801319A +StopScript +StartScript +CameraTargetEntity +MoveEntityToPlayer +Call 0x0806ab75 +Jump 0xfff0 CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 StartPlayerScript 0x080132e4 WaitForSomething2 0x00000002 _0807EB28 0x1601 @@ -18,13 +24,16 @@ StartPlayerScript 0x08013330 WaitForSomething2 0x00000002 MoveEntityToPlayer SetEntityPosition 0x0000, 0xfff0 -Call sub_0807F844 +Call 0x0807f845 CameraTargetEntity -Call sub_080536B8 +Call 0x080536b9 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 WaitFor_2 -TextboxNoOverlapFollowPos 0x1602, 0x000c +TextboxNoOverlapFollowPos +.short 0x1602 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -38,7 +47,10 @@ WaitForSomething2 0x00000040 StartPlayerScript 0x08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 -TextboxNoOverlapFollowPos 0x1603, 0x000c +TextboxNoOverlapFollowPos +.short 0x1603 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 @@ -47,11 +59,16 @@ _0807E778 0x0004 DoFade5 WaitFor_2 SoundReq0x80100000 -_0807E858 0x0000 +_0807E858 +.short 0x0000 +@ End of 1 parameters Wait 0x003c CameraTargetPlayer -Call sub_0807F5C0 -TextboxNoOverlapFollowPos 0x1604, 0x0007 +Call 0x0807f5c1 +TextboxNoOverlapFollowPos +.short 0x1604 +.short 0x0007 +@ End of 2 parameters _0807EA94 _0807E788 0xffffffff _0807E778 0x0004 @@ -64,7 +81,7 @@ _0807EA94 SetLocalFlag 0x0078 SoundReq2 0x0031 SetGlobalFlag 0x005d -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/gUnk_080132E4.inc index 02de2083..d97b2794 100644 --- a/data/scripts/gUnk_080132E4.inc +++ b/data/scripts/gUnk_080132E4.inc @@ -7,23 +7,5 @@ _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.short 0x0401 -.short 0x0867 -.short 0x0080 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x086e -.short 0x0020 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0801330C.inc b/data/scripts/gUnk_0801330C.inc new file mode 100644 index 00000000..ff5c5c16 --- /dev/null +++ b/data/scripts/gUnk_0801330C.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_0801330C +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EF80 0x0001 +_0807EC64 0x0020 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/gUnk_08013330.inc index 91ed7499..bf8a75d3 100644 --- a/data/scripts/gUnk_08013330.inc +++ b/data/scripts/gUnk_08013330.inc @@ -4,5 +4,5 @@ _0807EB44 0x0000 SetEntityPositionRelative 0x00700098 StopScript _0807E5F8 0x00000002 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/gUnk_0801334C.inc index 2782c624..dbf10439 100644 --- a/data/scripts/gUnk_0801334C.inc +++ b/data/scripts/gUnk_0801334C.inc @@ -8,6 +8,6 @@ _0807ECC4 0x0020 _0807EF80 0x0000 _0807EF80 0x000c _0807E5F8 0x00000002 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/gUnk_08013378.inc index 5c3179ad..bee24285 100644 --- a/data/scripts/gUnk_08013378.inc +++ b/data/scripts/gUnk_08013378.inc @@ -1,16 +1,16 @@ SCRIPT_START gUnk_08013378 -Call sub_0807F1C4 -Call sub_0807F2D4 -Call sub_0807F1E8 -Call sub_0807F2D4 +Call 0x0807f1c5 +Call 0x0807f2d5 +Call 0x0807f1e9 +Call 0x0807f2d5 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 SoundReq 0x007c _0807EB44 0x0004 -Call sub_0807F210 +Call 0x0807f211 _0807EF3C 0x0200, 0x0020 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/gUnk_080133C4.inc index a753fd84..31bde000 100644 --- a/data/scripts/gUnk_080133C4.inc +++ b/data/scripts/gUnk_080133C4.inc @@ -3,10 +3,10 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0007 _0807EF80 0x000b -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00000008 -Call sub_08061F94 +Call 0x08061f95 Wait 0x000a _0807E5F8 0x00000010 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc index 3ff652f5..8742209f 100644 --- a/data/scripts/gUnk_080133F8.inc +++ b/data/scripts/gUnk_080133F8.inc @@ -3,11 +3,11 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0008 _0807EF80 0x000b -Call sub_0807F338 +Call 0x0807f339 StopScript WaitForSomething2 0x00000020 SetEntityPositionRelative 0x00480098 -Call sub_08066C94 +Call 0x08066c95 Wait 0x00e9 _0807EF80 0x0007 _0807E5F8 0x00000040 @@ -15,7 +15,12 @@ WaitForSomething2 0x00000020 Wait 0x003c _0807EF80 0x0014 SoundReq 0x0120 -CallWithArg sub_08095420, 0x08013494 +CallWithArg +.short 0x5421 +.short 0x0809 +.short 0x3494 +.short 0x0801 +@ End of 4 parameters Wait 0x005a _0807EF80 0x0016 WaitForSomething2 0x00000080 @@ -25,46 +30,10 @@ _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000040 WaitForSomething2 0x00000020 -Call sub_08066CA4 +Call 0x08066ca5 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00000040 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0850 -.short 0x0000 -.short 0x0867 -.short 0x0200 -.short 0x0c0b -.short 0x5459 -.short 0x0809 -.short 0x0c0b -.short 0x4b81 -.short 0x0809 -.short 0x0402 -.short 0x0831 -.short 0x005a -.short 0x0c0b -.short 0x4b6d -.short 0x0809 -.short 0x0c73 -.short 0x0098 -.short 0x0080 -.short 0x0401 -.short 0x0c0b -.short 0x4b81 -.short 0x0809 -.short 0x087b -.short 0x01cc -.short 0x0c0b -.short 0xf36d -.short 0x0807 -.short 0x0c28 -.short 0x0080 -.short 0x0000 -.short 0x0402 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_08013494.inc b/data/scripts/gUnk_08013494.inc new file mode 100644 index 00000000..e0d9db10 --- /dev/null +++ b/data/scripts/gUnk_08013494.inc @@ -0,0 +1,18 @@ +SCRIPT_START gUnk_08013494 +StartScript +_0807E930 0x0000 +SetEntityNonPlanarMovement 0x0200 +Call 0x08095459 +Call 0x08094b81 +StopScript +Wait 0x005a +Call 0x08094b6d +_0807EDD4 0x0098, 0x0080 +StartScript +Call 0x08094b81 +SoundReq 0x01cc +Call 0x0807f36d +_0807E5F8 0x00000080 +StopScript +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc index 5838d2d5..25dfe899 100644 --- a/data/scripts/gUnk_080134DC.inc +++ b/data/scripts/gUnk_080134DC.inc @@ -3,47 +3,107 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 +Call 0x0807f92d +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f04 +CallWithArg +.short 0x5a1d +.short 0x0809 +.short 0x3f04 +.short 0x0801 +@ End of 4 parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e04 -CallWithArg sub_08095D54, 0x08013e28 +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x3e04 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x3e28 +.short 0x0801 +@ End of 4 parameters StopScript WaitForSomething2 0x18000000 StartScript SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4054 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4074 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x40dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4118 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x003c -CallWithArg sub_0805DDEC, 0x00000000 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -CallWithArg sub_08095D8C, 0x080141dc -CallWithArg sub_08095D8C, 0x08014210 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x41dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4210 +.short 0x0801 +@ End of 4 parameters _0807E5F8 0x00000400 WaitForSomething2 0x00004000 Wait 0x0078 _0807E5F8 0x00000060 -CallWithArg sub_0805DE18, 0x00000000 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -51,9 +111,9 @@ Wait 0x003c StartPlayerScript 0x08013b70 _0807E5F8 0x00000080 _0807F078 0x0003, 0x0001 -Call sub_0806DC3C -Call sub_0806DC58 -Call sub_0807F304 +Call 0x0806dc3d +Call 0x0806dc59 +Call 0x0807f305 Wait 0x003c _0807E778 0x0004 DoFade7 @@ -65,48 +125,16 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -TextboxNoOverlapFollowPos 0x0503, 0x000c +TextboxNoOverlapFollowPos +.short 0x0503 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00040000 -CallWithArg sub_0805DDEC, 0x00000001 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters _0807F0C8 0xffff, 0x0000 -Call sub_0807F3F8 -Wait 0x003c -_0807F0B4 0x0007 -SetEntityPositionRelative 0x00a800e8 -CameraTargetEntity -Wait 0x003c -_0807E5F8 0x00000004 -Wait 0x0078 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -StartPlayerScript 0x080136b4 -WaitForSomething2 0x00000002 -_0807EB28 0x1501 -_0807EA94 -_0807F0B4 0x0004 -CameraTargetPlayer -SetLocalFlag 0x007a -Call sub_08053250 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0c73 -.short 0x00e8 -.short 0x00a8 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc new file mode 100644 index 00000000..438bdfe6 --- /dev/null +++ b/data/scripts/gUnk_08013650.inc @@ -0,0 +1,28 @@ +SCRIPT_START gUnk_08013650 +Call 0x0807f3f9 +Wait 0x003c +_0807F0B4 0x0007 +SetEntityPositionRelative 0x00a800e8 +CameraTargetEntity +Wait 0x003c +_0807E5F8 0x00000004 +Wait 0x0078 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +StartPlayerScript 0x080136b4 +WaitForSomething2 0x00000002 +_0807EB28 0x1501 +_0807EA94 +_0807F0B4 0x0004 +CameraTargetPlayer +SetLocalFlag 0x007a +Call 0x08053251 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080136B4.inc b/data/scripts/gUnk_080136B4.inc new file mode 100644 index 00000000..f2db5f95 --- /dev/null +++ b/data/scripts/gUnk_080136B4.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_080136B4 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x00e8, 0x00a8 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc index 31efec12..15e0daab 100644 --- a/data/scripts/gUnk_080136D8.inc +++ b/data/scripts/gUnk_080136D8.inc @@ -2,33 +2,28 @@ SCRIPT_START gUnk_080136D8 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -Call sub_0807F584 -.short 0x1406 +Call 0x0807f585 +_0807E078 .short 0x0008 .short 0x0010 .short 0x0018 .short 0x000c -.short 0x140c +@ End of 4 parameters +CallWithArg .short 0xf465 .short 0x0807 .short 0x00d0 .short 0x0000 -.short 0x140c +@ End of 4 parameters +CallWithArg .short 0xf4f9 .short 0x0807 .short 0x0124 .short 0x0000 -.short 0x0c73 -.short 0x00e8 -.short 0x0124 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff +@ End of 4 parameters +_0807EDD4 0x00e8, 0x0124 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc index 46af63b4..7b8a7711 100644 --- a/data/scripts/gUnk_08013720.inc +++ b/data/scripts/gUnk_08013720.inc @@ -3,37 +3,146 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 +Call 0x0807f92d +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f34 +CallWithArg +.short 0x5a1d +.short 0x0809 +.short 0x3f34 +.short 0x0801 +@ End of 4 parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e4c +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x3e4c +.short 0x0801 +@ End of 4 parameters StopScript WaitForSomething2 0x20000000 StartScript SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 -CallWithArg sub_08095D8C, 0x08014094 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4054 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4074 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4094 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 -CallWithArg sub_08095D8C, 0x08014154 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x40dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4118 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4154 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x003c -.short 0x140c +CallWithArg .short 0xdded .short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +_0807E5F8 0x00000200 +WaitForSomething2 0x00002000 +SoundReq 0x01d2 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x41dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4210 +.short 0x0801 +@ End of 4 parameters +_0807E5F8 0x00000400 +WaitForSomething2 0x00004000 +_0807E5F8 0x00000800 +WaitForSomething2 0x00008000 +Wait 0x0078 +_0807E5F8 0x00000060 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Wait 0x0078 +_0807E5F8 0x00000080 +WaitForSomething2 0x00000100 +Wait 0x003c +StartPlayerScript 0x08013b70 +_0807E5F8 0x00000080 +_0807F078 0x0004, 0x0001 +Call 0x0806dc3d +Call 0x0806dc59 +Call 0x0807f305 +Wait 0x003c +_0807E778 0x0004 +DoFade7 +SoundReq 0x00f6 +WaitFor_2 +Wait 0x003c +_0807E5F8 0x00000010 +_0807E778 0x0002 +DoFade6 +WaitFor_2 +SoundReq 0x0109 +TextboxNoOverlapFollowPos +.short 0x0504 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00040000 +SetLocalFlag 0x007b +Call 0x08053251 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080137DA.inc b/data/scripts/gUnk_080137DA.inc deleted file mode 100644 index e5295dde..00000000 --- a/data/scripts/gUnk_080137DA.inc +++ /dev/null @@ -1,110 +0,0 @@ -SCRIPT_START gUnk_080137DA -.short 0x0000 -.short 0x0000 -.short 0x0c28 -.short 0x0200 -.short 0x0000 -.short 0x0c33 -.short 0x2000 -.short 0x0000 -.short 0x087b -.short 0x01d2 -.short 0x140c -.short 0x5d8d -.short 0x0809 -.short 0x41dc -.short 0x0801 -.short 0x140c -.short 0x5d8d -.short 0x0809 -.short 0x4210 -.short 0x0801 -.short 0x0c28 -.short 0x0400 -.short 0x0000 -.short 0x0c33 -.short 0x4000 -.short 0x0000 -.short 0x0c28 -.short 0x0800 -.short 0x0000 -.short 0x0c33 -.short 0x8000 -.short 0x0000 -.short 0x0831 -.short 0x0078 -.short 0x0c28 -.short 0x0060 -.short 0x0000 -.short 0x140c -.short 0xde19 -.short 0x0805 -.short 0x0000 -.short 0x0000 -.short 0x0831 -.short 0x0078 -.short 0x0c28 -.short 0x0080 -.short 0x0000 -.short 0x0c33 -.short 0x0100 -.short 0x0000 -.short 0x0831 -.short 0x003c -.short 0x0c47 -.short 0x3b70 -.short 0x0801 -.short 0x0c28 -.short 0x0080 -.short 0x0000 -.short 0x0c85 -.short 0x0004 -.short 0x0001 -.short 0x0c0b -.short 0xdc3d -.short 0x0806 -.short 0x0c0b -.short 0xdc59 -.short 0x0806 -.short 0x0c0b -.short 0xf305 -.short 0x0807 -.short 0x0831 -.short 0x003c -.short 0x0838 -.short 0x0004 -.short 0x043f -.short 0x087b -.short 0x00f6 -.short 0x0437 -.short 0x0831 -.short 0x003c -.short 0x0c28 -.short 0x0010 -.short 0x0000 -.short 0x0838 -.short 0x0002 -.short 0x043e -.short 0x0437 -.short 0x087b -.short 0x0109 -.short 0x0c5c -.short 0x0504 -.short 0x000c -.short 0x0459 -.short 0x0c28 -.short 0x0000 -.short 0x0004 -.short 0x082a -.short 0x007b -.short 0x0c0b -.short 0x3251 -.short 0x0805 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc index 7f7e88c1..693239c0 100644 --- a/data/scripts/gUnk_080138B4.inc +++ b/data/scripts/gUnk_080138B4.inc @@ -3,45 +3,115 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 +Call 0x0807f92d +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f64 +CallWithArg +.short 0x5a1d +.short 0x0809 +.short 0x3f64 +.short 0x0801 +@ End of 4 parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e70 +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x3e70 +.short 0x0801 +@ End of 4 parameters StopScript WaitForSomething2 0x40000000 StartScript SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 -CallWithArg sub_08095D8C, 0x08014094 -CallWithArg sub_08095D8C, 0x080140b8 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4054 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4074 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4094 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x40b8 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 -CallWithArg sub_08095D8C, 0x08014154 -CallWithArg sub_08095D8C, 0x08014198 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x40dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4118 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4154 +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4198 +.short 0x0801 +@ End of 4 parameters StopScript Wait 0x003c -CallWithArg sub_0805DDEC, 0x00000000 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -CallWithArg sub_08095D8C, 0x080141dc -CallWithArg sub_08095D8C, 0x08014210 +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x41dc +.short 0x0801 +@ End of 4 parameters +CallWithArg +.short 0x5d8d +.short 0x0809 +.short 0x4210 +.short 0x0801 +@ End of 4 parameters _0807E5F8 0x00000400 WaitForSomething2 0x00004000 _0807E5F8 0x00000800 @@ -50,7 +120,12 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00010000 Wait 0x0078 _0807E5F8 0x00000060 -CallWithArg sub_0805DE18, 0x00000000 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -58,10 +133,10 @@ Wait 0x003c StartPlayerScript 0x08013ba8 _0807E5F8 0x00000080 _0807F078 0x0006, 0x0001 -Call sub_0807AEE4 -Call sub_0806DC3C -Call sub_0806DC58 -Call sub_0807F304 +Call 0x0807aee5 +Call 0x0806dc3d +Call 0x0806dc59 +Call 0x0807f305 Wait 0x003c _0807E778 0x0004 DoFade7 @@ -73,46 +148,42 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -TextboxNoOverlapFollowPos 0x0505, 0x000c +TextboxNoOverlapFollowPos +.short 0x0505 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00040000 _0807F0B4 0x0002 SetEntityPositionRelative 0x00d800e8 CameraTargetEntity -Call sub_0806DC3C -CallWithArg sub_0807F244, 0x00010001 -CallWithArg sub_0807F29C, 0x080049fe +Call 0x0806dc3d +CallWithArg +.short 0xf245 +.short 0x0807 +.short 0x0001 +.short 0x0001 +@ End of 4 parameters +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x49fe +.short 0x0800 +@ End of 4 parameters Wait 0x00c8 -CallWithArg sub_0807F29C, 0x00000000 -Call sub_0806DC58 +CallWithArg +.short 0xf29d +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x0806dc59 CheckRoomFlag 0x0004 JumpIfNot 0xfffa -CallWithArg sub_0805DDEC, 0x00000001 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters _0807F0C8 0xffff, 0x0000 -Call sub_0807F3F8 -Wait 0x003c -_0807E5F8 0x00000008 -Wait 0x0078 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -Wait 0x003c -_0807F0B4 0x0004 -SetEntityPositionRelative 0x005000e8 -CameraTargetEntity -Wait 0x003c -LoadRoomEntityList 0x080f55d8 -Wait 0x0078 -_0807F0B4 0x0007 -MoveEntityToPlayer -CameraTargetEntity -Wait 0x003c -_0807EB28 0x1502 -_0807EA94 -_0807F0B4 0x0004 -CameraTargetPlayer -SetLocalFlag 0x007c -Call sub_08053250 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc new file mode 100644 index 00000000..acd46843 --- /dev/null +++ b/data/scripts/gUnk_08013AA6.inc @@ -0,0 +1,33 @@ +SCRIPT_START gUnk_08013AA6 +Call 0x0807f3f9 +Wait 0x003c +_0807E5F8 0x00000008 +Wait 0x0078 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +Wait 0x003c +_0807F0B4 0x0004 +SetEntityPositionRelative 0x005000e8 +CameraTargetEntity +Wait 0x003c +LoadRoomEntityList 0x080f55d8 +Wait 0x0078 +_0807F0B4 0x0007 +MoveEntityToPlayer +CameraTargetEntity +Wait 0x003c +_0807EB28 0x1502 +_0807EA94 +_0807F0B4 0x0004 +CameraTargetPlayer +SetLocalFlag 0x007c +Call 0x08053251 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc index 817a9beb..1c768732 100644 --- a/data/scripts/gUnk_08013B18.inc +++ b/data/scripts/gUnk_08013B18.inc @@ -3,7 +3,12 @@ StartScript _0807EF80 0x0008 StopScript StartScript -CallWithArg sub_0807F6B4, 0x000001c8 +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x01c8 +.short 0x0000 +@ End of 4 parameters JumpIfNot 0xfff0 CheckInventory1 0x0006 JumpIfNot 0xffe8 @@ -11,13 +16,29 @@ CheckLocalFlag 0x0078 JumpIf 0xffe0 StopScript _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 _0807EB28 0x1507 _0807EA94 StartPlayerScript 0x08010a14 WaitForSomething2 0x00000001 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffb2 .short 0x0000 +SoundReq 0x01d3 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x08bf +.short 0x0000 +@ End of 4 parameters +Call 0x08096029 +Wait 0x003c +_0807E5F8 0x00020000 +Call 0x0807f305 +Wait 0x0078 +WaitForSomething2 0x00040000 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc deleted file mode 100644 index 8f2b17b3..00000000 --- a/data/scripts/gUnk_08013B70.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08013B70 -SoundReq 0x01d3 -CallWithArg sub_0807F238, 0x000008bf -Call sub_08096028 -Wait 0x003c -_0807E5F8 0x00020000 -Call sub_0807F304 -Wait 0x0078 -WaitForSomething2 0x00040000 -Call sub_080791BC -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc index a2337d5a..1435f7bf 100644 --- a/data/scripts/gUnk_08013BA8.inc +++ b/data/scripts/gUnk_08013BA8.inc @@ -1,12 +1,22 @@ SCRIPT_START gUnk_08013BA8 -CallWithArg sub_08095E7C, 0x08014248 +CallWithArg +.short 0x5e7d +.short 0x0809 +.short 0x4248 +.short 0x0801 +@ End of 4 parameters SoundReq 0x01d3 -CallWithArg sub_0807F238, 0x000008e3 -Call sub_08096028 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x08e3 +.short 0x0000 +@ End of 4 parameters +Call 0x08096029 Wait 0x0078 _0807E5F8 0x00020000 -Call sub_0807F304 +Call 0x0807f305 Wait 0x0078 WaitForSomething2 0x00040000 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc index 34d54f72..df2384fd 100644 --- a/data/scripts/gUnk_08013BE8.inc +++ b/data/scripts/gUnk_08013BE8.inc @@ -20,10 +20,20 @@ CheckLocalFlag 0x007c JumpIf 0x0068 StartScript _0807EF80 0x0007 -Call sub_0807F934 +Call 0x0807f935 _0807EF80 0x000a -CallWithArg sub_080962F8, 0x00000000 -CallWithArg sub_0807F8E8, 0x00000004 +CallWithArg +.short 0x62f9 +.short 0x0809 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +CallWithArg +.short 0xf8e9 +.short 0x0807 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters StopScript StopScript StartScript diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/gUnk_08013CA4.inc index 3a3343b6..a0686709 100644 --- a/data/scripts/gUnk_08013CA4.inc +++ b/data/scripts/gUnk_08013CA4.inc @@ -3,150 +3,22 @@ StopScript CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807F3F8 +Call 0x0807f9a5 +Call 0x0807df29 +Call 0x0807f3f9 Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x013800e8 CameraTargetEntity -Call sub_0807F5C0 +Call 0x0807f5c1 Wait 0x0078 _0807F0B4 0x0004 CameraTargetPlayer -Call sub_0807F5C0 +Call 0x0807f5c1 _0807EB28 0x1504 _0807EA94 SetLocalFlag 0x0079 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END -.short 0x0401 -.short 0x0c0b -.short 0xf92d -.short 0x0807 -.short 0x0879 -.short 0x0008 -.short 0x140c -.short 0xda05 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x140c -.short 0x5d55 -.short 0x0809 -.short 0x0000 -.short 0x0000 -.short 0x087b -.short 0x01cd -.short 0x0c28 -.short 0x0000 -.short 0x0800 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0c0b -.short 0xf92d -.short 0x0807 -.short 0x0879 -.short 0x0008 -.short 0x140c -.short 0xda05 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x140c -.short 0x5d55 -.short 0x0809 -.short 0x0001 -.short 0x0000 -.short 0x087b -.short 0x01cd -.short 0x0c28 -.short 0x0000 -.short 0x1000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0c0b -.short 0xf92d -.short 0x0807 -.short 0x0879 -.short 0x0008 -.short 0x140c -.short 0xda05 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x140c -.short 0x5d55 -.short 0x0809 -.short 0x0002 -.short 0x0000 -.short 0x087b -.short 0x01cd -.short 0x0c28 -.short 0x0000 -.short 0x2000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0c0b -.short 0xf92d -.short 0x0807 -.short 0x0879 -.short 0x0008 -.short 0x140c -.short 0xda05 -.short 0x0806 -.short 0x0004 -.short 0x0000 -.short 0x0402 -.short 0x0418 -.short 0x0805 -.short 0xfffc -.short 0x140c -.short 0x5d55 -.short 0x0809 -.short 0x0003 -.short 0x0000 -.short 0x087b -.short 0x01cd -.short 0x0c28 -.short 0x0000 -.short 0x4000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc new file mode 100644 index 00000000..ec7cf676 --- /dev/null +++ b/data/scripts/gUnk_08013D04.inc @@ -0,0 +1,25 @@ +SCRIPT_START gUnk_08013D04 +StartScript +Call 0x0807f92d +_0807EF80 0x0008 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x01cd +_0807E5F8 0x08000000 +Call 0x080791bd +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc new file mode 100644 index 00000000..b913f233 --- /dev/null +++ b/data/scripts/gUnk_08013D44.inc @@ -0,0 +1,25 @@ +SCRIPT_START gUnk_08013D44 +StartScript +Call 0x0807f92d +_0807EF80 0x0008 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x01cd +_0807E5F8 0x10000000 +Call 0x080791bd +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc new file mode 100644 index 00000000..9a7a338c --- /dev/null +++ b/data/scripts/gUnk_08013D84.inc @@ -0,0 +1,25 @@ +SCRIPT_START gUnk_08013D84 +StartScript +Call 0x0807f92d +_0807EF80 0x0008 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x0002 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x01cd +_0807E5F8 0x20000000 +Call 0x080791bd +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc new file mode 100644 index 00000000..d0995ac5 --- /dev/null +++ b/data/scripts/gUnk_08013DC4.inc @@ -0,0 +1,25 @@ +SCRIPT_START gUnk_08013DC4 +StartScript +Call 0x0807f92d +_0807EF80 0x0008 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +CallWithArg +.short 0x5d55 +.short 0x0809 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +SoundReq 0x01cd +_0807E5F8 0x40000000 +Call 0x080791bd +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013E04.inc b/data/scripts/gUnk_08013E04.inc index b4e3a7d2..0ef31ed0 100644 --- a/data/scripts/gUnk_08013E04.inc +++ b/data/scripts/gUnk_08013E04.inc @@ -9,21 +9,3 @@ _0807E930 0x0001 _0807E5F8 0x08000000 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0879 -.short 0x0007 -.short 0x0850 -.short 0x0002 -.short 0x0402 -.short 0x0867 -.short 0x0080 -.short 0x0c73 -.short 0x0120 -.short 0x00f8 -.short 0x0850 -.short 0x0003 -.short 0x0c28 -.short 0x0000 -.short 0x1000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08013E28.inc b/data/scripts/gUnk_08013E28.inc new file mode 100644 index 00000000..11c89886 --- /dev/null +++ b/data/scripts/gUnk_08013E28.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_08013E28 +StartScript +_0807EF80 0x0007 +_0807E930 0x0002 +StopScript +SetEntityNonPlanarMovement 0x0080 +_0807EDD4 0x0120, 0x00f8 +_0807E930 0x0003 +_0807E5F8 0x10000000 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/gUnk_08013E94.inc index a70e41b9..3045337f 100644 --- a/data/scripts/gUnk_08013E94.inc +++ b/data/scripts/gUnk_08013E94.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013E94 StartScript _0807EF80 0x0007 -Call sub_0807F180 +Call 0x0807f181 SetEntityPositionRelative 0x00f800b0 _0807E930 0x0001 StopScript diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/gUnk_08013EB0.inc index 3a4b3b44..4ca0767f 100644 --- a/data/scripts/gUnk_08013EB0.inc +++ b/data/scripts/gUnk_08013EB0.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013EB0 StartScript _0807EF80 0x0007 -Call sub_0807F180 +Call 0x0807f181 SetEntityPositionRelative 0x00f80120 _0807E930 0x0003 StopScript diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/gUnk_08013ECC.inc index 65f7af88..96385d5d 100644 --- a/data/scripts/gUnk_08013ECC.inc +++ b/data/scripts/gUnk_08013ECC.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013ECC StartScript _0807EF80 0x0007 -Call sub_0807F180 +Call 0x0807f181 SetEntityPositionRelative 0x01680120 _0807E930 0x0005 StopScript diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/gUnk_08013EE8.inc index 6d498b41..63b7c705 100644 --- a/data/scripts/gUnk_08013EE8.inc +++ b/data/scripts/gUnk_08013EE8.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013EE8 StartScript _0807EF80 0x0007 -Call sub_0807F180 +Call 0x0807f181 SetEntityPositionRelative 0x016800b0 _0807E930 0x0007 StopScript diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/gUnk_08013F04.inc index e6b22c50..551b77fc 100644 --- a/data/scripts/gUnk_08013F04.inc +++ b/data/scripts/gUnk_08013F04.inc @@ -5,7 +5,7 @@ _0807E930 0x0008 StopScript WaitForSomething2 0x00000080 _0807E930 0x000b -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/gUnk_08013F34.inc index 804fb892..da8861b5 100644 --- a/data/scripts/gUnk_08013F34.inc +++ b/data/scripts/gUnk_08013F34.inc @@ -5,7 +5,7 @@ _0807E930 0x0009 StopScript WaitForSomething2 0x00000080 _0807E930 0x000c -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/gUnk_08013F64.inc index 64131a9a..78aa1e28 100644 --- a/data/scripts/gUnk_08013F64.inc +++ b/data/scripts/gUnk_08013F64.inc @@ -5,7 +5,7 @@ _0807E930 0x000a StopScript WaitForSomething2 0x00000080 _0807E930 0x000d -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/gUnk_08013F94.inc index edfefdb8..ff253afd 100644 --- a/data/scripts/gUnk_08013F94.inc +++ b/data/scripts/gUnk_08013F94.inc @@ -11,14 +11,14 @@ JumpIfNot 0xfff6 CheckPlayerFlags 0x00400000 JumpIfNot 0xffec StopScript -Call sub_0807FA40 +Call 0x0807fa41 _0807E888 -Call sub_0807DF38 +Call 0x0807df39 Wait 0x0078 _0807EB28 0x1505 _0807EA94 SetLocalFlag 0x007d -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc index a62e8d4e..8dabc50f 100644 --- a/data/scripts/gUnk_08013FE8.inc +++ b/data/scripts/gUnk_08013FE8.inc @@ -10,19 +10,24 @@ CheckLocalFlag 0x007a JumpIfNot 0xffee CheckInventory1 0x0003 JumpIfNot 0xffe6 -CallWithArg sub_0807F6B4, 0x000000d0 +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x00d0 +.short 0x0000 +@ End of 4 parameters JumpIfNot 0xffd8 StopScript -Call sub_0807F9A4 +Call 0x0807f9a5 StartScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StopScript _0807EB28 0x1508 _0807EA94 StartPlayerScript 0x08010a14 WaitForSomething2 0x00000001 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffa6 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/gUnk_08014054.inc index 134e969b..83a143bc 100644 --- a/data/scripts/gUnk_08014054.inc +++ b/data/scripts/gUnk_08014054.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014054 StartScript _0807EF80 0x0007 _0807E930 0x0000 -Call sub_0807F738 +Call 0x0807f739 StopScript WaitForSomething 0x00000040 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/gUnk_08014074.inc index a7b8f9ff..324f5b3e 100644 --- a/data/scripts/gUnk_08014074.inc +++ b/data/scripts/gUnk_08014074.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014074 StartScript _0807EF80 0x0007 _0807E930 0x0001 -Call sub_0807F738 +Call 0x0807f739 StopScript WaitForSomething 0x00000040 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/gUnk_08014094.inc index 7be32608..add253c9 100644 --- a/data/scripts/gUnk_08014094.inc +++ b/data/scripts/gUnk_08014094.inc @@ -2,27 +2,9 @@ SCRIPT_START gUnk_08014094 StartScript _0807EF80 0x0007 _0807E930 0x0002 -Call sub_0807F738 +Call 0x0807f739 SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething 0x00000040 _0807EF80 0x0006 SCRIPT_END -.short 0x0401 -.short 0x0879 -.short 0x0007 -.short 0x0850 -.short 0x0003 -.short 0x0c0b -.short 0xf739 -.short 0x0807 -.short 0x0c6a -.short 0x0000 -.short 0xfff0 -.short 0x0402 -.short 0x0c32 -.short 0x0040 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_080140B8.inc b/data/scripts/gUnk_080140B8.inc new file mode 100644 index 00000000..f4864b53 --- /dev/null +++ b/data/scripts/gUnk_080140B8.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_080140B8 +StartScript +_0807EF80 0x0007 +_0807E930 0x0003 +Call 0x0807f739 +SetEntityPosition 0x0000, 0xfff0 +StopScript +WaitForSomething 0x00000040 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/gUnk_080140DC.inc index 0bd5c4b8..e910fe33 100644 --- a/data/scripts/gUnk_080140DC.inc +++ b/data/scripts/gUnk_080140DC.inc @@ -5,6 +5,11 @@ _0807E930 0x0004 StopScript WaitForSomething2 0x00000200 _0807E930 0x0008 -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 +Call 0x0807f2d5 +_0807E930 0x000c +_0807E5F8 0x00002000 +WaitForSomething 0x00000020 +_0807E930 0x0010 +Call 0x0807f2d5 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080140F8.inc b/data/scripts/gUnk_080140F8.inc deleted file mode 100644 index 213a346a..00000000 --- a/data/scripts/gUnk_080140F8.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_080140F8 -_0807E930 0x000c -_0807E5F8 0x00002000 -WaitForSomething 0x00000020 -_0807E930 0x0010 -Call sub_0807F2D4 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/gUnk_08014118.inc index 5891b34f..af3bce73 100644 --- a/data/scripts/gUnk_08014118.inc +++ b/data/scripts/gUnk_08014118.inc @@ -5,11 +5,11 @@ _0807E930 0x0005 StopScript WaitForSomething2 0x00000400 _0807E930 0x0009 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E930 0x000d _0807E5F8 0x00004000 WaitForSomething 0x00000020 _0807E930 0x0011 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/gUnk_08014154.inc index ba68aa29..02544d3a 100644 --- a/data/scripts/gUnk_08014154.inc +++ b/data/scripts/gUnk_08014154.inc @@ -6,46 +6,12 @@ SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething2 0x00000800 _0807E930 0x000a -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E930 0x000e _0807E5F8 0x00008000 WaitForSomething 0x00000020 _0807E930 0x0012 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0879 -.short 0x0007 -.short 0x0850 -.short 0x0007 -.short 0x0c6a -.short 0x0000 -.short 0xfff0 -.short 0x0402 -.short 0x0c33 -.short 0x1000 -.short 0x0000 -.short 0x0850 -.short 0x000b -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0850 -.short 0x000f -.short 0x0c28 -.short 0x0000 -.short 0x0001 -.short 0x0c32 -.short 0x0020 -.short 0x0000 -.short 0x0850 -.short 0x0013 -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08014198.inc b/data/scripts/gUnk_08014198.inc new file mode 100644 index 00000000..cfe74586 --- /dev/null +++ b/data/scripts/gUnk_08014198.inc @@ -0,0 +1,17 @@ +SCRIPT_START gUnk_08014198 +StartScript +_0807EF80 0x0007 +_0807E930 0x0007 +SetEntityPosition 0x0000, 0xfff0 +StopScript +WaitForSomething2 0x00001000 +_0807E930 0x000b +Call 0x0807f2d5 +_0807E930 0x000f +_0807E5F8 0x00010000 +WaitForSomething 0x00000020 +_0807E930 0x0013 +Call 0x0807f2d5 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc index cc06dc39..a7f170e8 100644 --- a/data/scripts/gUnk_080141DC.inc +++ b/data/scripts/gUnk_080141DC.inc @@ -2,12 +2,17 @@ SCRIPT_START gUnk_080141DC StartScript _0807EF80 0x0007 _0807E930 0x0014 -Call sub_0807F714 -CallWithArg sub_0807F994, 0x0000fffc +Call 0x0807f715 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfffc +.short 0x0000 +@ End of 4 parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc index 60f7eb8a..1a10fe76 100644 --- a/data/scripts/gUnk_08014210.inc +++ b/data/scripts/gUnk_08014210.inc @@ -2,34 +2,17 @@ SCRIPT_START gUnk_08014210 StartScript _0807EF80 0x0007 _0807E930 0x0015 -Call sub_0807F714 -Call sub_0807F714 -CallWithArg sub_0807F994, 0x0000fffc +Call 0x0807f715 +Call 0x0807f715 +CallWithArg +.short 0xf995 +.short 0x0807 +.short 0xfffc +.short 0x0000 +@ End of 4 parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0006 SCRIPT_END -.short 0x0c0e -.short 0x0000 -.short 0x0002 -.short 0x0804 -.short 0x0014 -.short 0x0831 -.short 0x0008 -.short 0x140c -.short 0x5ead -.short 0x0809 -.short 0x0000 -.short 0x0000 -.short 0x0803 -.short 0xffe6 -.short 0x140c -.short 0x5ead -.short 0x0809 -.short 0x0001 -.short 0x0000 -.short 0x0803 -.short 0xfff4 -.short 0x0000 diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_08014248.inc similarity index 54% rename from data/scripts/gUnk_080142B0.inc rename to data/scripts/gUnk_08014248.inc index 934901e7..77458d3a 100644 --- a/data/scripts/gUnk_080142B0.inc +++ b/data/scripts/gUnk_08014248.inc @@ -1,4 +1,50 @@ -SCRIPT_START gUnk_080142B0 +SCRIPT_START gUnk_08014248 +TestBit 0x00020000 +JumpIf 0x0014 +Wait 0x0008 +CallWithArg +.short 0x5ead +.short 0x0809 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Jump 0xffe6 +CallWithArg +.short 0x5ead +.short 0x0809 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +Jump 0xfff4 +.short 0x0000 +StartScript +_0807EF80 0x0008 +StopScript +CheckLocalFlag 0x0078 +JumpIfNot 0xfffa +StartScript +Call 0x0807f935 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +TextboxNoOverlapFollowPos +.short 0x0647 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E878 +Jump 0xffec +.short 0x0000 + +.globl gUnk_080142B0 +gUnk_080142B0: StartScript CheckLocalFlag 0x0054 JumpIf 0x00ca @@ -16,7 +62,7 @@ _0807E864 SetLocalFlag 0x0053 Wait 0x0014 _0807E908 0x0004 -Call sub_080654DC +Call 0x080654dd Wait 0x001e _0807E930 0x0001 Wait 0x000a @@ -47,7 +93,7 @@ _0807E864 SetLocalFlag 0x0054 Wait 0x005a _0807E908 0x0004 -Call sub_080654EC +Call 0x080654ed Wait 0x001e _0807E930 0x0001 Wait 0x001e diff --git a/data/scripts/gUnk_08014274.inc b/data/scripts/gUnk_08014274.inc deleted file mode 100644 index ccc724fd..00000000 --- a/data/scripts/gUnk_08014274.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_08014274 -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x0078 -JumpIfNot 0xfffa -StartScript -Call sub_0807F934 -CallWithArg sub_0806DA04, 0x00000008 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -TextboxNoOverlapFollowPos 0x0647, 0x000c -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/gUnk_08014384.inc index 731675ae..8d27c3d1 100644 --- a/data/scripts/gUnk_08014384.inc +++ b/data/scripts/gUnk_08014384.inc @@ -5,7 +5,7 @@ _0807EA94 _0807E3E8 JumpIfNot 0x001e Wait 0x001e -Call sub_08065370 +Call 0x08065371 JumpIfNot 0x0010 Wait 0x003c _0807EA94 diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/gUnk_080143C0.inc index ecee7e48..79b9f487 100644 --- a/data/scripts/gUnk_080143C0.inc +++ b/data/scripts/gUnk_080143C0.inc @@ -1,17 +1,37 @@ SCRIPT_START gUnk_080143C0 StopScript _0807E864 -Call sub_0807DF28 -Call sub_080654FC +Call 0x0807df29 +Call 0x080654fd _0807E930 0x0001 -Call sub_080654EC +Call 0x080654ed Wait 0x003c TextboxNoOverlap 0x2c16 _0807EA94 _0807E3E8 JumpIf 0x0012 _0807E914 0x00000002 -Call sub_08065528 +Call 0x08065529 Jump 0x0046 -Call sub_080654EC -.short 0x0831 +Call 0x080654ed +Wait 0x001e +TextboxNoOverlap 0x2c18 +_0807EA94 +Wait 0x000a +_0807E914 0x00000000 +Call 0x08065529 +_0807F034 0x0036 +WaitPlayerAction8 +TextboxNoOverlap 0x2c19 +_0807EA94 +_0807E914 0x00000303 +Call 0x0807f421 +Wait 0x001e +_0807EB8C +TextboxNoOverlap 0x2c22 +_0807EA94 +_0807E930 0x0004 +_0807E908 0x0001 +Call 0x0807df51 +_0807E878 +SCRIPT_END diff --git a/data/scripts/gUnk_08014402.inc b/data/scripts/gUnk_08014402.inc deleted file mode 100644 index bd738b1a..00000000 --- a/data/scripts/gUnk_08014402.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_08014402 -.short 0x001e -.short 0x085b -.short 0x2c18 -.short 0x0459 -.short 0x0831 -.short 0x000a -.short 0x0c4e -.short 0x0000 -.short 0x0000 -.short 0x0c0b -.short 0x5529 -.short 0x0806 -.short 0x0882 -.short 0x0036 -.short 0x0434 -.short 0x085b -.short 0x2c19 -.short 0x0459 -.short 0x0c4e -.short 0x0303 -.short 0x0000 -.short 0x0c0b -.short 0xf421 -.short 0x0807 -.short 0x0831 -.short 0x001e -.short 0x0464 -.short 0x085b -.short 0x2c22 -.short 0x0459 -.short 0x0850 -.short 0x0004 -.short 0x084d -.short 0x0001 -.short 0x0c0b -.short 0xdf51 -.short 0x0807 -.short 0x0444 -.short 0xffff diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc index 1f36e998..663eece6 100644 --- a/data/scripts/gUnk_08014450.inc +++ b/data/scripts/gUnk_08014450.inc @@ -23,52 +23,33 @@ HasRupees 0x000a JumpIf 0x000a TextboxNoOverlapFollow 0x4204 Jump 0x005c -Call sub_0806E250 +Call 0x0806e251 JumpIfNot 0x000e TextboxNoOverlapFollow 0x420b _0807EB38 -.short 0x0c06 +_0807E078 .short 0x0004 .short 0x000a -.short 0x082c -.short 0x0093 -.short 0x0803 -.short 0x000a -.short 0x082a -.short 0x0093 -.short 0x082a -.short 0x00d3 -.short 0x087f -.short 0xfff6 -.short 0x085a -.short 0x420c -.short 0x087b -.short 0x010c -.short 0x0831 -.short 0x0018 -.short 0x082f -.short 0x0000 -.short 0x082a -.short 0x0092 -.short 0x0c77 -.short 0x0000 -.short 0xffa0 -.short 0x0c0b -.short 0xdf39 -.short 0x0807 -.short 0x0803 -.short 0x000e -.short 0x0850 -.short 0x0009 -.short 0x0831 -.short 0x003c -.short 0x0850 -.short 0x0002 -.short 0x0444 -.short 0x0815 -.short 0x0000 -.short 0x0805 -.short 0xff5e -.short 0x0454 -.short 0xffff +@ End of 2 parameters +ClearLocalFlag 0x0093 +Jump 0x000a +SetLocalFlag 0x0093 +SetLocalFlag 0x00d3 +ModRupees 0xfff6 +TextboxNoOverlapFollow 0x420c +SoundReq 0x010c +Wait 0x0018 +SetRoomFlag 0x0000 +SetLocalFlag 0x0092 +_0807EEF4 0x0000, 0xffa0 +Call 0x0807df39 +Jump 0x000e +_0807E930 0x0009 +Wait 0x003c +_0807E930 0x0002 +_0807E878 +CheckRoomFlag 0x0000 +JumpIfNot 0xff5e +_0807E9DC +SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/gUnk_0801450C.inc index 13f1cc79..bf8d0973 100644 --- a/data/scripts/gUnk_0801450C.inc +++ b/data/scripts/gUnk_0801450C.inc @@ -6,12 +6,29 @@ SetEntityNonPlanarMovement 0x01c0 _0807EF80 0x000a StopScript _0807E864 -Call sub_0807DF28 -Call sub_0806E20C +Call 0x0807df29 +Call 0x0806e20d _0807EA94 -Call sub_0806E23C +Call 0x0806e23d ClearLocalFlag 0x0093 ClearLocalFlag 0x0092 -Call sub_0807DF50 +Call 0x0807df51 Jump 0xffb8 .short 0x0000 +StartScript +StopScript +CheckPlayerInRegion 0x0078, 0x0088, 0x0810 +JumpIfNot 0xfff6 +CheckRoomFlag 0x0000 +JumpIfNot 0xffee +_0807E864 +_0807EB28 0x4217 +_0807EA94 +StartPlayerScript 0x08014588 +Wait 0x0010 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +_0807E878 +Jump 0xffca +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08014548.inc b/data/scripts/gUnk_08014548.inc deleted file mode 100644 index 7b59ad10..00000000 --- a/data/scripts/gUnk_08014548.inc +++ /dev/null @@ -1,30 +0,0 @@ -SCRIPT_START gUnk_08014548 -StartScript -StopScript -CheckPlayerInRegion 0x0078, 0x0088, 0x0810 -JumpIfNot 0xfff6 -CheckRoomFlag 0x0000 -JumpIfNot 0xffee -_0807E864 -_0807EB28 0x4217 -_0807EA94 -StartPlayerScript 0x08014588 -Wait 0x0010 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807E878 -Jump 0xffca -SCRIPT_END -.short 0x0000 -.short 0x0402 -.short 0x0c33 -.short 0x0001 -.short 0x0000 -.short 0x0867 -.short 0x00e0 -.short 0x0c73 -.short 0x0078 -.short 0x0078 -.short 0x0879 -.short 0x0000 -.short 0x0831 diff --git a/data/scripts/gUnk_08014588.inc b/data/scripts/gUnk_08014588.inc new file mode 100644 index 00000000..23d8ddc7 --- /dev/null +++ b/data/scripts/gUnk_08014588.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_08014588 +StopScript +WaitForSomething2 0x00000001 +SetEntityNonPlanarMovement 0x00e0 +_0807EDD4 0x0078, 0x0078 +_0807EF80 0x0000 +Wait 0x0010 +_0807E5F8 0x00000002 +Call 0x0807921d +SCRIPT_END diff --git a/data/scripts/gUnk_080145A0.inc b/data/scripts/gUnk_080145A0.inc deleted file mode 100644 index c5e52a05..00000000 --- a/data/scripts/gUnk_080145A0.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080145A0 -.short 0x0010 -.short 0x0c28 -.short 0x0002 -.short 0x0000 -.short 0x0c0b -.short 0x921d -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc index 38db9194..b155d174 100644 --- a/data/scripts/gUnk_080145B0.inc +++ b/data/scripts/gUnk_080145B0.inc @@ -10,7 +10,10 @@ _0807E864 ClearRoomFlag 0x0005 Wait 0x000c _0807EB8C -TextboxNoOverlapFollowPos 0x432e, 0x000c +TextboxNoOverlapFollowPos +.short 0x432e +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E878 Jump 0xffe0 diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc index f6bd23b8..ea393b3a 100644 --- a/data/scripts/gUnk_080145E8.inc +++ b/data/scripts/gUnk_080145E8.inc @@ -7,12 +7,151 @@ StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa _0807E864 -Call sub_0807DF28 +Call 0x0807df29 CheckRoomFlag 0x0004 JumpIf 0xfffa _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 -.short 0x0803 -.short 0xffd2 +Jump 0xffd2 +StartScript +_0807E9D4 +_0807EB44 0x0004 +SetEntityDirection 0x0000 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIf 0x0062 +TestBit 0x00000004 +JumpIf 0x0132 +CheckRoomFlag 0x0004 +JumpIf 0x0022 +Call 0x0808861d +JumpIfNot 0xffe0 +CheckLocalFlag 0x005e +JumpIf 0x003e +_0807E864 +_0807EB8C +TextboxNoOverlapFollowPos +.short 0x432b +.short 0x000c +@ End of 2 parameters +Jump 0x015e +Call 0x08088659 +JumpIfNot 0xffc0 +_0807E864 +_0807EB28 0x431f +_0807EA94 +StartPlayerScript 0x080147dc +Wait 0x0010 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +_0807E878 +Jump 0xff9c +_0807E864 +_0807E930 0x0008 +Wait 0x0010 +_0807EB8C +Wait 0x0010 +_0807E930 0x0002 +CheckGlobalFlag 0x0059 +JumpIfNot 0x000c +TextboxNoOverlapFollowPos +.short 0x432f +.short 0x000c +@ End of 2 parameters +Jump 0x010a +CheckRoomFlag 0x0004 +JumpIf 0x0028 +CheckLocalFlag 0x005e +JumpIfNot 0x002a +CheckRoomFlag 0x0006 +JumpIf 0x0052 +CheckLocalFlag 0x005f +JumpIf 0x003c +Call 0x08088575 +SetRoomFlag 0x0009 +Jump 0x004a +TextboxNoOverlapFollowPos +.short 0x431e +.short 0x000c +@ End of 2 parameters +Jump 0x00d2 +SetRoomFlag 0x0009 +SetLocalFlag 0x005c +TextboxNoOverlapFollowPos +.short 0x4305 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E3BC 0x0001 +JumpIfNot 0x00b0 +TextboxNoOverlapFollowPos +.short 0x4306 +.short 0x000c +@ End of 2 parameters +Jump 0x001e +SetRoomFlag 0x0009 +Call 0x08088505 +Jump 0x0010 +SetRoomFlag 0x0009 +ClearRoomFlag 0x0006 +Call 0x08088545 +_0807E3E8 +JumpIfNot 0x0030 +_0807EA94 +_0807E3BC 0x0001 +JumpIfNot 0x007a +SetRoomFlag 0x0001 +Wait 0x0014 +CheckRoomFlag 0x0003 +JumpIfNot 0xfffa +ClearRoomFlag 0x0003 +_0807EA94 +SetRoomFlag 0x0004 +TextboxNoOverlapFollowPos +.short 0x431e +.short 0x000c +@ End of 2 parameters +Jump 0x0060 +SetRoomFlag 0x0009 +_0807EA94 +Jump 0x0056 +CheckRoomFlag 0x0008 +JumpIf 0x0034 +CheckRoomFlag 0x0007 +JumpIf 0x001c +Call 0x08088479 +_0807EA94 +Call 0x080885b1 +WaitPlayerAction8 +_0807E5F8 0x00000008 +Jump 0x002c +_0807E930 0x0009 +Wait 0x003c +_0807E930 0x0002 +Jump 0xffd8 +_0807E930 0x000a +Wait 0x008c +_0807E930 0x0002 +Jump 0xffc8 +SetRoomFlag 0x0009 +TextboxNoOverlapFollowPos +.short 0x4307 +.short 0x000c +@ End of 2 parameters +_0807EA94 +Wait 0x0004 +_0807E878 +Jump 0xfe62 +.short 0x0000 +StopScript +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x00e0 +_0807EDD4 0x0078, 0x0068 +_0807EF80 0x0000 +Wait 0x0010 +_0807E5F8 0x00000001 +Call 0x0807921d +SCRIPT_END diff --git a/data/scripts/gUnk_08014628.inc b/data/scripts/gUnk_08014628.inc deleted file mode 100644 index 11caa14c..00000000 --- a/data/scripts/gUnk_08014628.inc +++ /dev/null @@ -1,131 +0,0 @@ -SCRIPT_START gUnk_08014628 -StartScript -_0807E9D4 -_0807EB44 0x0004 -SetEntityDirection 0x0000 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIf 0x0062 -TestBit 0x00000004 -JumpIf 0x0132 -CheckRoomFlag 0x0004 -JumpIf 0x0022 -Call sub_0808861C -JumpIfNot 0xffe0 -CheckLocalFlag 0x005e -JumpIf 0x003e -_0807E864 -_0807EB8C -TextboxNoOverlapFollowPos 0x432b, 0x000c -Jump 0x015e -Call sub_08088658 -JumpIfNot 0xffc0 -_0807E864 -_0807EB28 0x431f -_0807EA94 -StartPlayerScript 0x080147dc -Wait 0x0010 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807E878 -Jump 0xff9c -_0807E864 -_0807E930 0x0008 -Wait 0x0010 -_0807EB8C -Wait 0x0010 -_0807E930 0x0002 -CheckGlobalFlag 0x0059 -JumpIfNot 0x000c -TextboxNoOverlapFollowPos 0x432f, 0x000c -Jump 0x010a -CheckRoomFlag 0x0004 -JumpIf 0x0028 -CheckLocalFlag 0x005e -JumpIfNot 0x002a -CheckRoomFlag 0x0006 -JumpIf 0x0052 -CheckLocalFlag 0x005f -JumpIf 0x003c -Call sub_08088574 -SetRoomFlag 0x0009 -Jump 0x004a -TextboxNoOverlapFollowPos 0x431e, 0x000c -Jump 0x00d2 -SetRoomFlag 0x0009 -SetLocalFlag 0x005c -TextboxNoOverlapFollowPos 0x4305, 0x000c -_0807EA94 -_0807E3BC 0x0001 -JumpIfNot 0x00b0 -TextboxNoOverlapFollowPos 0x4306, 0x000c -Jump 0x001e -SetRoomFlag 0x0009 -Call sub_08088504 -Jump 0x0010 -SetRoomFlag 0x0009 -ClearRoomFlag 0x0006 -Call sub_08088544 -_0807E3E8 -JumpIfNot 0x0030 -_0807EA94 -_0807E3BC 0x0001 -JumpIfNot 0x007a -SetRoomFlag 0x0001 -Wait 0x0014 -CheckRoomFlag 0x0003 -JumpIfNot 0xfffa -ClearRoomFlag 0x0003 -_0807EA94 -SetRoomFlag 0x0004 -TextboxNoOverlapFollowPos 0x431e, 0x000c -Jump 0x0060 -SetRoomFlag 0x0009 -_0807EA94 -Jump 0x0056 -CheckRoomFlag 0x0008 -JumpIf 0x0034 -CheckRoomFlag 0x0007 -JumpIf 0x001c -Call sub_08088478 -_0807EA94 -Call sub_080885B0 -WaitPlayerAction8 -_0807E5F8 0x00000008 -Jump 0x002c -_0807E930 0x0009 -Wait 0x003c -_0807E930 0x0002 -Jump 0xffd8 -_0807E930 0x000a -Wait 0x008c -_0807E930 0x0002 -Jump 0xffc8 -SetRoomFlag 0x0009 -TextboxNoOverlapFollowPos 0x4307, 0x000c -_0807EA94 -Wait 0x0004 -_0807E878 -Jump 0xfe62 -.short 0x0000 -.short 0x0402 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0867 -.short 0x00e0 -.short 0x0c73 -.short 0x0078 -.short 0x0068 -.short 0x0879 -.short 0x0000 -.short 0x0831 -.short 0x0010 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x921d -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc index 85a06e5b..a67cef9c 100644 --- a/data/scripts/gUnk_08014804.inc +++ b/data/scripts/gUnk_08014804.inc @@ -5,11 +5,14 @@ _0807EB44 0x0000 _0807EF80 0x000a StopScript _0807E864 -Call sub_0807DF38 +Call 0x0807df39 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf 0x0092 -TextboxNoOverlapFollowPos 0x4215, 0x000c +TextboxNoOverlapFollowPos +.short 0x4215 +.short 0x000c +@ End of 2 parameters _0807E878 TestBit 0x00000001 JumpIf 0x002c @@ -21,7 +24,10 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -TextboxNoOverlapFollowPos 0x4215, 0x000c +TextboxNoOverlapFollowPos +.short 0x4215 +.short 0x000c +@ End of 2 parameters _0807E878 Jump 0xffce _0807E930 0x0008 @@ -44,7 +50,10 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -TextboxNoOverlapFollowPos 0x4216, 0x000c +TextboxNoOverlapFollowPos +.short 0x4216 +.short 0x000c +@ End of 2 parameters _0807E878 Jump 0xffce _0807E930 0x0008 @@ -58,3 +67,30 @@ _0807E930 0x0002 _0807E5F8 0x00000008 Jump 0xffa2 .short 0x0000 +StartScript +StopScript +CheckRoomFlag 0x0000 +JumpIfNot 0xfffa +ClearRoomFlag 0x0000 +Call 0x0806e141 +JumpIfNot 0x002a +_0807EA94 +_0807E3E8 +JumpIfNot 0x0028 +_0807E864 +_0807E5F8 0x00000001 +WaitForSomething2 0x00000002 +Call 0x0806e1e1 +_0807EA94 +Wait 0x0018 +_0807E878 +Jump 0xffc4 +_0807EA94 +Jump 0x0002 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000008 +Call 0x0806e1fd +Wait 0x001e +Call 0x0807df51 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080148F0.inc b/data/scripts/gUnk_080148F0.inc deleted file mode 100644 index b2e71487..00000000 --- a/data/scripts/gUnk_080148F0.inc +++ /dev/null @@ -1,28 +0,0 @@ -SCRIPT_START gUnk_080148F0 -StartScript -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -ClearRoomFlag 0x0000 -Call sub_0806E140 -JumpIfNot 0x002a -_0807EA94 -_0807E3E8 -JumpIfNot 0x0028 -_0807E864 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0806E1E0 -_0807EA94 -Wait 0x0018 -_0807E878 -Jump 0xffc4 -_0807EA94 -Jump 0x0002 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -Call sub_0806E1FC -Wait 0x001e -Call sub_0807DF50 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/gUnk_08014958.inc index adb2d017..db98456c 100644 --- a/data/scripts/gUnk_08014958.inc +++ b/data/scripts/gUnk_08014958.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08014958 StartScript -Call sub_0806C870 +Call 0x0806c871 _0807EF80 0x000a CheckGlobalFlag 0x0058 JumpIf 0x000c @@ -11,9 +11,25 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_0806C90C +Call 0x0806c90d _0807EA94 Wait 0x000f _0807E878 -.short 0x0803 -.short 0xffe6 +Jump 0xffe6 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +CheckGlobalFlag 0x0058 +JumpIfNot 0x0020 +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08014994.inc b/data/scripts/gUnk_08014994.inc deleted file mode 100644 index 17b45756..00000000 --- a/data/scripts/gUnk_08014994.inc +++ /dev/null @@ -1,18 +0,0 @@ -SCRIPT_START gUnk_08014994 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -CheckGlobalFlag 0x0058 -JumpIfNot 0x0020 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc index 7751e519..9882bfe8 100644 --- a/data/scripts/gUnk_080149CC.inc +++ b/data/scripts/gUnk_080149CC.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_080149CC StartScript SetEntityNonPlanarMovement 0x0080 -Call sub_0806C870 +Call 0x0806c871 _0807EF80 0x000a StopScript _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call sub_0806C90C +Call 0x0806c90d _0807EA94 CheckLocalFlag 0x0064 JumpIfNot 0x002a @@ -25,3 +25,85 @@ _0807EF80 0x000a _0807E878 Jump 0xffba .short 0x0000 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +.short 0x0000 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffe6 +.short 0x0000 + + .globl gUnk_08014A80 +gUnk_08014A80: +StartScript +_0807EF80 0x000a +StopScript +WaitForSomething2 0x00000001 +_0807EB74 +_0807EF80 0x0004 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +TextboxNoOverlap 0x2f0a +_0807EA94 +_0807E5F8 0x00000002 +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x2f0a +_0807EA94 +_0807E878 +Jump 0xffec +.short 0x0000 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +StartPlayerScript 0x08014b10 +WaitForSomething2 0x00000001 +_0807EB74 +CheckLocalFlag 0x0064 +JumpIf 0x000e +SetLocalFlag 0x0064 +TextboxNoOverlap 0x2f0b +Jump 0x0006 +TextboxNoOverlap 0x2f0c +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffc6 +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x0078, 0x0040 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08014A28.inc b/data/scripts/gUnk_08014A28.inc deleted file mode 100644 index 7788423f..00000000 --- a/data/scripts/gUnk_08014A28.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_08014A28 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 diff --git a/data/scripts/gUnk_08014A54.inc b/data/scripts/gUnk_08014A54.inc deleted file mode 100644 index c9ff8985..00000000 --- a/data/scripts/gUnk_08014A54.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_08014A54 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc deleted file mode 100644 index 49eabcbb..00000000 --- a/data/scripts/gUnk_08014A80.inc +++ /dev/null @@ -1,21 +0,0 @@ -SCRIPT_START gUnk_08014A80 -StartScript -_0807EF80 0x000a -StopScript -WaitForSomething2 0x00000001 -_0807EB74 -_0807EF80 0x0004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E5F8 0x00000002 -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 diff --git a/data/scripts/gUnk_08014AC4.inc b/data/scripts/gUnk_08014AC4.inc deleted file mode 100644 index 76c5fb81..00000000 --- a/data/scripts/gUnk_08014AC4.inc +++ /dev/null @@ -1,41 +0,0 @@ -SCRIPT_START gUnk_08014AC4 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -StartPlayerScript 0x08014b10 -WaitForSomething2 0x00000001 -_0807EB74 -CheckLocalFlag 0x0064 -JumpIf 0x000e -SetLocalFlag 0x0064 -TextboxNoOverlap 0x2f0b -Jump 0x0006 -TextboxNoOverlap 0x2f0c -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffc6 -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0c73 -.short 0x0078 -.short 0x0040 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/gUnk_08014B34.inc index 10da7252..afc0cefd 100644 --- a/data/scripts/gUnk_08014B34.inc +++ b/data/scripts/gUnk_08014B34.inc @@ -21,31 +21,31 @@ _0807E878 Jump 0xffda StopScript _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807E5F8 0x00000001 _0807EF80 0x0004 WaitForSomething2 0x00000002 _0807E930 0x0010 -Call sub_0806CCF8 +Call 0x0806ccf9 Wait 0x0014 -Call sub_0806CD04 +Call 0x0806cd05 Wait 0x0014 -Call sub_0806CD14 +Call 0x0806cd15 Wait 0x0014 -Call sub_0806CD20 +Call 0x0806cd21 Wait 0x0014 -Call sub_0806CD30 +Call 0x0806cd31 Wait 0x0014 -Call sub_0806CD3C +Call 0x0806cd3d Wait 0x0014 -Call sub_0806CD4C +Call 0x0806cd4d SoundReq 0x0072 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807E930 0x0010 -Call sub_0806CD4C +Call 0x0806cd4d CheckEntityInteractType JumpIfNot 0xfffc _0807E864 @@ -62,5 +62,56 @@ TextboxNoOverlap 0x2f08 _0807EA94 Wait 0x000f _0807E878 -.short 0x0803 -.short 0xffc8 +Jump 0xffc8 +StartScript +Call 0x0806cd59 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E930 0x0006 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x0806ccd1 +JumpIfNot 0xfff8 +Call 0x0806ccb5 +JumpIfNot 0xfff8 +CheckLocalFlag 0x0066 +JumpIf 0x0016 +SetLocalFlag 0x0066 +TextboxNoOverlap 0x2f0d +_0807EA94 +_0807F034 0x000a +WaitPlayerAction8 +Jump 0x0008 +TextboxNoOverlap 0x2f09 +_0807EA94 +Wait 0x000f +_0807E878 +_0807EB44 0x0004 +_0807E930 0x0006 +Jump 0xffb0 +StartScript +CheckGlobalFlag 0x0024 +JumpIf 0x0038 +Call 0x0806c871 +_0807EF80 0x000a +_0807EF80 0x0000 +StopScript +StopScript +StartScript +CheckGlobalFlag 0x0024 +JumpIf 0x001c +_0807E30C +JumpIfNot 0xfff0 +StopScript +_0807E864 +_0807EB74 +Call 0x0806c90d +_0807EA94 +_0807E878 +Jump 0xffdc +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08014C2C.inc b/data/scripts/gUnk_08014C2C.inc deleted file mode 100644 index 4380341b..00000000 --- a/data/scripts/gUnk_08014C2C.inc +++ /dev/null @@ -1,31 +0,0 @@ -SCRIPT_START gUnk_08014C2C -StartScript -Call sub_0806CD58 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0006 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806CCD0 -JumpIfNot 0xfff8 -Call sub_0806CCB4 -JumpIfNot 0xfff8 -CheckLocalFlag 0x0066 -JumpIf 0x0016 -SetLocalFlag 0x0066 -TextboxNoOverlap 0x2f0d -_0807EA94 -_0807F034 0x000a -WaitPlayerAction8 -Jump 0x0008 -TextboxNoOverlap 0x2f09 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EB44 0x0004 -_0807E930 0x0006 -.short 0x0803 -.short 0xffb0 diff --git a/data/scripts/gUnk_08014C94.inc b/data/scripts/gUnk_08014C94.inc deleted file mode 100644 index c6b8ee0e..00000000 --- a/data/scripts/gUnk_08014C94.inc +++ /dev/null @@ -1,24 +0,0 @@ -SCRIPT_START gUnk_08014C94 -StartScript -CheckGlobalFlag 0x0024 -JumpIf 0x0038 -Call sub_0806C870 -_0807EF80 0x000a -_0807EF80 0x0000 -StopScript -StopScript -StartScript -CheckGlobalFlag 0x0024 -JumpIf 0x001c -_0807E30C -JumpIfNot 0xfff0 -StopScript -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -_0807E878 -Jump 0xffdc -_0807EF80 0x0006 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc index e63a836a..5c80a274 100644 --- a/data/scripts/gUnk_08014CDC.inc +++ b/data/scripts/gUnk_08014CDC.inc @@ -2,16 +2,19 @@ SCRIPT_START gUnk_08014CDC StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x000a -Call sub_08066D04 -Call sub_08066D14 +Call 0x08066d05 +Call 0x08066d15 SetEntityPositionRelative 0x018001e8 _0807EB44 0x0004 _0807EF80 0x0000 StopScript WaitForSomething2 0x00000001 -Call sub_08066E08 +Call 0x08066e09 _0807E864 -TextboxNoOverlapFollowPos 0x1010, 0x000c +TextboxNoOverlapFollowPos +.short 0x1010 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000002 StopScript @@ -20,38 +23,43 @@ CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot 0xfff2 StopScript _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 TextboxNoOverlap 0x1012 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 -Call sub_08066E08 +Call 0x08066e09 SetEntityPositionRelative 0x00c801f8 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 -CallWithArg sub_0807F6B4, 0x000000e8 +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x00e8 +.short 0x0000 +@ End of 4 parameters JumpIf 0xfff4 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 TextboxNoOverlap 0x1013 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 _0807EF80 0x0000 SetEntityPositionRelative 0x002801e8 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 TextboxNoOverlap 0x1014 _0807EA94 _0807EC64 0x0018 SetLocalFlag 0x006d -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/gUnk_08014DCC.inc index 48f3362c..d689618e 100644 --- a/data/scripts/gUnk_08014DCC.inc +++ b/data/scripts/gUnk_08014DCC.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_08014DCC StartScript SetEntityPositionRelative 0x01a80238 -Call sub_0807F844 -Call sub_0807F348 +Call 0x0807f845 +Call 0x0807f349 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 StopScript _0807E778 0x0010 DoFade6 @@ -13,7 +13,7 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F0B4 0x0004 CameraTargetPlayer -Call sub_0807DF50 +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc index 9efdb9d3..9d45548d 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/gUnk_08014E14.inc @@ -3,15 +3,304 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Call sub_08064428 +CallWithArg +.short 0xf3d9 +.short 0x0807 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters +Call 0x08064429 _0807EA94 _0807E878 Jump 0xffe0 .short 0x0000 +StartScript +_0807EF80 0x000a +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807df29 +_0807EB74 +CallWithArg +.short 0xf78d +.short 0x0807 +.short 0x0022 +.short 0x0000 +@ End of 4 parameters +_0807EA94 +_0807E3E8 +JumpIfNot 0x0038 +CallWithArg +.short 0xf7c5 +.short 0x0807 +.short 0x0022 +.short 0x0000 +@ End of 4 parameters +JumpIfNot 0x001e +_0807E48C 0x0020 +JumpIfNot 0x001e +CallWithArg +.short 0xf801 +.short 0x0807 +.short 0x0022 +.short 0x0000 +@ End of 4 parameters +WaitPlayerAction8 +TextboxNoOverlap 0x0a04 +Jump 0x000e +TextboxNoOverlap 0x0a03 +Jump 0x0006 +TextboxNoOverlap 0x0a02 +_0807EA94 +Call 0x0807df51 +_0807E878 +Jump 0xff9c +.short 0x0000 +StartScript +_0807EF80 0x000a +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x200d +_0807EA94 +_0807E878 +Jump 0xffec +.short 0x0000 +StartScript +_0807EF80 0x000a +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x000a +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +_0807EF80 0x0000 +TextboxNoOverlap 0x200e +_0807EA94 +_0807E878 +_0807EB44 0x0004 +_0807E930 0x000a +Jump 0xffe0 +.short 0x0000 +StartScript +_0807EF80 0x000a +_0807EF80 0x0007 +_0807EB44 0x0004 +_0807E930 0x000e +StopScript +Call 0x08065915 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807df29 +_0807EB74 +_0807EF80 0x0000 +StartScript +TextboxNoOverlap 0x3b0b +CallWithArg +.short 0xf855 +.short 0x0807 +.short 0x0064 +.short 0x0001 +@ End of 4 parameters +StopScript +_0807EA94 +_0807E3E8 +JumpIfNot 0x0030 +HasRupees 0x0064 +JumpIfNot 0x001c +_0807E48C 0x0020 +JumpIfNot 0x001c +ModRupees 0xff9c +_0807F034 0x0022 +WaitPlayerAction8 +TextboxNoOverlap 0x3b11 +Jump 0x000e +TextboxNoOverlap 0x3b0e +Jump 0x0006 +TextboxNoOverlap 0x3b0f +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EB44 0x0004 +_0807E930 0x000e +Jump 0xff90 +StartScript +SetEntityPositionRelative 0x00e001f8 +Call 0x08054565 +StopScript +CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 +JumpIfNot 0xfff6 +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +SoundReq0x80100000 +_0807F0B4 0x0001 +CameraTargetEntity +StartPlayerScript 0x080152b4 +WaitForSomething2 0x00000001 +TextboxNoOverlapFollowPos +.short 0x1301 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +Call 0x0807f3f9 +Wait 0x003c +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +SoundReq2 0x000d +_0807EB28 0x1302 +_0807EA94 +TextboxNoOverlapFollowPos +.short 0x1303 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807EB28 0x1304 +_0807EA94 +TextboxNoOverlapFollowPos +.short 0x1305 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000004 +_0807EB28 0x1306 +_0807EA94 +SoundReq0x80100000 +StartPlayerScript 0x080152dc +CameraTargetEntity +_0807F0B4 0x0003 +SetEntityPositionRelative 0x014801f8 +WaitForSomething2 0x00000001 +Call 0x0804f6a9 +Wait 0x0004 +Call 0x0804f809 +SoundReq 0x010b +StartPlayerScript 0x08015304 +Call 0x0804f6c9 +Wait 0x0004 +Call 0x0804f831 +SoundReq 0x010b +Call 0x0804f6e9 +Wait 0x0004 +Call 0x0804f855 +SoundReq 0x010b +Call 0x0804f725 +Wait 0x0004 +Call 0x0804f89d +SoundReq 0x010b +Call 0x0804f761 +Wait 0x0004 +Call 0x0804f8e1 +SoundReq 0x010b +Wait 0x003c +WaitForSomething2 0x00000001 +SoundReq 0x01b0 +Call 0x0804f79d +Wait 0x000a +LoadRoomEntityList 0x080f7fc0 +SoundReq2 0x002d +Call 0x0807df51 +_0807E878 +CheckRoomFlag 0x0000 +JumpIfNot 0xfffa +_0807E864 +Call 0x0807f9a5 +Call 0x0807df29 +SoundReq0x80100000 +StartPlayerScript 0x08015338 +WaitForSomething2 0x00000001 +Wait 0x003c +Call 0x0804f6a9 +Wait 0x0004 +Call 0x0804f929 +SoundReq 0x010b +Call 0x0804f6c9 +Wait 0x0004 +Call 0x0804f945 +SoundReq 0x010b +Call 0x0804f6e9 +Wait 0x0004 +Call 0x0804f961 +SoundReq 0x010b +Call 0x0804f725 +Wait 0x0004 +Call 0x0804f995 +SoundReq 0x010b +Call 0x0804f761 +Wait 0x0004 +Call 0x0804f9c9 +SoundReq 0x010b +Wait 0x003c +SoundReq 0x0072 +_0807F0B4 0x0004 +CameraTargetPlayer +SetLocalFlag 0x008c +_0807EB28 0x130c +_0807EA94 +CameraTargetPlayer +_0807E778 0x0004 +_0807E80C 0x00000000 +WaitFor_2 +Call 0x08053b3d +StartScript +_0807E864 +CallWithArg +.short 0xf6e9 +.short 0x0807 +.short 0x0008 +.short 0x0000 +@ End of 4 parameters +MoveEntityToPlayer +_0807F0B4 0x0004 +CameraTargetEntity +_0807E778 0x0100 +DoFade4 +_0807E80C 0x00000000 +StopScript +StartPlayerScript 0x08015360 +WaitForSomething2 0x00000001 +LoadRoomEntityList 0x080f7cb0 +_0807E778 0x0004 +_0807E800 0x00000000 +WaitFor_2 +_0807E5F8 0x00000008 +WaitForSomething2 0x00000010 +StartScript +_0807E8E4_2 +_0807EB28 0x1315 +StopScript +_0807EA94 +_0807F0B4 0x0004 +CameraTargetPlayer +Call 0x08054571 +SoundReq2 0xffff +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_08014E50.inc b/data/scripts/gUnk_08014E50.inc deleted file mode 100644 index 609c7029..00000000 --- a/data/scripts/gUnk_08014E50.inc +++ /dev/null @@ -1,32 +0,0 @@ -SCRIPT_START gUnk_08014E50 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -CallWithArg sub_0807F78C, 0x00000022 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0038 -CallWithArg sub_0807F7C4, 0x00000022 -JumpIfNot 0x001e -_0807E48C 0x0020 -JumpIfNot 0x001e -CallWithArg sub_0807F800, 0x00000022 -WaitPlayerAction8 -TextboxNoOverlap 0x0a04 -Jump 0x000e -TextboxNoOverlap 0x0a03 -Jump 0x0006 -TextboxNoOverlap 0x0a02 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xff9c -.short 0x0000 diff --git a/data/scripts/gUnk_08014ECC.inc b/data/scripts/gUnk_08014ECC.inc deleted file mode 100644 index d1fddf30..00000000 --- a/data/scripts/gUnk_08014ECC.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08014ECC -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x200d -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 diff --git a/data/scripts/gUnk_08014EF8.inc b/data/scripts/gUnk_08014EF8.inc deleted file mode 100644 index 03b74c8d..00000000 --- a/data/scripts/gUnk_08014EF8.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08014EF8 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x200e -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807E930 0x000a -Jump 0xffe0 -.short 0x0000 diff --git a/data/scripts/gUnk_08014F30.inc b/data/scripts/gUnk_08014F30.inc deleted file mode 100644 index 58905710..00000000 --- a/data/scripts/gUnk_08014F30.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_08014F30 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x000e -StopScript -Call sub_08065914 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -_0807EF80 0x0000 -StartScript -TextboxNoOverlap 0x3b0b -CallWithArg sub_0807F854, 0x00010064 -StopScript -_0807EA94 -_0807E3E8 -JumpIfNot 0x0030 -HasRupees 0x0064 -JumpIfNot 0x001c -_0807E48C 0x0020 -JumpIfNot 0x001c -ModRupees 0xff9c -_0807F034 0x0022 -WaitPlayerAction8 -TextboxNoOverlap 0x3b11 -Jump 0x000e -TextboxNoOverlap 0x3b0e -Jump 0x0006 -TextboxNoOverlap 0x3b0f -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EB44 0x0004 -_0807E930 0x000e -.short 0x0803 -.short 0xff90 diff --git a/data/scripts/gUnk_08014FBC.inc b/data/scripts/gUnk_08014FBC.inc deleted file mode 100644 index 0d4aa108..00000000 --- a/data/scripts/gUnk_08014FBC.inc +++ /dev/null @@ -1,17 +0,0 @@ -SCRIPT_START gUnk_08014FBC -StartScript -SetEntityPositionRelative 0x00e001f8 -Call sub_08054564 -StopScript -CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -_0807F0B4 0x0001 -CameraTargetEntity -StartPlayerScript 0x080152b4 -WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos 0x1301, 0x0002 -.byte 0x59 diff --git a/data/scripts/gUnk_08015001.inc b/data/scripts/gUnk_08015001.inc deleted file mode 100644 index 643815df..00000000 --- a/data/scripts/gUnk_08015001.inc +++ /dev/null @@ -1,68 +0,0 @@ -SCRIPT_START gUnk_08015001 -.short 0x0b04 -.short 0xf90c -.short 0x07f3 -.short 0x3108 -.short 0x3c08 -.short 0x2800 -.short 0x020c -.short 0x0000 -.short 0x3300 -.short 0x040c -.short 0x0000 -.short 0x2800 -.short 0x020c -.short 0x0000 -.short 0x3300 -.short 0x040c -.short 0x0000 -.short 0x7c00 -.short 0x0d08 -.short 0x5f00 -.short 0x0208 -.short 0x5913 -.short 0x5c04 -.short 0x030c -.short 0x0213 -.short 0x5900 -.short 0x5f04 -.short 0x0408 -.short 0x5913 -.short 0x5c04 -.short 0x050c -.short 0x0213 -.short 0x5900 -.short 0x2804 -.short 0x020c -.short 0x0000 -.short 0x3300 -.short 0x040c -.short 0x0000 -.short 0x5f00 -.short 0x0608 -.short 0x5913 -.short 0x7e04 -.short 0x4704 -.short 0xdc0c -.short 0x0152 -.short 0x8708 -.short 0x8904 -.short 0x0308 -.short 0x6900 -.short 0xf80c -.short 0x4801 -.short 0x3301 -.short 0x010c -.short 0x0000 -.short 0x0b00 -.short 0xa90c -.short 0x04f6 -.short 0x3108 -.short 0x0408 -.short 0x0b00 -.short 0x090c -.short 0x04f8 -.short 0x7b08 -.short 0x0b08 -.short 0x4701 -.short 0x040c diff --git a/data/scripts/gUnk_08015087.inc b/data/scripts/gUnk_08015087.inc deleted file mode 100644 index 7579da65..00000000 --- a/data/scripts/gUnk_08015087.inc +++ /dev/null @@ -1,53 +0,0 @@ -SCRIPT_START gUnk_08015087 -.short 0x0153 -.short 0x0b08 -.short 0xc90c -.short 0x04f6 -.short 0x3108 -.short 0x0408 -.short 0x0b00 -.short 0x310c -.short 0x04f8 -.short 0x7b08 -.short 0x0b08 -.short 0x0b01 -.short 0xe90c -.short 0x04f6 -.short 0x3108 -.short 0x0408 -.short 0x0b00 -.short 0x550c -.short 0x04f8 -.short 0x7b08 -.short 0x0b08 -.short 0x0b01 -.short 0x250c -.short 0x04f7 -.short 0x3108 -.short 0x0408 -.short 0x0b00 -.short 0x9d0c -.short 0x04f8 -.short 0x7b08 -.short 0x0b08 -.short 0x0b01 -.short 0x610c -.short 0x04f7 -.short 0x3108 -.short 0x0408 -.short 0x0b00 -.short 0xe10c -.short 0x04f8 -.short 0x7b08 -.short 0x0b08 -.short 0x3101 -.short 0x3c08 -.short 0x3300 -.short 0x010c -.short 0x0000 -.short 0x7b00 -.short 0xb008 -.short 0x0b01 -.short 0x9d0c -.short 0x04f7 -.short 0x3108 diff --git a/data/scripts/gUnk_080150EF.inc b/data/scripts/gUnk_080150EF.inc deleted file mode 100644 index 4744ec01..00000000 --- a/data/scripts/gUnk_080150EF.inc +++ /dev/null @@ -1,326 +0,0 @@ -SCRIPT_START gUnk_080150EF -.byte 0x8 -.byte 0xa -.byte 0x0 -.byte 0xd -.byte 0xc -.byte 0xc0 -.byte 0x7f -.byte 0xf -.byte 0x8 -.byte 0x7c -.byte 0x8 -.byte 0x2d -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x15 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x5 -.byte 0x8 -.byte 0xfa -.byte 0xff -.byte 0x43 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0xa5 -.byte 0xf9 -.byte 0x7 -.byte 0x8 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x7e -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0x38 -.byte 0x53 -.byte 0x1 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xa9 -.byte 0xf6 -.byte 0x4 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x29 -.byte 0xf9 -.byte 0x4 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xb -.byte 0x1 -.byte 0xb -.byte 0xc -.byte 0xc9 -.byte 0xf6 -.byte 0x4 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x45 -.byte 0xf9 -.byte 0x4 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xb -.byte 0x1 -.byte 0xb -.byte 0xc -.byte 0xe9 -.byte 0xf6 -.byte 0x4 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xf9 -.byte 0x4 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xb -.byte 0x1 -.byte 0xb -.byte 0xc -.byte 0x25 -.byte 0xf7 -.byte 0x4 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0x95 -.byte 0xf9 -.byte 0x4 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xb -.byte 0x1 -.byte 0xb -.byte 0xc -.byte 0x61 -.byte 0xf7 -.byte 0x4 -.byte 0x8 -.byte 0x31 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0xb -.byte 0xc -.byte 0xc9 -.byte 0xf9 -.byte 0x4 -.byte 0x8 -.byte 0x7b -.byte 0x8 -.byte 0xb -.byte 0x1 -.byte 0x31 -.byte 0x8 -.byte 0x3c -.byte 0x0 -.byte 0x7b -.byte 0x8 -.byte 0x72 -.byte 0x0 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x88 -.byte 0x4 -.byte 0x2a -.byte 0x8 -.byte 0x8c -.byte 0x0 -.byte 0x5f -.byte 0x8 -.byte 0xc -.byte 0x13 -.byte 0x59 -.byte 0x4 -.byte 0x88 -.byte 0x4 -.byte 0x38 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x41 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x37 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x3d -.byte 0x3b -.byte 0x5 -.byte 0x8 -.byte 0x1 -.byte 0x4 -.byte 0x43 -.byte 0x4 -.byte 0xc -.byte 0x14 -.byte 0xe9 -.byte 0xf6 -.byte 0x7 -.byte 0x8 -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x6b -.byte 0x4 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x87 -.byte 0x4 -.byte 0x38 -.byte 0x8 -.byte 0x0 -.byte 0x1 -.byte 0x3c -.byte 0x4 -.byte 0x41 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x2 -.byte 0x4 -.byte 0x47 -.byte 0xc -.byte 0x60 -.byte 0x53 -.byte 0x1 -.byte 0x8 -.byte 0x33 -.byte 0xc -.byte 0x1 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0xd -.byte 0xc -.byte 0xb0 -.byte 0x7c -.byte 0xf -.byte 0x8 -.byte 0x38 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x40 -.byte 0xc -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x37 -.byte 0x4 -.byte 0x28 -.byte 0xc -.byte 0x8 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x33 -.byte 0xc -.byte 0x10 -.byte 0x0 -.byte 0x0 -.byte 0x0 -.byte 0x1 -.byte 0x4 -.byte 0x4b -.byte 0x4 -.byte 0x5f -.byte 0x8 -.byte 0x15 -.byte 0x13 -.byte 0x2 -.byte 0x4 -.byte 0x59 -.byte 0x4 -.byte 0x89 -.byte 0x8 -.byte 0x4 -.byte 0x0 -.byte 0x88 -.byte 0x4 -.byte 0xb -.byte 0xc -.byte 0x71 -.byte 0x45 -.byte 0x5 -.byte 0x8 -.byte 0x7c -.byte 0x8 -.byte 0xff -.byte 0xff -.byte 0xb -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/gUnk_08015234.inc index 55a848f6..e5ebf690 100644 --- a/data/scripts/gUnk_08015234.inc +++ b/data/scripts/gUnk_08015234.inc @@ -3,10 +3,10 @@ StartScript _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 -Call sub_0807F354 +Call 0x0807f355 StopScript WaitForSomething2 0x00000002 -Call sub_08066C94 +Call 0x08066c95 Wait 0x00e9 _0807EF80 0x0007 _0807EF80 0x001e @@ -15,7 +15,7 @@ WaitForSomething2 0x00000002 Wait 0x0014 _0807EB44 0x0000 _0807EF80 0x001c -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/gUnk_080152B4.inc index 57590d03..ba07be80 100644 --- a/data/scripts/gUnk_080152B4.inc +++ b/data/scripts/gUnk_080152B4.inc @@ -7,95 +7,5 @@ _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.short 0x0401 -.short 0x0867 -.short 0x0200 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x01f8 -.short 0x0148 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0861 -.short 0x0002 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0006 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0002 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0006 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0004 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x01f8 -.short 0x0148 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0401 -.short 0x0867 -.short 0x0100 -.short 0x0c69 -.short 0x0208 -.short 0x0148 -.short 0x0402 -.short 0x0861 -.short 0x0006 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0879 -.short 0x0015 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_080152DC.inc b/data/scripts/gUnk_080152DC.inc new file mode 100644 index 00000000..0e78d378 --- /dev/null +++ b/data/scripts/gUnk_080152DC.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_080152DC +StartScript +SetEntityNonPlanarMovement 0x0200 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x01f8, 0x0148 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08015304.inc b/data/scripts/gUnk_08015304.inc new file mode 100644 index 00000000..1094991f --- /dev/null +++ b/data/scripts/gUnk_08015304.inc @@ -0,0 +1,14 @@ +SCRIPT_START gUnk_08015304 +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0002 +Wait 0x000a +_0807EB44 0x0006 +Wait 0x000a +_0807EB44 0x0004 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/gUnk_08015338.inc similarity index 66% rename from data/scripts/gUnk_0800E9F4.inc rename to data/scripts/gUnk_08015338.inc index 029ea843..9865b028 100644 --- a/data/scripts/gUnk_0800E9F4.inc +++ b/data/scripts/gUnk_08015338.inc @@ -1,11 +1,11 @@ -SCRIPT_START gUnk_0800E9F4 +SCRIPT_START gUnk_08015338 StartScript -_0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 StopScript _0807EF80 0x0001 -_0807EDD4 0x0078, 0x0080 +_0807EDD4 0x01f8, 0x0148 +_0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08015360.inc b/data/scripts/gUnk_08015360.inc new file mode 100644 index 00000000..6584a442 --- /dev/null +++ b/data/scripts/gUnk_08015360.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_08015360 +StartScript +SetEntityNonPlanarMovement 0x0100 +SetEntityPositionRelative 0x01480208 +StopScript +_0807EB44 0x0006 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08015384.inc b/data/scripts/gUnk_08015384.inc new file mode 100644 index 00000000..e57ad001 --- /dev/null +++ b/data/scripts/gUnk_08015384.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_08015384 +_0807EF80 0x0015 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc index 435c729d..e571a989 100644 --- a/data/scripts/gUnk_08015390.inc +++ b/data/scripts/gUnk_08015390.inc @@ -4,18 +4,21 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 StopScript _0807E930 0x001f -Call sub_0806D944 +Call 0x0806d945 WaitForSomething2 0x00000008 _0807E930 0x0010 -TextboxNoOverlapFollowPos 0x1314, 0x000c +TextboxNoOverlapFollowPos +.short 0x1314 +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E930 0x0018 -Call sub_0806D8A0 +Call 0x0806d8a1 _0807EE30 JumpIfNot 0xfffc _0807E930 0x001f StartPlayerScript 0x08015384 -Call sub_0806D9A4 +Call 0x0806d9a5 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00000010 diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc index 815df56e..4f4b462f 100644 --- a/data/scripts/gUnk_080153EC.inc +++ b/data/scripts/gUnk_080153EC.inc @@ -17,45 +17,40 @@ _0807E5F8 0x00000880 WaitForSomething2 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x00900078 -TextboxNoOverlapFollowPos 0x1330, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1330 +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c -TextboxNoOverlapFollowPos 0x130d, 0x0002 +TextboxNoOverlapFollowPos +.short 0x130d +.short 0x0002 +@ End of 2 parameters _0807EA94 -TextboxNoOverlapFollowPos 0x130e, 0x000c +TextboxNoOverlapFollowPos +.short 0x130e +.short 0x000c +@ End of 2 parameters _0807EA94 -TextboxNoOverlapFollowPos 0x130f, 0x0002 +TextboxNoOverlapFollowPos +.short 0x130f +.short 0x0002 +@ End of 2 parameters _0807EA94 -TextboxNoOverlapFollowPos 0x1310, 0x000c +TextboxNoOverlapFollowPos +.short 0x1310 +.short 0x000c +@ End of 2 parameters _0807EA94 -CallWithArg sub_0805DDEC, 0x00000001 +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters _0807F0C8 0xffff, 0x0000 -_0807E5F8 0x00000800 -WaitForSomething2 0x00001000 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -_0807E5F8 0x00048000 -WaitForSomething2 0x00090000 -TextboxNoOverlapFollowPos 0x1311, 0x0002 -_0807EA94 -_0807E5F8 0x00008000 -WaitForSomething2 0x00010000 -_0807E5F8 0x00048000 -WaitForSomething2 0x00010000 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -TextboxNoOverlapFollowPos 0x1312, 0x000c -_0807EA94 -_0807E5F8 0x00000800 -WaitForSomething2 0x00001000 -SoundReq0x80100000 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -SetRoomFlag 0x0001 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc new file mode 100644 index 00000000..eaf0e8c8 --- /dev/null +++ b/data/scripts/gUnk_0801548E.inc @@ -0,0 +1,42 @@ +SCRIPT_START gUnk_0801548E +_0807E5F8 0x00000800 +WaitForSomething2 0x00001000 +SoundReq 0x0125 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +_0807E5F8 0x00048000 +WaitForSomething2 0x00090000 +TextboxNoOverlapFollowPos +.short 0x1311 +.short 0x0002 +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00008000 +WaitForSomething2 0x00010000 +_0807E5F8 0x00048000 +WaitForSomething2 0x00010000 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0001 +.short 0x0000 +@ End of 4 parameters +_0807F0C8 0x0000, 0x0000 +TextboxNoOverlapFollowPos +.short 0x1312 +.short 0x000c +@ End of 2 parameters +_0807EA94 +_0807E5F8 0x00000800 +WaitForSomething2 0x00001000 +SoundReq0x80100000 +_0807E778 0x0004 +DoFade5 +WaitFor_2 +SetRoomFlag 0x0001 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc index 2d3718a8..a979e11d 100644 --- a/data/scripts/gUnk_0801550C.inc +++ b/data/scripts/gUnk_0801550C.inc @@ -3,37 +3,72 @@ StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EB44 0x0000 -Call sub_0807F338 +Call 0x0807f339 StopScript -CallWithArg sub_0806AF60, 0x00000000 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters WaitForSomething2 0x00008000 -CallWithArg sub_0806AF60, 0x00000004 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EF80 0x000d _0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000004 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0004 +.short 0x0000 +@ End of 4 parameters _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 +CallWithArg +.short 0xaf61 +.short 0x0806 +.short 0x0000 +.short 0x0000 +@ End of 4 parameters _0807EF80 0x0010 Wait 0x0028 SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x000a SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 +CallWithArg +.short 0xfb29 +.short 0x0807 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x000a _0807EF80 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807E930 0x000d -Call sub_0807F2D4 +Call 0x0807f2d5 _0807E5F8 0x00010000 Wait 0x003c _0807EF80 0x0005 @@ -42,21 +77,3 @@ CheckRoomFlag 0x0001 JumpIfNot 0xfffa _0807EF80 0x0006 SCRIPT_END -.short 0x0c33 -.short 0x0020 -.short 0x0000 -.short 0x0850 -.short 0x0000 -.short 0x0831 -.short 0x0014 -.short 0x0c28 -.short 0x0040 -.short 0x0000 -.short 0x0815 -.short 0x0001 -.short 0x0805 -.short 0xfffa -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_080155F4.inc b/data/scripts/gUnk_080155F4.inc new file mode 100644 index 00000000..2e04b951 --- /dev/null +++ b/data/scripts/gUnk_080155F4.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_080155F4 +WaitForSomething2 0x00000020 +_0807E930 0x0000 +Wait 0x0014 +_0807E5F8 0x00000040 +CheckRoomFlag 0x0001 +JumpIfNot 0xfffa +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc index fa0553ff..87413bb9 100644 --- a/data/scripts/gUnk_08015618.inc +++ b/data/scripts/gUnk_08015618.inc @@ -2,21 +2,31 @@ SCRIPT_START gUnk_08015618 StartScript _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0040 -Call sub_08094B80 +Call 0x08094b81 StopScript WaitForSomething2 0x00000080 -CallWithArg sub_0805DDEC, 0x00000003 -Call sub_08094B0C +CallWithArg +.short 0xdded +.short 0x0805 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters +Call 0x08094b0d _0807EDD4 0x0078, 0x0068 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF3C 0xff80, 0x0000 -CallWithArg sub_0805DE18, 0x00000003 +CallWithArg +.short 0xde19 +.short 0x0805 +.short 0x0003 +.short 0x0000 +@ End of 4 parameters Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0001 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc index 5c1d6312..34160278 100644 --- a/data/scripts/gUnk_08015684.inc +++ b/data/scripts/gUnk_08015684.inc @@ -4,6 +4,48 @@ _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0017 -Call sub_0807F180 +Call 0x0807f181 StopScript -.short 0x0c33 +WaitForSomething2 0x00000800 +_0807EB44 0x0002 +_0807EF80 0x0017 +Wait 0x000a +_0807EB44 0x0004 +_0807EF80 0x0017 +_0807EB44 0x0004 +_0807EF80 0x001b +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +Wait 0x0078 +_0807EF80 0x0004 +Wait 0x0014 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +_0807EF80 0x0018 +Call 0x0807f2d5 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +_0807EB44 0x0004 +_0807EF80 0x0014 +CallWithArg +.short 0x545d +.short 0x0809 +.short 0x5754 +.short 0x0801 +@ End of 4 parameters +SoundReq 0x01c4 +Wait 0x0078 +_0807EF80 0x0016 +WaitForSomething2 0x00020000 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00001000 +WaitForSomething2 0x00000800 +Call 0x08066ca5 +_0807EF80 0x0008 +Wait 0x0078 +_0807E5F8 0x00001000 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_080156A0.inc b/data/scripts/gUnk_080156A0.inc deleted file mode 100644 index 32d56bef..00000000 --- a/data/scripts/gUnk_080156A0.inc +++ /dev/null @@ -1,91 +0,0 @@ -SCRIPT_START gUnk_080156A0 -.short 0x0800 -.short 0x0000 -.short 0x0861 -.short 0x0002 -.short 0x0879 -.short 0x0017 -.short 0x0831 -.short 0x000a -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0017 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x001b -.short 0x0c28 -.short 0x1000 -.short 0x0000 -.short 0x0c33 -.short 0x0800 -.short 0x0000 -.short 0x0831 -.short 0x0078 -.short 0x0879 -.short 0x0004 -.short 0x0831 -.short 0x0014 -.short 0x0c28 -.short 0x1000 -.short 0x0000 -.short 0x0c33 -.short 0x0800 -.short 0x0000 -.short 0x0879 -.short 0x0018 -.short 0x0c0b -.short 0xf2d5 -.short 0x0807 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x1000 -.short 0x0000 -.short 0x0c33 -.short 0x0800 -.short 0x0000 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0014 -.short 0x140c -.short 0x545d -.short 0x0809 -.short 0x5754 -.short 0x0801 -.short 0x087b -.short 0x01c4 -.short 0x0831 -.short 0x0078 -.short 0x0879 -.short 0x0016 -.short 0x0c33 -.short 0x0000 -.short 0x0002 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x1000 -.short 0x0000 -.short 0x0c33 -.short 0x0800 -.short 0x0000 -.short 0x0c0b -.short 0x6ca5 -.short 0x0806 -.short 0x0879 -.short 0x0008 -.short 0x0831 -.short 0x0078 -.short 0x0c28 -.short 0x1000 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/gUnk_08015754.inc index 8ec9bfa5..264d099f 100644 --- a/data/scripts/gUnk_08015754.inc +++ b/data/scripts/gUnk_08015754.inc @@ -2,14 +2,14 @@ SCRIPT_START gUnk_08015754 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call sub_08094B80 +Call 0x08094b81 StopScript Wait 0x0078 SoundReq 0x01c5 -Call sub_08094B6C +Call 0x08094b6d _0807EDD4 0x0078, 0x00b8 SoundReq 0x01c6 -Call sub_08094B80 +Call 0x08094b81 _0807E5F8 0x00020000 SetEntityNonPlanarMovement 0x0080 WaitForSomething2 0x00040000 diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc index 18f90a4e..32553e70 100644 --- a/data/scripts/gUnk_080157AC.inc +++ b/data/scripts/gUnk_080157AC.inc @@ -2,18 +2,18 @@ SCRIPT_START gUnk_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 +Call 0x0807f9a5 +Call 0x0807df29 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807F3F8 +Call 0x0807f9a5 +Call 0x0807df29 +Call 0x0807f3f9 Wait 0x003c _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -21,7 +21,7 @@ StartPlayerScript 0x080158f8 _0807F0B4 0x0001 SetEntityPositionRelative 0x02180248 CameraTargetEntity -Call sub_0807F5C0 +Call 0x0807f5c1 WaitForSomething2 0x00000010 _0807E5F8 0x00000008 WaitForSomething2 0x00000020 @@ -31,13 +31,16 @@ StartPlayerScript 0x08015918 WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos 0x1066, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1066 +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 -Call sub_08066F94 +Call 0x08066f95 _0807E5F8 0x00000008 CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -45,24 +48,30 @@ _0807EA94 ComparePlayerAction 0x001c JumpIf 0xfff8 _0807E864 -Call sub_0807DF28 +Call 0x0807df29 _0807F0B4 0x0002 SetEntityPositionRelative 0x02080248 CameraTargetEntity StartPlayerScript 0x08015938 WaitForSomething2 0x00000010 -TextboxNoOverlapFollowPos 0x106a, 0x000c +TextboxNoOverlapFollowPos +.short 0x106a +.short 0x000c +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 _0807E8E4_2 -TextboxNoOverlapFollowPos 0x1068, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1068 +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 SetLocalFlag 0x008b -Call sub_08066FB8 -Call sub_0807DF50 +Call 0x08066fb9 +Call 0x0807df51 _0807E878 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/gUnk_080158F8.inc index 82062ada..c762fb27 100644 --- a/data/scripts/gUnk_080158F8.inc +++ b/data/scripts/gUnk_080158F8.inc @@ -4,21 +4,5 @@ _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000010 -Call sub_080791BC +Call 0x080791bd SCRIPT_END -.short 0x0867 -.short 0x0100 -.short 0x0c73 -.short 0x0238 -.short 0x0228 -.short 0x0861 -.short 0x0002 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0010 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08015918.inc b/data/scripts/gUnk_08015918.inc new file mode 100644 index 00000000..f59b3bf5 --- /dev/null +++ b/data/scripts/gUnk_08015918.inc @@ -0,0 +1,8 @@ +SCRIPT_START gUnk_08015918 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0238, 0x0228 +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807E5F8 0x00000010 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/gUnk_08015938.inc index e2045e39..41b54823 100644 --- a/data/scripts/gUnk_08015938.inc +++ b/data/scripts/gUnk_08015938.inc @@ -4,5 +4,5 @@ _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000010 -Call sub_080791BC +Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc index f8f8c913..9f32f67d 100644 --- a/data/scripts/gUnk_08015958.inc +++ b/data/scripts/gUnk_08015958.inc @@ -3,11 +3,11 @@ StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x0008 _0807EF80 0x000b -Call sub_08066D04 +Call 0x08066d05 StopScript WaitForSomething2 0x00000001 StartScript -Call sub_08066D14 +Call 0x08066d15 MoveEntityToPlayer StopScript _0807EF80 0x0007 @@ -15,7 +15,10 @@ _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 _0807EF80 0x0000 -TextboxNoOverlapFollowPos 0x1011, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1011 +.short 0x0002 +@ End of 2 parameters _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x02180248 @@ -27,12 +30,12 @@ _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 -Call sub_0807F3C8 +Call 0x0807f3c9 SoundReq 0x0096 SetEntityNonPlanarMovement 0x0200 _0807ECC4 0x0008 _0807E930 0x0040 -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -56,7 +59,10 @@ JumpIf 0x0016 CheckEntityInteractType JumpIfNot 0xffee StopScript -TextboxNoOverlapFollowPos 0x1067, 0x0002 +TextboxNoOverlapFollowPos +.short 0x1067 +.short 0x0002 +@ End of 2 parameters _0807EA94 Jump 0xffe0 StopScript @@ -64,44 +70,8 @@ _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0000 WaitForSomething2 0x00000001 -Call sub_08066D4C +Call 0x08066d4d _0807E5F8 0x00000002 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0867 -.short 0x0100 -.short 0x0879 -.short 0x0001 -.short 0x086e -.short 0x0010 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 -.short 0x0867 -.short 0x0100 -.short 0x0879 -.short 0x0001 -.short 0x086f -.short 0x0010 -.short 0x0861 -.short 0x0002 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0004 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08015A7C.inc b/data/scripts/gUnk_08015A7C.inc new file mode 100644 index 00000000..9992b499 --- /dev/null +++ b/data/scripts/gUnk_08015A7C.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_08015A7C +SetEntityNonPlanarMovement 0x0100 +_0807EF80 0x0001 +_0807EC64 0x0010 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08015AA0.inc b/data/scripts/gUnk_08015AA0.inc new file mode 100644 index 00000000..631a369a --- /dev/null +++ b/data/scripts/gUnk_08015AA0.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_08015AA0 +SetEntityNonPlanarMovement 0x0100 +_0807EF80 0x0001 +_0807EC94 0x0010 +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +Call 0x080791bd +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/gUnk_08015AC4.inc index 754b2b65..ed28d651 100644 --- a/data/scripts/gUnk_08015AC4.inc +++ b/data/scripts/gUnk_08015AC4.inc @@ -15,7 +15,7 @@ _0807EF80 0x0000 WaitForSomething2 0x00000008 Wait 0x003c SoundReq 0x0072 -Call sub_08046078 +Call 0x08046079 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc index b2215622..3516af39 100644 --- a/data/scripts/gUnk_08015B34.inc +++ b/data/scripts/gUnk_08015B34.inc @@ -3,17 +3,25 @@ StopScript StartScript CheckLocalFlag 0x008b JumpIf 0x0040 -CallWithArg sub_0807F6B4, 0x00000318 +CallWithArg +.short 0xf6b5 +.short 0x0807 +.short 0x0318 +.short 0x0000 +@ End of 4 parameters JumpIfNot 0xffe8 StopScript _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x2506, 0x0002 +Call 0x0807f9a5 +Call 0x0807df29 +TextboxNoOverlapFollowPos +.short 0x2506 +.short 0x0002 +@ End of 2 parameters _0807EA94 StartPlayerScript 0x08015b84 WaitForSomething2 0x00000004 -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffb8 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/gUnk_08015B84.inc index 7893541f..78063ce9 100644 --- a/data/scripts/gUnk_08015B84.inc +++ b/data/scripts/gUnk_08015B84.inc @@ -5,6 +5,6 @@ _0807EC64 0x0010 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000004 -Call sub_080791BC +Call 0x080791bd SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/gUnk_08015BA8.inc index 7ee39edb..637c2636 100644 --- a/data/scripts/gUnk_08015BA8.inc +++ b/data/scripts/gUnk_08015BA8.inc @@ -8,7 +8,7 @@ SetEntityNonPlanarMovement 0x0200 StopScript Wait 0x000f _0807E8E4_2 -Call sub_0807F3F8 +Call 0x0807f3f9 Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/gUnk_08015BE8.inc index 17336802..cb007668 100644 --- a/data/scripts/gUnk_08015BE8.inc +++ b/data/scripts/gUnk_08015BE8.inc @@ -5,9 +5,9 @@ StopScript CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot 0xfff6 _0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807FBC4 +Call 0x0807f9a5 +Call 0x0807df29 +Call 0x0807fbc5 StartPlayerScript 0x08015c7c WaitForSomething2 0x00000100 CameraTargetPlayer @@ -15,10 +15,10 @@ _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 SoundReq0x80100000 -Call sub_08053BE8 +Call 0x08053be9 StartScript _0807E864 -Call sub_0807FBC4 +Call 0x0807fbc5 CameraTargetPlayer _0807E778 0x0100 DoFade4 @@ -31,53 +31,9 @@ SoundReq2 0xffff _0807EB28 0x131f _0807EA94 SetLocalFlag 0x009c -Call sub_0807FBCC -Call sub_0807DF50 +Call 0x0807fbcd +Call 0x0807df51 _0807E878 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0867 -.short 0x0080 -.short 0x0402 -.short 0x0879 -.short 0x0001 -.short 0x0c73 -.short 0x0168 -.short 0x0058 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x140c -.short 0xf239 -.short 0x0807 -.short 0x03c5 -.short 0x0000 -.short 0x0c0b -.short 0xf305 -.short 0x0807 -.short 0x0c5c -.short 0x1318 -.short 0x000c -.short 0x0459 -.short 0x140c -.short 0xf239 -.short 0x0807 -.short 0x03c9 -.short 0x0000 -.short 0x0c0b -.short 0xf305 -.short 0x0807 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0c28 -.short 0x0100 -.short 0x0000 -.short 0x0c0b -.short 0x91bd -.short 0x0807 -.short 0xffff diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc new file mode 100644 index 00000000..1eb7c52c --- /dev/null +++ b/data/scripts/gUnk_08015C7C.inc @@ -0,0 +1,32 @@ +SCRIPT_START gUnk_08015C7C +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x0168, 0x0058 +_0807EB44 0x0004 +_0807EF80 0x0000 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x03c5 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f305 +TextboxNoOverlapFollowPos +.short 0x1318 +.short 0x000c +@ End of 2 parameters +_0807EA94 +CallWithArg +.short 0xf239 +.short 0x0807 +.short 0x03c9 +.short 0x0000 +@ End of 4 parameters +Call 0x0807f305 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807E5F8 0x00000100 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/gUnk_08015E58.inc index 99d6da07..0a2f0969 100644 --- a/data/scripts/gUnk_08015E58.inc +++ b/data/scripts/gUnk_08015E58.inc @@ -6,24 +6,24 @@ _0807EF80 0x0000 _0807EF80 0x001d StopScript WaitForSomething2 0x00000010 -Call sub_08066C94 +Call 0x08066c95 Wait 0x00e9 _0807EF80 0x0007 _0807EF80 0x001e Wait 0x0014 _0807EB44 0x0000 _0807EF80 0x001c -Call sub_0807F2D4 +Call 0x0807f2d5 _0807EF80 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 -Call sub_08066CA4 +Call 0x08066ca5 _0807EF80 0x0008 Wait 0x00bc _0807E5F8 0x00000020 WaitForSomething2 0x00000010 SetEntityPositionRelative 0x00680088 -Call sub_08066C94 +Call 0x08066c95 Wait 0x00e8 _0807EF80 0x0007 _0807EF80 0x001e diff --git a/data/scripts/gUnk_08015F3C.inc b/data/scripts/gUnk_08015F3C.inc index 3e892d7d..1088fc63 100644 --- a/data/scripts/gUnk_08015F3C.inc +++ b/data/scripts/gUnk_08015F3C.inc @@ -16,21 +16,3 @@ WaitForSomething 0x00000400 _0807EF80 0x0006 SCRIPT_END .short 0x0000 -.short 0x0401 -.short 0x0861 -.short 0x0004 -.short 0x0879 -.short 0x0000 -.short 0x0402 -.short 0x0c32 -.short 0x0200 -.short 0x0000 -.short 0x0879 -.short 0x0005 -.short 0x0c32 -.short 0x0400 -.short 0x0000 -.short 0x0879 -.short 0x0006 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_08015F80.inc b/data/scripts/gUnk_08015F80.inc new file mode 100644 index 00000000..9c648777 --- /dev/null +++ b/data/scripts/gUnk_08015F80.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_08015F80 +StartScript +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +WaitForSomething 0x00000200 +_0807EF80 0x0005 +WaitForSomething 0x00000400 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/gUnk_08015FA4.inc index 83e92568..249baa2e 100644 --- a/data/scripts/gUnk_08015FA4.inc +++ b/data/scripts/gUnk_08015FA4.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08015FA4 StartScript _0807EF80 0x000a -Call sub_08066E38 +Call 0x08066e39 StopScript WaitForSomething 0x00000400 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc index 54c0124d..e7c74049 100644 --- a/data/scripts/gUnk_08015FC0.inc +++ b/data/scripts/gUnk_08015FC0.inc @@ -1,10 +1,15 @@ SCRIPT_START gUnk_08015FC0 StartScript -Call sub_0806DB84 +Call 0x0806db85 CheckKinstoneFused 0x0009 JumpIf 0x005a _0807EA88 0x0009 -CallWithArg sub_0806DA04, 0x00000007 +CallWithArg +.short 0xda05 +.short 0x0806 +.short 0x0007 +.short 0x0000 +@ End of 4 parameters _0807EF80 0x000a StopScript _0807EA4C @@ -12,14 +17,7 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0009 JumpIf 0x000e -Call sub_0807DF50 +Call 0x0807df51 _0807E878 Jump 0xffe8 _0807F0C8 0xffff, 0x0000 -_0807E5F8 0x00000003 -WaitForSomething2 0x0000000c -_0807F0C8 0x0000, 0x0000 -SoundReq 0x0072 -_0807EB28 0x0b1f -_0807EA94 -.byte 0xb diff --git a/data/scripts/gUnk_08016004.inc b/data/scripts/gUnk_08016004.inc new file mode 100644 index 00000000..5acc71d6 --- /dev/null +++ b/data/scripts/gUnk_08016004.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_08016004 +_0807E5F8 0x00000003 +WaitForSomething2 0x0000000c +_0807F0C8 0x0000, 0x0000 +SoundReq 0x0072 +_0807EB28 0x0b1f +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EF80 0x0006 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08016021.inc b/data/scripts/gUnk_08016021.inc deleted file mode 100644 index b5897a7b..00000000 --- a/data/scripts/gUnk_08016021.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_08016021 -.byte 0xc -.byte 0x51 -.byte 0xdf -.byte 0x7 -.byte 0x8 -.byte 0x44 -.byte 0x4 -.byte 0x79 -.byte 0x8 -.byte 0x6 -.byte 0x0 -.byte 0xff -.byte 0xff -.byte 0x0 -.byte 0x0 diff --git a/data/scripts/gUnk_08016030.inc b/data/scripts/gUnk_08016030.inc new file mode 100644 index 00000000..057c45e2 --- /dev/null +++ b/data/scripts/gUnk_08016030.inc @@ -0,0 +1,14 @@ +SCRIPT_START gUnk_08016030 +StartScript +CheckKinstoneFused 0x0009 +JumpIf 0x002a +StopScript +WaitForSomething2 0x00000001 +_0807EF80 0x0010 +Wait 0x003c +SetEntityNonPlanarMovement 0x0020 +_0807ECF4 0x0080 +Wait 0x001e +_0807EF80 0x0010 +_0807E5F8 0x00000008 +SCRIPT_END diff --git a/data/scripts/gUnk_08016062.inc b/data/scripts/gUnk_08016062.inc new file mode 100644 index 00000000..1dc40c78 --- /dev/null +++ b/data/scripts/gUnk_08016062.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_08016062 +SetEntityPosition 0xfff0, 0x0000 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0801606C.inc b/data/scripts/gUnk_0801606C.inc index 2565fec2..d194b9dc 100644 --- a/data/scripts/gUnk_0801606C.inc +++ b/data/scripts/gUnk_0801606C.inc @@ -12,8 +12,3 @@ Wait 0x001e _0807EF80 0x0010 _0807E5F8 0x00000004 SCRIPT_END -.short 0x0c6a -.short 0x0010 -.short 0x0000 -.short 0xffff -.short 0x0000 diff --git a/data/scripts/gUnk_0801609E.inc b/data/scripts/gUnk_0801609E.inc new file mode 100644 index 00000000..381e9ecb --- /dev/null +++ b/data/scripts/gUnk_0801609E.inc @@ -0,0 +1,4 @@ +SCRIPT_START gUnk_0801609E +SetEntityPosition 0x0010, 0x0000 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc index fe381115..2cfb616c 100644 --- a/data/scripts/gUnk_080160A8.inc +++ b/data/scripts/gUnk_080160A8.inc @@ -18,5 +18,187 @@ Jump 0xffd2 _0807E864 _0807EB74 StopScript -.short 0x0411 -.short 0x0805 +HasRoomItemForSale +JumpIfNot 0x0030 +TextboxNoOverlapFollow 0x2d07 +_0807EA94 +_0807E3E8 +JumpIfNot 0x003c +BuyItem 0x0000, 0x0000 +JumpIf 0x000c +TextboxNoOverlapFollow 0x2d0b +_0807EA94 +Jump 0x0028 +WaitPlayerAction8 +_0807EB8C +TextboxNoOverlapFollow 0x2d0d +_0807EA94 +Jump 0x001a +CheckKinstoneFused 0x0014 +JumpIfNot 0x000c +TextboxNoOverlapFollow 0x2d09 +_0807EA94 +Jump 0x0008 +TextboxNoOverlapFollow 0x2d01 +_0807EA94 +_0807E878 +_0807EB44 0x0004 +Jump 0xff76 +StartScript +Call 0x080787b5 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +GetInventoryValue 0x0025 +_0807EAF0 +.short 0x2d03 +.short 0x2d02 +.short 0x2d02 +.short 0x2d02 +@ End of 4 parameters +_0807E3E8 +JumpIfNot 0x002a +_0807E48C 0x0020 +JumpIf 0x000a +TextboxNoOverlapFollow 0x2d0c +Jump 0x001a +BuyItem 0x0025, 0x0000 +JumpIf 0x000a +TextboxNoOverlapFollow 0x2d0b +Jump 0x0008 +WaitPlayerAction8 +TextboxNoOverlapFollow 0x2d06 +_0807E878 +Jump 0xffb8 +StartScript +Call 0x080787b5 +StopScript +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +GetInventoryValue 0x0024 +_0807EAF0 +.short 0x2d05 +.short 0x2d04 +.short 0x2d04 +.short 0x2d04 +@ End of 4 parameters +_0807E3E8 +JumpIfNot 0x002e +_0807E48C 0x0020 +JumpIf 0x000a +TextboxNoOverlapFollow 0x2d0c +Jump 0x001e +BuyItem 0x0024, 0x0000 +JumpIf 0x000a +TextboxNoOverlapFollow 0x2d0b +Jump 0x000c +WaitPlayerAction8 +_0807EA94 +_0807EB8C +TextboxNoOverlap 0x2d06 +_0807E878 +Jump 0xffb4 +StartScript +Call 0x0807f349 +_0807EF80 0x000a +_0807EB44 0x0004 +_0807EF80 0x0000 +StopScript +Call 0x08068c29 +CheckEntityInteractType +JumpIfNot 0xfffc +_0807E864 +Call 0x0807df29 +_0807EB74 +Call 0x08068ca1 +JumpIf 0x0122 +Call 0x08068cfd +JumpIfNot 0x010c +Call 0x08068db9 +_0807EA94 +Call 0x08068dd1 +_0807EA94 +_0807E3E8 +JumpIfNot 0x010a +StartPlayerScript 0x0801635c +WaitForSomething2 0x00000001 +_0807EB74 +Call 0x08068c8d +JumpIf 0x000e +Call 0x08068de9 +_0807EA94 +Wait 0x001e +Call 0x08068e01 +_0807EA94 +_0807EF80 0x0001 +Call 0x0807f2d5 +Call 0x08068e91 +Call 0x08068c8d +JumpIf 0x009a +Call 0x08068f01 +Call 0x08068f15 +Call 0x08068bb5 +CallWithArg +.short 0xf245 +.short 0x0807 +.short 0x0001 +.short 0x0001 +@ End of 4 parameters +Call 0x08068b85 +Call 0x0807f2a9 +Call 0x08068bd1 +Wait 0x001e +Call 0x08068e19 +_0807EA94 +Call 0x08068eb5 +Call 0x0807df51 +_0807E878 +StopScript +StartScript +Call 0x08068ec5 +JumpIf 0x001e +CheckEntityInteractType +JumpIf 0x0006 +Jump 0xffea +StopScript +_0807E864 +Call 0x08068e79 +_0807EA94 +_0807E878 +Jump 0xffd8 +StopScript +_0807E888 +Call 0x0807f595 +Call 0x0807df29 +_0807E864 +SoundReq0x80100000 +SoundReq 0x00cd +Wait 0x003c +SoundReq2 0x005e +Call 0x08068f3d +Call 0x08068e31 +_0807EA94 +Call 0x08068c6d +WaitPlayerAction8 +_0807EA94 +Jump 0x0016 +Call 0x08068e61 +_0807EA94 +Jump 0x000a +Call 0x08068e49 +_0807EA94 +Call 0x0807df51 +_0807E878 +_0807EB44 0x0004 +_0807EF80 0x0000 +Jump 0xfea6 +.short 0x0000 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0078, 0x0050 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_080160EA.inc b/data/scripts/gUnk_080160EA.inc deleted file mode 100644 index 2628e3be..00000000 --- a/data/scripts/gUnk_080160EA.inc +++ /dev/null @@ -1,42 +0,0 @@ -SCRIPT_START gUnk_080160EA -.short 0x0030 -.short 0x085a -.short 0x2d07 -.short 0x0459 -.short 0x041c -.short 0x0805 -.short 0x003c -.short 0x0c1e -.short 0x0000 -.short 0x0000 -.short 0x0804 -.short 0x000c -.short 0x085a -.short 0x2d0b -.short 0x0459 -.short 0x0803 -.short 0x0028 -.short 0x0434 -.short 0x0464 -.short 0x085a -.short 0x2d0d -.short 0x0459 -.short 0x0803 -.short 0x001a -.short 0x081d -.short 0x0014 -.short 0x0805 -.short 0x000c -.short 0x085a -.short 0x2d09 -.short 0x0459 -.short 0x0803 -.short 0x0008 -.short 0x085a -.short 0x2d01 -.short 0x0459 -.short 0x0444 -.short 0x0861 -.short 0x0004 -.short 0x0803 -.short 0xff76 diff --git a/data/scripts/gUnk_0801613C.inc b/data/scripts/gUnk_0801613C.inc deleted file mode 100644 index c1e74466..00000000 --- a/data/scripts/gUnk_0801613C.inc +++ /dev/null @@ -1,39 +0,0 @@ -SCRIPT_START gUnk_0801613C -StartScript -Call sub_080787B4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -GetInventoryValue 0x0025 -.short 0x145d -.short 0x2d03 -.short 0x2d02 -.short 0x2d02 -.short 0x2d02 -.short 0x041c -.short 0x0805 -.short 0x002a -.short 0x081f -.short 0x0020 -.short 0x0804 -.short 0x000a -.short 0x085a -.short 0x2d0c -.short 0x0803 -.short 0x001a -.short 0x0c1e -.short 0x0025 -.short 0x0000 -.short 0x0804 -.short 0x000a -.short 0x085a -.short 0x2d0b -.short 0x0803 -.short 0x0008 -.short 0x0434 -.short 0x085a -.short 0x2d06 -.short 0x0444 -.short 0x0803 -.short 0xffb8 diff --git a/data/scripts/gUnk_08016190.inc b/data/scripts/gUnk_08016190.inc deleted file mode 100644 index abab1801..00000000 --- a/data/scripts/gUnk_08016190.inc +++ /dev/null @@ -1,41 +0,0 @@ -SCRIPT_START gUnk_08016190 -StartScript -Call sub_080787B4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -GetInventoryValue 0x0024 -.short 0x145d -.short 0x2d05 -.short 0x2d04 -.short 0x2d04 -.short 0x2d04 -.short 0x041c -.short 0x0805 -.short 0x002e -.short 0x081f -.short 0x0020 -.short 0x0804 -.short 0x000a -.short 0x085a -.short 0x2d0c -.short 0x0803 -.short 0x001e -.short 0x0c1e -.short 0x0024 -.short 0x0000 -.short 0x0804 -.short 0x000a -.short 0x085a -.short 0x2d0b -.short 0x0803 -.short 0x000c -.short 0x0434 -.short 0x0459 -.short 0x0464 -.short 0x085b -.short 0x2d06 -.short 0x0444 -.short 0x0803 -.short 0xffb4 diff --git a/data/scripts/gUnk_080161E8.inc b/data/scripts/gUnk_080161E8.inc deleted file mode 100644 index 665e9e1b..00000000 --- a/data/scripts/gUnk_080161E8.inc +++ /dev/null @@ -1,91 +0,0 @@ -SCRIPT_START gUnk_080161E8 -StartScript -Call sub_0807F348 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -Call sub_08068C28 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -Call sub_08068CA0 -JumpIf 0x0122 -Call sub_08068CFC -JumpIfNot 0x010c -Call sub_08068DB8 -_0807EA94 -Call sub_08068DD0 -_0807EA94 -_0807E3E8 -JumpIfNot 0x010a -StartPlayerScript 0x0801635c -WaitForSomething2 0x00000001 -_0807EB74 -Call sub_08068C8C -JumpIf 0x000e -Call sub_08068DE8 -_0807EA94 -Wait 0x001e -Call sub_08068E00 -_0807EA94 -_0807EF80 0x0001 -Call sub_0807F2D4 -Call sub_08068E90 -Call sub_08068C8C -JumpIf 0x009a -Call sub_08068F00 -Call sub_08068F14 -Call sub_08068BB4 -CallWithArg sub_0807F244, 0x00010001 -Call sub_08068B84 -Call sub_0807F2A8 -Call sub_08068BD0 -Wait 0x001e -Call sub_08068E18 -_0807EA94 -Call sub_08068EB4 -Call sub_0807DF50 -_0807E878 -StopScript -StartScript -Call sub_08068EC4 -JumpIf 0x001e -CheckEntityInteractType -JumpIf 0x0006 -Jump 0xffea -StopScript -_0807E864 -Call sub_08068E78 -_0807EA94 -_0807E878 -Jump 0xffd8 -StopScript -_0807E888 -Call sub_0807F594 -Call sub_0807DF28 -_0807E864 -SoundReq0x80100000 -SoundReq 0x00cd -Wait 0x003c -SoundReq2 0x005e -Call sub_08068F3C -Call sub_08068E30 -_0807EA94 -Call sub_08068C6C -WaitPlayerAction8 -_0807EA94 -Jump 0x0016 -Call sub_08068E60 -_0807EA94 -Jump 0x000a -Call sub_08068E48 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xfea6 -.short 0x0000 diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc new file mode 100644 index 00000000..5301fefc --- /dev/null +++ b/data/scripts/gUnk_0801637C.inc @@ -0,0 +1,69 @@ +SCRIPT_START gUnk_0801637C +.short 0xb500 +.short 0xf08c +.short 0xfb1d +.short 0xbd00 +StartScript +StopScript +Jump 0xfffa +JumpIf 0xfff6 +JumpIfNot 0xfff2 +_0807E078 +.short 0xffee +.short 0xffec +@ End of 2 parameters +JumpAbsolute 0x08016384 +JumpAbsoluteIf 0x08016384 +JumpAbsoluteIfNot 0x08016384 +_0807E0E0 0x08016384, 0x08016384 +Call 0x08016384 +CallWithArg +.short 0x6384 +.short 0x0801 +.short 0x5678 +.short 0x1234 +@ End of 4 parameters +LoadRoomEntityList 0x08016384 +TestBit 0x00000001 +CheckInventory1 0x0001 +CheckInventory2 0x0001 +HasRoomItemForSale +CheckLocalFlag 0x0067 +CheckLocalFlagByOffset 0x0100, 0x006b +CheckGlobalFlag 0x0013 +CheckRoomFlag 0x0000 +CheckPlayerInRegion 0x0000, 0x0000, 0x0000 +CheckPlayerInRegion2 0x0000 +CheckEntityInteractType +_0807E30C +HasRupees 0x00c8 +_0807E3E8 +CheckKinstoneFused 0x0001 +BuyItem 0x006c, 0x0000 +_0807E48C 0x0020 +_0807E4CC 0x00000000 +_0807E4EC 0x00000000 +_0807E514 0x00000000 +CheckPlayerFlags 0x00000080 +_0807E564 +EntityHasHeight +ComparePlayerAction 0x0001 +ComparePlayerAnimationState 0x0004 +_0807E5F8 0x00000001 +_0807E610 0x00000002 +SetLocalFlag 0x0067 +SetLocalFlagByOffset 0x0100, 0x0001 +ClearLocalFlag 0x0067 +SetGlobalFlag 0x0013 +ClearGlobalFlag 0x0013 +SetRoomFlag 0x0000 +ClearRoomFlag 0x0000 +Wait 0x001e +WaitForSomething 0x00000001 +WaitForSomething2 0x00000002 +WaitPlayerAction8 +WaitForPlayerAction0x17 +WaitFor_1 +WaitFor_2 +_0807E778 0x0004 +_0807E788 0x0000ffff diff --git a/data/scripts/gUnk_0801637D.inc b/data/scripts/gUnk_0801637D.inc deleted file mode 100644 index 4575f8da..00000000 --- a/data/scripts/gUnk_0801637D.inc +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_START gUnk_0801637D -.byte 0xb5 -.byte 0x8c -.byte 0xf0 -.byte 0x1d -.byte 0xfb -.byte 0x0 -.byte 0xbd diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc deleted file mode 100644 index 8cfd7cdd..00000000 --- a/data/scripts/gUnk_08016384.inc +++ /dev/null @@ -1,64 +0,0 @@ -SCRIPT_START gUnk_08016384 -StartScript -StopScript -Jump 0xfffa -JumpIf 0xfff6 -JumpIfNot 0xfff2 -.short 0x0c06 -.short 0xffee -.short 0xffec -.short 0x0c07 -.short 0x6384 -.short 0x0801 -.short 0x0c08 -.short 0x6384 -.short 0x0801 -.short 0x0c09 -.short 0x6384 -.short 0x0801 -.short 0x140a -.short 0x6384 -.short 0x0801 -.short 0x6384 -.short 0x0801 -.short 0x0c0b -.short 0x6384 -.short 0x0801 -.short 0x140c -.short 0x6384 -.short 0x0801 -.short 0x5678 -.short 0x1234 -.short 0x0c0d -.short 0x6384 -.short 0x0801 -.short 0x0c0e -.short 0x0001 -.short 0x0000 -.short 0x080f -.short 0x0001 -.short 0x0810 -.short 0x0001 -.short 0x0411 -.short 0x0812 -.short 0x0067 -.short 0x0c13 -.short 0x0100 -.short 0x006b -.short 0x0814 -.short 0x0013 -.short 0x0815 -.short 0x0000 -.short 0x1016 -.short 0x0000 -.short 0x0000 -.short 0x0000 -.short 0x0817 -.short 0x0000 -.short 0x0418 -.short 0x0419 -.short 0x081a -.short 0x00c8 -.short 0x041c -.short 0x081d -.short 0x0001 diff --git a/data/scripts/gUnk_08016408.inc b/data/scripts/gUnk_08016408.inc deleted file mode 100644 index 6136f52b..00000000 --- a/data/scripts/gUnk_08016408.inc +++ /dev/null @@ -1,242 +0,0 @@ -SCRIPT_START gUnk_08016408 -BuyItem 0x006c, 0x0000 -_0807E48C 0x0020 -_0807E4CC 0x00000000 -_0807E4EC 0x00000000 -.short 0x0c22 -.short 0x0000 -.short 0x0000 -.short 0x0c23 -.short 0x0080 -.short 0x0000 -.short 0x0424 -.short 0x0425 -.short 0x0826 -.short 0x0001 -.short 0x0827 -.short 0x0004 -.short 0x0c28 -.short 0x0001 -.short 0x0000 -.short 0x0c29 -.short 0x0002 -.short 0x0000 -.short 0x082a -.short 0x0067 -.short 0x0c2b -.short 0x0100 -.short 0x0001 -.short 0x082c -.short 0x0067 -.short 0x082d -.short 0x0013 -.short 0x082e -.short 0x0013 -.short 0x082f -.short 0x0000 -.short 0x0830 -.short 0x0000 -.short 0x0831 -.short 0x001e -.short 0x0c32 -.short 0x0001 -.short 0x0000 -.short 0x0c33 -.short 0x0002 -.short 0x0000 -.short 0x0434 -.short 0x0435 -.short 0x0436 -.short 0x0437 -.short 0x0838 -.short 0x0004 -.short 0x0c39 -.short 0xffff -.short 0x0000 -.short 0x043a -.short 0x083b -.short 0x0080 -.short 0x043c -.short 0x043d -.short 0x043e -.short 0x043f -.short 0x0c40 -.short 0x0000 -.short 0x0000 -.short 0x0c41 -.short 0x0000 -.short 0x0000 -.short 0x0442 -.short 0x0443 -.short 0x0444 -.short 0x0445 -.short 0x0c46 -.short 0x5408 -.short 0x0000 -.short 0x0c47 -.short 0x6384 -.short 0x0801 -.short 0x0848 -.short 0x03a0 -.short 0x0449 -.short 0x044a -.short 0x044b -.short 0x044c -.short 0x084d -.short 0x0004 -.short 0x0c4e -.short 0x0000 -.short 0x0000 -.short 0x044f -.short 0x0850 -.short 0x0000 -.short 0x0451 -.short 0x0852 -.short 0x0600 -.short 0x0453 -.short 0x0454 -.short 0x0855 -.short 0x0000 -.short 0x0858 -.short 0x0001 -.short 0x0459 -.short 0x085a -.short 0x0601 -.short 0x085b -.short 0x0601 -.short 0x085c -.short 0x0601 -.short 0x105d -.short 0x0601 -.short 0x0602 -.short 0x0603 -.short 0x045e -.short 0x085f -.short 0x0602 -.short 0x0460 -.short 0x0861 -.short 0x0000 -.short 0x0c62 -.short 0x0000 -.short 0x0000 -.short 0x0463 -.short 0x0464 -.short 0x0865 -.short 0x0000 -.short 0x0866 -.short 0x0000 -.short 0x0867 -.short 0x0100 -.short 0x0c68 -.short 0x8000 -.short 0x0001 -.short 0x0c69 -.short 0x0000 -.short 0x0000 -.short 0x046b -.short 0x046c -.short 0x086d -.short 0x0010 -.short 0x086e -.short 0x0020 -.short 0x086f -.short 0x0030 -.short 0x0870 -.short 0x0040 -.short 0x0871 -.short 0x0050 -.short 0x1072 -.short 0x0000 -.short 0x0000 -.short 0x0000 -.short 0x0c73 -.short 0x0000 -.short 0x0000 -.short 0x0c74 -.short 0x0000 -.short 0x0000 -.short 0x0475 -.short 0x0476 -.short 0x0c77 -.short 0xfff0 -.short 0x0014 -.short 0x0879 -.short 0x0000 -.short 0x087a -.short 0x0001 -.short 0x087b -.short 0x0074 -.short 0x087c -.short 0x001d -.short 0x0c7d -.short 0x0074 -.short 0x0000 -.short 0x047e -.short 0x087f -.short 0xff38 -.short 0x0880 -.short 0x0010 -.short 0x0881 -.short 0x0008 -.short 0x0883 -.short 0x0001 -.short 0x0882 -.short 0x0001 -.short 0x0884 -.short 0x0001 -.short 0x0c85 -.short 0x0001 -.short 0x0002 -.short 0x0886 -.short 0x0001 -.short 0x0487 -.short 0x0488 -.short 0x0889 -.short 0x0007 -.short 0x0c8a -.short 0x003c -.short 0x0003 -.short 0xffff -.short 0x0000 -.short 0x0401 -.short 0x0879 -.short 0x000a -.short 0x0861 -.short 0x0004 -.short 0x0453 -.short 0x0402 -.short 0x0852 -.short 0x0601 -.short 0x0803 -.short 0xfffa -.short 0x0000 -.short 0x0831 -.short 0x001e -.short 0x0817 -.short 0x2020 -.short 0x0805 -.short 0xfff6 -.short 0x0879 -.short 0x0003 -.short 0x0c0b -.short 0x637d -.short 0x0801 -.short 0x0803 -.short 0xffe8 -.short 0x0000 -.short 0x0831 -.short 0x001e -.short 0x0817 -.short 0x2020 -.short 0x0c09 -.short 0x65d8 -.short 0x0801 -.short 0x0879 -.short 0x0003 -.short 0x0c0b -.short 0x637d -.short 0x0801 -.short 0x0c07 -.short 0x65d8 -.short 0x0801 -.short 0x0000 diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc new file mode 100644 index 00000000..7f1d0813 --- /dev/null +++ b/data/scripts/gUnk_08016482.inc @@ -0,0 +1,86 @@ +SCRIPT_START gUnk_08016482 +_0807E79C +ScriptCommandNop2 0x0080 +DoFade4 +DoFade5 +DoFade6 +DoFade7 +_0807E800 0x00000000 +_0807E80C 0x00000000 +_0807E858 +_0807E864 +_0807E878 +_0807E888 +SetPlayerAction 0x00005408 +StartPlayerScript 0x08016384 +_0807E8D4 0x03a0 +_0807E8E4_0 +_0807E8E4_1 +_0807E8E4_2 +_0807E8E4_3 +_0807E908 0x0004 +_0807E914 0x00000000 +_0807E924 +_0807E930 0x0000 +_0807E944 +_0807E974 0x0600 +_0807E9D4 +_0807E9DC +_0807E9E4 0x0000 +_0807EA88 0x0001 +_0807EA94 +TextboxNoOverlapFollow 0x0601 +TextboxNoOverlap 0x0601 +TextboxNoOverlapFollowPos +.short 0x0601 +@ End of 1 parameters +_0807EAF0 +.short 0x0601 +.short 0x0602 +.short 0x0603 +@ End of 3 parameters +TextboxNoOverlapVar +_0807EB28 0x0602 +_0807EB38 +_0807EB44 0x0000 +_0807EB4C 0x0000, 0x0000 +_0807EB74 +_0807EB8C +SetEntityDirection 0x0000 +SetEntityDirectionWithAnimationState 0x0000 +SetEntityNonPlanarMovement 0x0100 +SetEntity0x20 0x00018000 +SetEntityPositionRelative 0x00000000 +MoveEntityToPlayer +ScriptCommandNop3 +_0807EC1C 0x0010 +_0807EC64 0x0020 +_0807EC94 0x0030 +_0807ECC4 0x0040 +_0807ECF4 0x0050 +_0807ED24 0x0000, 0x0000, 0x0000 +_0807EDD4 0x0000, 0x0000 +_0807EE04 0x0000, 0x0000 +_0807EE30 +_0807EEB4 +_0807EEF4 0xfff0, 0x0014 +_0807EF80 0x0000 +_0807EF90 0x0001 +SoundReq 0x0074 +SoundReq2 0x001d +SoundReq3 0x00000074 +SoundReq0x80100000 +ModRupees 0xff38 +ModHealth 0x0010 +IncreaseMaxHealth 0x0008 +_0807F050 0x0001 +_0807F034 0x0001 +GetInventoryValue 0x0001 +_0807F078 0x0001, 0x0002 +_0807F088 0x0001 +CameraTargetEntity +CameraTargetPlayer +_0807F0B4 0x0007 +_0807F0C8 0x003c, 0x0003 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_080165A4.inc b/data/scripts/gUnk_080165A4.inc new file mode 100644 index 00000000..fd0d7ded --- /dev/null +++ b/data/scripts/gUnk_080165A4.inc @@ -0,0 +1,254 @@ +SCRIPT_START gUnk_080165A4 +StartScript +_0807EF80 0x000a +_0807EB44 0x0004 +_0807E9D4 +StopScript +_0807E974 0x0601 +Jump 0xfffa +.short 0x0000 +Wait 0x001e +CheckPlayerInRegion2 0x2020 +JumpIfNot 0xfff6 +_0807EF80 0x0003 +Call 0x0801637d +Jump 0xffe8 +.short 0x0000 +Wait 0x001e +CheckPlayerInRegion2 0x2020 +JumpAbsoluteIfNot 0x080165d8 +_0807EF80 0x0003 +Call 0x0801637d +JumpAbsolute 0x080165d8 +.short 0x0000 +StartScript +_0807E9D4 +StopScript +_0807E30C +JumpIfNot 0xfffc +TextboxNoOverlapFollow 0x0601 +Jump 0xfff4 +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +TextboxNoOverlapFollow 0x0602 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffee +.short 0x0000 +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +_0807EB28 0x0603 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffee +.short 0x0000 +SetEntityNonPlanarMovement 0x0100 +_0807ECF4 0x0030 +Wait 0x0008 +_0807ECC4 0x0030 +Wait 0x0008 +_0807EC94 0x0030 +Wait 0x0008 +_0807EC64 0x0030 +Wait 0x0008 +Jump 0xffde +_0807ED24 0x0055, 0x0039, 0x00b4 +Wait 0x0008 +_0807ED24 0x0075, 0x0076, 0x003c +Wait 0x0008 +_0807ED24 0x0105, 0x006c, 0x0078 +Wait 0x0008 +_0807ED24 0x018e, 0x007a, 0x0078 +Wait 0x0008 +_0807ED24 0x0173, 0x0023, 0x003c +Wait 0x0008 +_0807ED24 0x00d8, 0x003f, 0x003c +Wait 0x0008 +Jump 0xffb6 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0055, 0x0039 +Wait 0x0008 +_0807EDD4 0x0075, 0x0076 +Wait 0x0008 +_0807EDD4 0x0105, 0x006c +Wait 0x0008 +_0807EDD4 0x018e, 0x007a +Wait 0x0008 +_0807EDD4 0x0173, 0x0023 +Wait 0x0008 +_0807EDD4 0x00d8, 0x003f +Wait 0x0008 +Jump 0xffc2 +SetEntityNonPlanarMovement 0x0100 +_0807EC94 0x0030 +_0807E5F8 0x00000002 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000001 +_0807E610 0x00000001 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +WaitForSomething 0x00000001 +_0807E610 0x00000001 +_0807ECF4 0x0030 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +Wait 0x001e +_0807E5F8 0x00000006 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Wait 0x003c +Jump 0xff6a +SetEntityNonPlanarMovement 0x0100 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EC94 0x0030 +_0807E5F8 0x00000004 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807ECF4 0x0030 +_0807E5F8 0x00000001 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Jump 0xff5a +SetEntityNonPlanarMovement 0x0100 +WaitForSomething 0x00000004 +_0807E610 0x00000004 +_0807EC94 0x0030 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +Wait 0x001e +_0807E5F8 0x00000003 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Wait 0x003c +_0807ECF4 0x0030 +_0807E5F8 0x00000002 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000004 +_0807E610 0x00000004 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Jump 0xff6a +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +Wait 0x000f +_0807E878 +Jump 0xfff4 +StartScript +Call 0x08064ea5 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call 0x08064f29 +_0807EA94 +JumpIfNot 0x0008 +_0807F034 0x003d +WaitPlayerAction8 +_0807E878 +SetGlobalFlag 0x005c +Jump 0xffdc +StartScript +_0807E9D4 +_0807EB44 0x0000 +_0807EF80 0x000a +StopScript +_0807E944 +_0807E864 +Wait 0x0018 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffea +.short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0000 +_0807EF80 0x000a +_0807E930 0x0000 +StopScript +_0807E944 +_0807E864 +Wait 0x0018 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffea +.short 0x0000 diff --git a/data/scripts/gUnk_080165F8.inc b/data/scripts/gUnk_080165F8.inc deleted file mode 100644 index bb0186f4..00000000 --- a/data/scripts/gUnk_080165F8.inc +++ /dev/null @@ -1,9 +0,0 @@ -SCRIPT_START gUnk_080165F8 -StartScript -_0807E9D4 -StopScript -_0807E30C -JumpIfNot 0xfffc -TextboxNoOverlapFollow 0x0601 -.short 0x0803 -.short 0xfff4 diff --git a/data/scripts/gUnk_0801660C.inc b/data/scripts/gUnk_0801660C.inc deleted file mode 100644 index 69212fa6..00000000 --- a/data/scripts/gUnk_0801660C.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_0801660C -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -TextboxNoOverlapFollow 0x0602 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 diff --git a/data/scripts/gUnk_08016628.inc b/data/scripts/gUnk_08016628.inc deleted file mode 100644 index 06d5766d..00000000 --- a/data/scripts/gUnk_08016628.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08016628 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -_0807EB28 0x0603 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 diff --git a/data/scripts/gUnk_08016644.inc b/data/scripts/gUnk_08016644.inc deleted file mode 100644 index cd23679e..00000000 --- a/data/scripts/gUnk_08016644.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START gUnk_08016644 -SetEntityNonPlanarMovement 0x0100 -_0807ECF4 0x0030 -Wait 0x0008 -_0807ECC4 0x0030 -Wait 0x0008 -_0807EC94 0x0030 -Wait 0x0008 -_0807EC64 0x0030 -Wait 0x0008 -.short 0x0803 -.short 0xffde diff --git a/data/scripts/gUnk_0801666C.inc b/data/scripts/gUnk_0801666C.inc deleted file mode 100644 index f8ee617f..00000000 --- a/data/scripts/gUnk_0801666C.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START gUnk_0801666C -_0807ED24 0x0055, 0x0039, 0x00b4 -Wait 0x0008 -_0807ED24 0x0075, 0x0076, 0x003c -Wait 0x0008 -_0807ED24 0x0105, 0x006c, 0x0078 -Wait 0x0008 -_0807ED24 0x018e, 0x007a, 0x0078 -Wait 0x0008 -_0807ED24 0x0173, 0x0023, 0x003c -Wait 0x0008 -_0807ED24 0x00d8, 0x003f, 0x003c -Wait 0x0008 -.short 0x0803 -.short 0xffb6 diff --git a/data/scripts/gUnk_080166B8.inc b/data/scripts/gUnk_080166B8.inc deleted file mode 100644 index d6159306..00000000 --- a/data/scripts/gUnk_080166B8.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCRIPT_START gUnk_080166B8 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0055, 0x0039 -Wait 0x0008 -_0807EDD4 0x0075, 0x0076 -Wait 0x0008 -_0807EDD4 0x0105, 0x006c -Wait 0x0008 -_0807EDD4 0x018e, 0x007a -Wait 0x0008 -_0807EDD4 0x0173, 0x0023 -Wait 0x0008 -_0807EDD4 0x00d8, 0x003f -Wait 0x0008 -.short 0x0803 -.short 0xffc2 diff --git a/data/scripts/gUnk_080166FC.inc b/data/scripts/gUnk_080166FC.inc deleted file mode 100644 index d3ca9789..00000000 --- a/data/scripts/gUnk_080166FC.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_080166FC -SetEntityNonPlanarMovement 0x0100 -_0807EC94 0x0030 -_0807E5F8 0x00000002 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000001 -_0807E610 0x00000001 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -WaitForSomething 0x00000001 -_0807E610 0x00000001 -_0807ECF4 0x0030 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000006 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Wait 0x003c -.short 0x0803 -.short 0xff6a diff --git a/data/scripts/gUnk_08016798.inc b/data/scripts/gUnk_08016798.inc deleted file mode 100644 index 0d8c3228..00000000 --- a/data/scripts/gUnk_08016798.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START gUnk_08016798 -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EC94 0x0030 -_0807E5F8 0x00000004 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807ECF4 0x0030 -_0807E5F8 0x00000001 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -.short 0x0803 -.short 0xff5a diff --git a/data/scripts/gUnk_08016844.inc b/data/scripts/gUnk_08016844.inc deleted file mode 100644 index 90ee22ad..00000000 --- a/data/scripts/gUnk_08016844.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START gUnk_08016844 -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EC94 0x0030 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000003 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Wait 0x003c -_0807ECF4 0x0030 -_0807E5F8 0x00000002 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -.short 0x0803 -.short 0xff6a diff --git a/data/scripts/gUnk_080168E0.inc b/data/scripts/gUnk_080168E0.inc deleted file mode 100644 index 11df18ef..00000000 --- a/data/scripts/gUnk_080168E0.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START gUnk_080168E0 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -Wait 0x000f -_0807E878 -.short 0x0803 -.short 0xfff4 diff --git a/data/scripts/gUnk_080168F4.inc b/data/scripts/gUnk_080168F4.inc deleted file mode 100644 index 5e573261..00000000 --- a/data/scripts/gUnk_080168F4.inc +++ /dev/null @@ -1,55 +0,0 @@ -SCRIPT_START gUnk_080168F4 -StartScript -Call sub_08064EA4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08064F28 -_0807EA94 -JumpIfNot 0x0008 -_0807F034 0x003d -WaitPlayerAction8 -_0807E878 -SetGlobalFlag 0x005c -Jump 0xffdc -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -Wait 0x0018 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 -.short 0x0401 -.short 0x0453 -.short 0x0861 -.short 0x0000 -.short 0x0879 -.short 0x000a -.short 0x0850 -.short 0x0000 -.short 0x0402 -.short 0x0451 -.short 0x0443 -.short 0x0831 -.short 0x0018 -.short 0x085a -.short 0x0a01 -.short 0x0459 -.short 0x0831 -.short 0x000f -.short 0x0444 -.short 0x0803 -.short 0xffea -.short 0x0000 diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py index e0850f13..5d184b28 100644 --- a/tools/script_disassembler/incbin_parser.py +++ b/tools/script_disassembler/incbin_parser.py @@ -4,49 +4,73 @@ TMC_FOLDER='../..' import subprocess import sys -from script_disassembler import disassemble_script +from script_disassembler import disassemble_script, generate_macros -def main(): +ROM_OFFSET=0x08000000 +SCRIPTS_START=0x08008B5C +SCRIPTS_END=0x08016984 +# cat data/scripts.s | grep @ | cut -d " " -f 3 | sed -e 's/^/0x/' | sed -e 's/\\n/, /g' > labels.txt + +def read_baserom(): # read baserom data with open(f'{TMC_FOLDER}/baserom.gba', 'rb') as baserom: - baserom_data = bytearray(baserom.read()) + return bytearray(baserom.read()) - # read scripts.s with incbins - with open(f'{TMC_FOLDER}/data/scripts.s', 'r') as scripts: +def get_label(addr): + return hex(addr).upper().replace('0X', 'gUnk_0') - while True: - line = scripts.readline() +def main(): + baserom_data = read_baserom() - if not line: - # end of file - break + script_start = SCRIPTS_START-ROM_OFFSET - if ':: @' in line: # this might be a label - incbin_line = scripts.readline() + scripts = ''' .include "asm/macros.inc" + .include "constants/constants.inc" - if '.incbin' in incbin_line: # found a label with incbin - label = line.split('::')[0] - (_, start, end) = incbin_line.split(',') - start = int(start, 16) - end = int(end, 16) - - # read data from rom - data = baserom_data[start:start+end] + .include "asm/macros/scripts.inc" - stdout = sys.stdout - with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out: - sys.stdout = out - print(f'SCRIPT_START {label}') - disassemble_script(data) - sys.stdout = stdout + .syntax unified - # print new include label - print(f'.include "data/scripts/{label}.inc"') - else: - print(line, end='') - print(incbin_line, end='') - else: - print(line, end='') + .text + + ''' + + while script_start < SCRIPTS_END-ROM_OFFSET: + label = get_label(script_start+ROM_OFFSET) + print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...") + # find end of the script signified by 0xffff0000 + script_end = baserom_data.index(b'\xff\xff\x00\x00', script_start) + 4 + + if script_end > SCRIPTS_END-ROM_OFFSET: + script_end = SCRIPTS_END-ROM_OFFSET + + script_start+ROM_OFFSET + # read data from rom + data = baserom_data[script_start:script_end] + + + scripts += f' .include "data/scripts/{label}.inc"\n' + stdout = sys.stdout + with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out: + sys.stdout = out + print(f'SCRIPT_START {label}') + res = disassemble_script(data) + if res != 0: + # Script ended in the middle, need to create a new file + script_end = script_start + res + sys.stdout = stdout + + script_start = script_end + print('Writing scripts.s file...') + with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out: + out.write(scripts) + print('Generating asm macros...') + stdout = sys.stdout + with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out: + sys.stdout = out + generate_macros() + sys.stdout = stdout + print('\033[1;92mDone\033[0m\n') if __name__ == '__main__': main() \ No newline at end of file diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index 330d2a7d..ae8f3272 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -5,7 +5,7 @@ import struct # Input 'macros' to generate the macros for the script commands # Input the script bytes as hex to disassemble the script -# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/script.inc +# Build macros: echo "macros" | python script_disassembler.py > ~/git/tmc/github/asm/macros/scripts.inc @dataclass class Context: @@ -33,25 +33,29 @@ def get_pointer(barray): integers = struct.unpack('I', barray) return 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper() +def get_data_pointer(barray): + integers = struct.unpack('I', barray) + return 'gUnk_' + (struct.pack('>I', integers[0]-1).hex()).upper() + commands = [ - {'fun': 'ScriptCommandNop', 'params': ''}, + {'fun': 'ScriptCommandNop', 'params': 'v'}, # TODO one version with length 33??? {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'}, {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'}, {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'}, {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'}, {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'}, - {'fun': 'ScriptCommand_0807E078', 'params': 's'}, - {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'w','name': 'abs jump' }, - {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'w', 'name': 'abs jump if'}, - {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'w', 'name': 'abs jump if not'}, - {'fun': 'ScriptCommand_0807E0E0', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E078', 'params': 'v'}, + {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'd','name': 'abs jump' }, + {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'd', 'name': 'abs jump if'}, + {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'd', 'name': 'abs jump if not'}, + {'fun': 'ScriptCommand_0807E0E0', 'params': 'dd'}, {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call}, - {'fun': 'ScriptCommand_CallWithArg', 'params': 'pw'}, - {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'w'}, + {'fun': 'ScriptCommand_CallWithArg', 'params': 'pv'}, + {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'}, {'fun': 'ScriptCommand_TestBit', 'params': 'w'}, {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'}, {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'}, - {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': 's'}, + {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''}, {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'}, {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'}, {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'}, @@ -68,7 +72,7 @@ commands = [ {'fun': 'ScriptCommand_0807E48C', 'params': 's'}, {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'}, {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E51', 'params': 's'}, + {'fun': 'ScriptCommand_0807E514', 'params': 'w'}, {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'}, {'fun': 'ScriptCommand_0807E564', 'params': ''}, {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''}, @@ -100,12 +104,12 @@ commands = [ {'fun': 'ScriptCommand_DoFade7', 'params': ''}, {'fun': 'ScriptCommand_0807E800', 'params': 'w'}, {'fun': 'ScriptCommand_0807E80C', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E858', 'params': 's'}, + {'fun': 'ScriptCommand_0807E858', 'params': 'v'}, # TODO why are there both 0 and 1? {'fun': 'ScriptCommand_0807E864', 'params': ''}, {'fun': 'ScriptCommand_0807E878', 'params': ''}, {'fun': 'ScriptCommand_0807E888', 'params': ''}, {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'}, - {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'w'}, + {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'd'}, {'fun': 'ScriptCommand_0807E8D4', 'params': 's'}, {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate @@ -126,8 +130,8 @@ commands = [ {'fun': 'ScriptCommand_0807EA94', 'params': ''}, {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'}, {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'}, - {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EAF0', 'params': 'w'}, + {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': 'v'}, # TODO 1 or two + {'fun': 'ScriptCommand_0807EAF0', 'params': 'v'}, # TODO {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''}, {'fun': 'ScriptCommand_0807EB28', 'params': 's'}, {'fun': 'ScriptCommand_0807EB38', 'params': ''}, @@ -219,12 +223,30 @@ parameters = { 'expr': ' .word \w', 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) }, - 'pw': { - 'length': 4, - 'param': 'a,b', - 'expr': ' .word \\a\n .word \\b', - 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+10])[0] + 'd': { # Data pointer + 'length': 2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) }, + 'pv': { + 'length': -2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: '' + }, + 'dd': { + 'length': 4, + 'param': 'a, b', + 'expr': ' .word \\a\n .word \\b', + 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_data_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10]) + }, + 'v': { # variable parameter count (TODO why?) + 'length': -1, + 'param': '', + 'expr': '', + 'read': lambda ctx: '' + } } # Remove the ScriptCommand_ prefix for the asm macros @@ -234,31 +256,50 @@ def build_script_command(name: str): return '_' + name return name +def print_rest_bytes(ctx): + print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]])) + def ExecuteScriptCommandSet(ctx: Context): + # print(f'@{ctx.ptr}') print offsets to debug when manually inserting labels cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0] if cmd == 0: - return 0 + # this does not need to be the end of the script + print('.short 0x0000') + ctx.ptr += 2 + return 1 + if cmd == 0xffff: ctx.ptr += 2 print('SCRIPT_END') - return 0 + cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0] + if cmd == 0x0000: + # This is actually the end of the script + print('.short 0x0000') + ctx.ptr += 2 + return 2 + return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please - unk_06 = cmd >> 0xA - if unk_06 == 0: + commandSize = cmd >> 0xA + if commandSize == 0: + raise Exception(f'Zero commandSize') # TODO error return 0 - operationId = cmd & 0x3FF - if operationId >= len(commands): + commandId = cmd & 0x3FF + if commandId >= len(commands): + #print_rest_bytes(ctx) + print(f'.short {u16_to_hex(cmd)}') + ctx.ptr += 2 + #raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}') # TODO error - return 0 - command = commands[operationId] - param_length = unk_06 - 1 - if unk_06 > 1: - if ctx.ptr+2*unk_06 >= len(ctx.data): - # TODO raise Exception(f'Not enough data to fetch {unk_06-1} params') + return 1 + command = commands[commandId] + param_length = commandSize - 1 + if commandSize > 1: + if ctx.ptr+2*commandSize > len(ctx.data): + raise Exception(f'Not enough data to fetch {commandSize-1} params') return 0 - meta = struct.unpack( - 'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06]) + #meta = struct.unpack( + # 'H'*(unk_06-1), ctx.data[ctx.ptr+2:ctx.ptr+2*unk_06]) #print('meta', meta) # Handle parameters @@ -266,9 +307,45 @@ def ExecuteScriptCommandSet(ctx: Context): raise Exception('Parameters not defined for ' + command['fun'] + ' Should be of length ' + str(param_length)) if not command['params'] in parameters: raise Exception('Parameter configuration ' + command['params'] + ' not defined') + + # TODO REMOVE fix pointers + if command['params'] == 'p': + command['params'] = 'w' + elif command['params'] == 'd': + command['params'] = 'w' + elif command['params'] == 'pv': + command['params'] = 'v' + elif command['params'] == 'dd': + command['params'] = 'ww' + params = parameters[command['params']] - if unk_06-1 != params['length']: - # raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined') + + + + + # TODO REMOVE + if commandSize == 34: + print('@TODO FIX THIS COMMAND!') + commandSize = 13 + + + if params['length'] == -1: # variable parameter length + print(build_script_command(command['fun'])) + if commandSize > 1: + print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])])) + print(f'@ End of {commandSize-1} parameters') + ctx.ptr += commandSize*2 + return 1 + elif params['length'] == -2: # point and var + print(build_script_command(command['fun']) + ' '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])) + if commandSize > 3: + print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])])) + print(f'% End of {commandSize-3} parameters') + ctx.ptr += commandSize*2 + return 1 + + if commandSize-1 != params['length']: + raise Exception(f'Call {command["fun"]} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined') return 0 #with open('log.txt', 'a') as log: # log.write(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined\n') @@ -279,29 +356,53 @@ def ExecuteScriptCommandSet(ctx: Context): print(build_script_command(command['fun']) + ' ' + params['read'](ctx)) # Execute script - ctx.ptr += unk_06*2 + ctx.ptr += commandSize*2 return 1 +# TODO +# JumpAbsolute 0x08016384 +# JumpAbsoluteIf 0x08016384 +# JumpAbsoluteIfNot 0x08016384 + def disassemble_script(input_bytes): ctx = Context(0, input_bytes) + + foundEnd = False while True: if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id) break - if not ExecuteScriptCommandSet(ctx): + res = ExecuteScriptCommandSet(ctx) + if res == 0: break + elif res == 2: + foundEnd = True + break + elif res == 3: + # End in the middle of the script, please create a new file + return ctx.ptr + + # Print rest (did not manage to get there) if ctx.ptr < len(ctx.data): if (len(ctx.data) - ctx.ptr) % 2 != 0: - print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]])) + print_rest_bytes(ctx) # TODO error + raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data))) return print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])])) - + raise Exception('DONT WANT EXTRA after '+ str(ctx.ptr) + ' / ' + str(len(ctx.data))) + + if not foundEnd: + # Seems to happen, sadly + return 0 + #print('\033[93mNo end found\033[0m') + #raise Exception('No end found') + return 0 def generate_macros(): print('@ All the macro functions for scripts')