From 33b1445debb8b08a2cba349732d615b0a201cfd4 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 6 Mar 2021 14:08:28 +0100 Subject: [PATCH] Prefix script files with script_ instead of gUnk_ --- asm/bird.s | 4 +- asm/businessScrubPrologue.s | 4 +- asm/code_080732D0.s | 8 +- asm/fourElements.s | 4 +- asm/mazaalMacro.s | 4 +- asm/object6A.s | 20 +- asm/object89.s | 4 +- asm/stockwell.s | 12 +- data/scripts.s | 804 +++++++++--------- ...{gUnk_08008B5C.inc => script_08008B5C.inc} | 2 +- ...{gUnk_08008D50.inc => script_08008D50.inc} | 2 +- ...{gUnk_08008D8C.inc => script_08008D8C.inc} | 6 +- ...{gUnk_08008F74.inc => script_08008F74.inc} | 2 +- ...{gUnk_08008FC0.inc => script_08008FC0.inc} | 2 +- ...{gUnk_08008FFC.inc => script_08008FFC.inc} | 2 +- ...{gUnk_0800903C.inc => script_0800903C.inc} | 2 +- ...{gUnk_08009320.inc => script_08009320.inc} | 2 +- ...{gUnk_08009340.inc => script_08009340.inc} | 2 +- ...{gUnk_08009348.inc => script_08009348.inc} | 2 +- ...{gUnk_0800939A.inc => script_0800939A.inc} | 2 +- ...{gUnk_08009464.inc => script_08009464.inc} | 2 +- ...{gUnk_080094CC.inc => script_080094CC.inc} | 2 +- ...{gUnk_080094FC.inc => script_080094FC.inc} | 2 +- ...{gUnk_080095F2.inc => script_080095F2.inc} | 4 +- ...{gUnk_08009704.inc => script_08009704.inc} | 2 +- ...{gUnk_08009740.inc => script_08009740.inc} | 4 +- ...{gUnk_080097F0.inc => script_080097F0.inc} | 2 +- ...{gUnk_08009838.inc => script_08009838.inc} | 2 +- ...{gUnk_0800987C.inc => script_0800987C.inc} | 2 +- ...{gUnk_080098D4.inc => script_080098D4.inc} | 2 +- ...{gUnk_08009918.inc => script_08009918.inc} | 2 +- ...{gUnk_08009950.inc => script_08009950.inc} | 2 +- ...{gUnk_080099DC.inc => script_080099DC.inc} | 2 +- ...{gUnk_08009A34.inc => script_08009A34.inc} | 2 +- ...{gUnk_08009A84.inc => script_08009A84.inc} | 2 +- ...{gUnk_08009AF8.inc => script_08009AF8.inc} | 2 +- ...{gUnk_08009B30.inc => script_08009B30.inc} | 2 +- ...{gUnk_08009B78.inc => script_08009B78.inc} | 4 +- ...{gUnk_08009C68.inc => script_08009C68.inc} | 2 +- ...{gUnk_08009CFC.inc => script_08009CFC.inc} | 2 +- ...{gUnk_08009D6C.inc => script_08009D6C.inc} | 2 +- ...{gUnk_08009DB0.inc => script_08009DB0.inc} | 2 +- ...{gUnk_08009E4E.inc => script_08009E4E.inc} | 2 +- ...{gUnk_08009E58.inc => script_08009E58.inc} | 2 +- ...{gUnk_08009E80.inc => script_08009E80.inc} | 2 +- ...{gUnk_08009E88.inc => script_08009E88.inc} | 2 +- ...{gUnk_08009ECC.inc => script_08009ECC.inc} | 2 +- ...{gUnk_08009EF0.inc => script_08009EF0.inc} | 2 +- ...{gUnk_08009F14.inc => script_08009F14.inc} | 4 +- ...{gUnk_0800A088.inc => script_0800A088.inc} | 2 +- ...{gUnk_0800A0B4.inc => script_0800A0B4.inc} | 2 +- ...{gUnk_0800A0FC.inc => script_0800A0FC.inc} | 2 +- ...{gUnk_0800A160.inc => script_0800A160.inc} | 2 +- ...{gUnk_0800A1B4.inc => script_0800A1B4.inc} | 2 +- ...{gUnk_0800A1D8.inc => script_0800A1D8.inc} | 4 +- ...{gUnk_0800A310.inc => script_0800A310.inc} | 2 +- ...{gUnk_0800A3D8.inc => script_0800A3D8.inc} | 2 +- ...{gUnk_0800A500.inc => script_0800A500.inc} | 2 +- ...{gUnk_0800A590.inc => script_0800A590.inc} | 2 +- ...{gUnk_0800A638.inc => script_0800A638.inc} | 2 +- ...{gUnk_0800A65C.inc => script_0800A65C.inc} | 2 +- ...{gUnk_0800A680.inc => script_0800A680.inc} | 2 +- ...{gUnk_0800A6A4.inc => script_0800A6A4.inc} | 2 +- ...{gUnk_0800A6D4.inc => script_0800A6D4.inc} | 2 +- ...{gUnk_0800A704.inc => script_0800A704.inc} | 2 +- ...{gUnk_0800A734.inc => script_0800A734.inc} | 2 +- ...{gUnk_0800A764.inc => script_0800A764.inc} | 2 +- ...{gUnk_0800A7E4.inc => script_0800A7E4.inc} | 2 +- ...{gUnk_0800A964.inc => script_0800A964.inc} | 2 +- ...{gUnk_0800A988.inc => script_0800A988.inc} | 2 +- ...{gUnk_0800A9AC.inc => script_0800A9AC.inc} | 2 +- ...{gUnk_0800A9D0.inc => script_0800A9D0.inc} | 2 +- ...{gUnk_0800A9F4.inc => script_0800A9F4.inc} | 2 +- ...{gUnk_0800AA48.inc => script_0800AA48.inc} | 2 +- ...{gUnk_0800AA6C.inc => script_0800AA6C.inc} | 2 +- ...{gUnk_0800AA90.inc => script_0800AA90.inc} | 2 +- ...{gUnk_0800AAB4.inc => script_0800AAB4.inc} | 2 +- ...{gUnk_0800AAD8.inc => script_0800AAD8.inc} | 2 +- ...{gUnk_0800AB08.inc => script_0800AB08.inc} | 2 +- ...{gUnk_0800AB6E.inc => script_0800AB6E.inc} | 8 +- ...{gUnk_0800ACBC.inc => script_0800ACBC.inc} | 2 +- ...{gUnk_0800ACE0.inc => script_0800ACE0.inc} | 2 +- ...{gUnk_0800AD54.inc => script_0800AD54.inc} | 2 +- ...{gUnk_0800AEA4.inc => script_0800AEA4.inc} | 2 +- ...{gUnk_0800AEDC.inc => script_0800AEDC.inc} | 2 +- ...{gUnk_0800AF18.inc => script_0800AF18.inc} | 2 +- ...{gUnk_0800AF44.inc => script_0800AF44.inc} | 2 +- ...{gUnk_0800AF68.inc => script_0800AF68.inc} | 2 +- ...{gUnk_0800AF8C.inc => script_0800AF8C.inc} | 2 +- ...{gUnk_0800AFB0.inc => script_0800AFB0.inc} | 2 +- ...{gUnk_0800AFE8.inc => script_0800AFE8.inc} | 2 +- ...{gUnk_0800B00C.inc => script_0800B00C.inc} | 2 +- ...{gUnk_0800B0AC.inc => script_0800B0AC.inc} | 2 +- ...{gUnk_0800B0D0.inc => script_0800B0D0.inc} | 4 +- ...{gUnk_0800B1C0.inc => script_0800B1C0.inc} | 2 +- ...{gUnk_0800B200.inc => script_0800B200.inc} | 2 +- ...{gUnk_0800B254.inc => script_0800B254.inc} | 2 +- ...{gUnk_0800B308.inc => script_0800B308.inc} | 2 +- ...{gUnk_0800B3A4.inc => script_0800B3A4.inc} | 2 +- ...{gUnk_0800B41C.inc => script_0800B41C.inc} | 4 +- ...{gUnk_0800B4AC.inc => script_0800B4AC.inc} | 2 +- ...{gUnk_0800B54C.inc => script_0800B54C.inc} | 2 +- ...{gUnk_0800B574.inc => script_0800B574.inc} | 2 +- ...{gUnk_0800B5C4.inc => script_0800B5C4.inc} | 2 +- ...{gUnk_0800B5EC.inc => script_0800B5EC.inc} | 4 +- ...{gUnk_0800B6C8.inc => script_0800B6C8.inc} | 6 +- ...{gUnk_0800B7C4.inc => script_0800B7C4.inc} | 2 +- ...{gUnk_0800B7FC.inc => script_0800B7FC.inc} | 2 +- ...{gUnk_0800B828.inc => script_0800B828.inc} | 2 +- ...{gUnk_0800B9B4.inc => script_0800B9B4.inc} | 2 +- ...{gUnk_0800BACC.inc => script_0800BACC.inc} | 2 +- ...{gUnk_0800BB00.inc => script_0800BB00.inc} | 2 +- ...{gUnk_0800BB30.inc => script_0800BB30.inc} | 2 +- ...{gUnk_0800BB64.inc => script_0800BB64.inc} | 2 +- ...{gUnk_0800BBA4.inc => script_0800BBA4.inc} | 2 +- ...{gUnk_0800BBDC.inc => script_0800BBDC.inc} | 2 +- ...{gUnk_0800BC08.inc => script_0800BC08.inc} | 2 +- ...{gUnk_0800BC50.inc => script_0800BC50.inc} | 2 +- ...{gUnk_0800BCE8.inc => script_0800BCE8.inc} | 2 +- ...{gUnk_0800BD78.inc => script_0800BD78.inc} | 2 +- ...{gUnk_0800BE1C.inc => script_0800BE1C.inc} | 2 +- ...{gUnk_0800BECC.inc => script_0800BECC.inc} | 2 +- ...{gUnk_0800BF38.inc => script_0800BF38.inc} | 2 +- ...{gUnk_0800C004.inc => script_0800C004.inc} | 2 +- ...{gUnk_0800C0B0.inc => script_0800C0B0.inc} | 2 +- ...{gUnk_0800C160.inc => script_0800C160.inc} | 2 +- ...{gUnk_0800C1D8.inc => script_0800C1D8.inc} | 2 +- ...{gUnk_0800C2A4.inc => script_0800C2A4.inc} | 2 +- ...{gUnk_0800C350.inc => script_0800C350.inc} | 2 +- ...{gUnk_0800C370.inc => script_0800C370.inc} | 2 +- ...{gUnk_0800C3B0.inc => script_0800C3B0.inc} | 2 +- ...{gUnk_0800C3CC.inc => script_0800C3CC.inc} | 2 +- ...{gUnk_0800C410.inc => script_0800C410.inc} | 2 +- ...{gUnk_0800C45C.inc => script_0800C45C.inc} | 2 +- ...{gUnk_0800C494.inc => script_0800C494.inc} | 2 +- ...{gUnk_0800C4D0.inc => script_0800C4D0.inc} | 2 +- ...{gUnk_0800C50C.inc => script_0800C50C.inc} | 2 +- ...{gUnk_0800C550.inc => script_0800C550.inc} | 6 +- ...{gUnk_0800C8C8.inc => script_0800C8C8.inc} | 2 +- ...{gUnk_0800C8F0.inc => script_0800C8F0.inc} | 2 +- ...{gUnk_0800C91C.inc => script_0800C91C.inc} | 4 +- ...{gUnk_0800CA8C.inc => script_0800CA8C.inc} | 2 +- ...{gUnk_0800CABC.inc => script_0800CABC.inc} | 2 +- ...{gUnk_0800CB54.inc => script_0800CB54.inc} | 2 +- ...{gUnk_0800CBD4.inc => script_0800CBD4.inc} | 2 +- ...{gUnk_0800CC6C.inc => script_0800CC6C.inc} | 2 +- ...{gUnk_0800CD04.inc => script_0800CD04.inc} | 2 +- ...{gUnk_0800CD7C.inc => script_0800CD7C.inc} | 12 +- ...{gUnk_0800D190.inc => script_0800D190.inc} | 2 +- ...{gUnk_0800D1B4.inc => script_0800D1B4.inc} | 2 +- ...{gUnk_0800D1E0.inc => script_0800D1E0.inc} | 2 +- ...{gUnk_0800D218.inc => script_0800D218.inc} | 2 +- ...{gUnk_0800D242.inc => script_0800D242.inc} | 2 +- ...{gUnk_0800D24C.inc => script_0800D24C.inc} | 2 +- ...{gUnk_0800D254.inc => script_0800D254.inc} | 2 +- ...{gUnk_0800D278.inc => script_0800D278.inc} | 4 +- ...{gUnk_0800D3EC.inc => script_0800D3EC.inc} | 2 +- ...{gUnk_0800D414.inc => script_0800D414.inc} | 2 +- ...{gUnk_0800D698.inc => script_0800D698.inc} | 2 +- ...{gUnk_0800D6B4.inc => script_0800D6B4.inc} | 2 +- ...{gUnk_0800D6D0.inc => script_0800D6D0.inc} | 2 +- ...{gUnk_0800D6F0.inc => script_0800D6F0.inc} | 2 +- ...{gUnk_0800D710.inc => script_0800D710.inc} | 2 +- ...{gUnk_0800D76C.inc => script_0800D76C.inc} | 2 +- ...{gUnk_0800D84C.inc => script_0800D84C.inc} | 2 +- ...{gUnk_0800D874.inc => script_0800D874.inc} | 4 +- ...{gUnk_0800D92C.inc => script_0800D92C.inc} | 2 +- ...{gUnk_0800D954.inc => script_0800D954.inc} | 4 +- ...{gUnk_0800DA00.inc => script_0800DA00.inc} | 2 +- ...{gUnk_0800DA28.inc => script_0800DA28.inc} | 2 +- ...{gUnk_0800DA60.inc => script_0800DA60.inc} | 2 +- ...{gUnk_0800DB18.inc => script_0800DB18.inc} | 2 +- ...{gUnk_0800DB28.inc => script_0800DB28.inc} | 2 +- ...{gUnk_0800DB78.inc => script_0800DB78.inc} | 6 +- ...{gUnk_0800DC4C.inc => script_0800DC4C.inc} | 6 +- ...{gUnk_0800DCAC.inc => script_0800DCAC.inc} | 2 +- ...{gUnk_0800DDD0.inc => script_0800DDD0.inc} | 2 +- ...{gUnk_0800DE00.inc => script_0800DE00.inc} | 2 +- ...{gUnk_0800DE2C.inc => script_0800DE2C.inc} | 2 +- ...{gUnk_0800DE50.inc => script_0800DE50.inc} | 2 +- ...{gUnk_0800DE78.inc => script_0800DE78.inc} | 4 +- ...{gUnk_0800DEB0.inc => script_0800DEB0.inc} | 2 +- ...{gUnk_0800DED4.inc => script_0800DED4.inc} | 2 +- ...{gUnk_0800DF24.inc => script_0800DF24.inc} | 2 +- ...{gUnk_0800DFB4.inc => script_0800DFB4.inc} | 2 +- ...{gUnk_0800DFE4.inc => script_0800DFE4.inc} | 2 +- ...{gUnk_0800E050.inc => script_0800E050.inc} | 4 +- ...{gUnk_0800E094.inc => script_0800E094.inc} | 2 +- ...{gUnk_0800E0BC.inc => script_0800E0BC.inc} | 2 +- ...{gUnk_0800E504.inc => script_0800E504.inc} | 2 +- ...{gUnk_0800E544.inc => script_0800E544.inc} | 2 +- ...{gUnk_0800E58C.inc => script_0800E58C.inc} | 2 +- ...{gUnk_0800E5C4.inc => script_0800E5C4.inc} | 2 +- ...{gUnk_0800E5D6.inc => script_0800E5D6.inc} | 2 +- ...{gUnk_0800E600.inc => script_0800E600.inc} | 2 +- ...{gUnk_0800E62C.inc => script_0800E62C.inc} | 2 +- ...{gUnk_0800E658.inc => script_0800E658.inc} | 2 +- ...{gUnk_0800E684.inc => script_0800E684.inc} | 2 +- ...{gUnk_0800E6B0.inc => script_0800E6B0.inc} | 2 +- ...{gUnk_0800E8A4.inc => script_0800E8A4.inc} | 2 +- ...{gUnk_0800E8D6.inc => script_0800E8D6.inc} | 2 +- ...{gUnk_0800E908.inc => script_0800E908.inc} | 6 +- ...{gUnk_0800E9F4.inc => script_0800E9F4.inc} | 2 +- ...{gUnk_0800EA1C.inc => script_0800EA1C.inc} | 2 +- ...{gUnk_0800EA54.inc => script_0800EA54.inc} | 2 +- ...{gUnk_0800EF40.inc => script_0800EF40.inc} | 4 +- ...{gUnk_0800EF9C.inc => script_0800EF9C.inc} | 2 +- ...{gUnk_0800EFC0.inc => script_0800EFC0.inc} | 4 +- ...{gUnk_0800F14C.inc => script_0800F14C.inc} | 2 +- ...{gUnk_0800F184.inc => script_0800F184.inc} | 10 +- ...{gUnk_0800F33C.inc => script_0800F33C.inc} | 2 +- ...{gUnk_0800F354.inc => script_0800F354.inc} | 2 +- ...{gUnk_0800F36C.inc => script_0800F36C.inc} | 2 +- ...{gUnk_0800F384.inc => script_0800F384.inc} | 2 +- ...{gUnk_0800F39C.inc => script_0800F39C.inc} | 2 +- ...{gUnk_0800F430.inc => script_0800F430.inc} | 2 +- ...{gUnk_0800F4C4.inc => script_0800F4C4.inc} | 2 +- ...{gUnk_0800F554.inc => script_0800F554.inc} | 2 +- ...{gUnk_0800F724.inc => script_0800F724.inc} | 12 +- ...{gUnk_0800FA54.inc => script_0800FA54.inc} | 2 +- ...{gUnk_0800FA78.inc => script_0800FA78.inc} | 2 +- ...{gUnk_0800FA9C.inc => script_0800FA9C.inc} | 2 +- ...{gUnk_0800FAC0.inc => script_0800FAC0.inc} | 2 +- ...{gUnk_0800FAE4.inc => script_0800FAE4.inc} | 2 +- ...{gUnk_0800FB2C.inc => script_0800FB2C.inc} | 2 +- ...{gUnk_0800FB44.inc => script_0800FB44.inc} | 2 +- ...{gUnk_0800FD0C.inc => script_0800FD0C.inc} | 6 +- ...{gUnk_0800FD80.inc => script_0800FD80.inc} | 2 +- ...{gUnk_0800FDA0.inc => script_0800FDA0.inc} | 2 +- ...{gUnk_0800FF18.inc => script_0800FF18.inc} | 2 +- ...{gUnk_0800FF74.inc => script_0800FF74.inc} | 2 +- ...{gUnk_080100C8.inc => script_080100C8.inc} | 2 +- ...{gUnk_08010264.inc => script_08010264.inc} | 6 +- ...{gUnk_08010964.inc => script_08010964.inc} | 6 +- ...{gUnk_080109F0.inc => script_080109F0.inc} | 2 +- ...{gUnk_08010A14.inc => script_08010A14.inc} | 2 +- ...{gUnk_08010A38.inc => script_08010A38.inc} | 2 +- ...{gUnk_08010A5C.inc => script_08010A5C.inc} | 2 +- ...{gUnk_08010A98.inc => script_08010A98.inc} | 2 +- ...{gUnk_08010B68.inc => script_08010B68.inc} | 2 +- ...{gUnk_08010BB4.inc => script_08010BB4.inc} | 6 +- ...{gUnk_08010E5A.inc => script_08010E5A.inc} | 2 +- ...{gUnk_08010F84.inc => script_08010F84.inc} | 4 +- ...{gUnk_08011074.inc => script_08011074.inc} | 2 +- ...{gUnk_08011098.inc => script_08011098.inc} | 2 +- ...{gUnk_080110BC.inc => script_080110BC.inc} | 2 +- ...{gUnk_080110E8.inc => script_080110E8.inc} | 2 +- ...{gUnk_08011128.inc => script_08011128.inc} | 2 +- ...{gUnk_080111CC.inc => script_080111CC.inc} | 2 +- ...{gUnk_080112C4.inc => script_080112C4.inc} | 2 +- ...{gUnk_080113AA.inc => script_080113AA.inc} | 2 +- ...{gUnk_08011442.inc => script_08011442.inc} | 2 +- ...{gUnk_08011508.inc => script_08011508.inc} | 2 +- ...{gUnk_080115D0.inc => script_080115D0.inc} | 2 +- ...{gUnk_08011608.inc => script_08011608.inc} | 2 +- ...{gUnk_08011640.inc => script_08011640.inc} | 2 +- ...{gUnk_080116A8.inc => script_080116A8.inc} | 2 +- ...{gUnk_0801183C.inc => script_0801183C.inc} | 2 +- ...{gUnk_08011890.inc => script_08011890.inc} | 2 +- ...{gUnk_080118D4.inc => script_080118D4.inc} | 4 +- ...{gUnk_08011930.inc => script_08011930.inc} | 2 +- ...{gUnk_08011940.inc => script_08011940.inc} | 2 +- ...{gUnk_0801194C.inc => script_0801194C.inc} | 2 +- ...{gUnk_08011B20.inc => script_08011B20.inc} | 2 +- ...{gUnk_08011B40.inc => script_08011B40.inc} | 2 +- ...{gUnk_08011C50.inc => script_08011C50.inc} | 2 +- ...{gUnk_08011C7C.inc => script_08011C7C.inc} | 2 +- ...{gUnk_0801232C.inc => script_0801232C.inc} | 4 +- ...{gUnk_08012410.inc => script_08012410.inc} | 2 +- ...{gUnk_08012430.inc => script_08012430.inc} | 8 +- ...{gUnk_080126FC.inc => script_080126FC.inc} | 4 +- ...{gUnk_08012AB0.inc => script_08012AB0.inc} | 2 +- ...{gUnk_08012AC8.inc => script_08012AC8.inc} | 2 +- ...{gUnk_08012AF0.inc => script_08012AF0.inc} | 2 +- ...{gUnk_08012B18.inc => script_08012B18.inc} | 2 +- ...{gUnk_08012B24.inc => script_08012B24.inc} | 2 +- ...{gUnk_08012B50.inc => script_08012B50.inc} | 2 +- ...{gUnk_08012B7C.inc => script_08012B7C.inc} | 2 +- ...{gUnk_08012BA8.inc => script_08012BA8.inc} | 2 +- ...{gUnk_08012BF8.inc => script_08012BF8.inc} | 2 +- ...{gUnk_08012C48.inc => script_08012C48.inc} | 2 +- ...{gUnk_08012C68.inc => script_08012C68.inc} | 2 +- ...{gUnk_08012CD8.inc => script_08012CD8.inc} | 2 +- ...{gUnk_08012D18.inc => script_08012D18.inc} | 4 +- ...{gUnk_08012D70.inc => script_08012D70.inc} | 4 +- ...{gUnk_08012DB0.inc => script_08012DB0.inc} | 2 +- ...{gUnk_08012DD8.inc => script_08012DD8.inc} | 4 +- ...{gUnk_08012DF8.inc => script_08012DF8.inc} | 2 +- ...{gUnk_08012E20.inc => script_08012E20.inc} | 4 +- ...{gUnk_08012E44.inc => script_08012E44.inc} | 2 +- ...{gUnk_08012E88.inc => script_08012E88.inc} | 2 +- ...{gUnk_08012F0C.inc => script_08012F0C.inc} | 2 +- ...{gUnk_08012F86.inc => script_08012F86.inc} | 4 +- ...{gUnk_080130E4.inc => script_080130E4.inc} | 2 +- ...{gUnk_08013114.inc => script_08013114.inc} | 2 +- ...{gUnk_0801319A.inc => script_0801319A.inc} | 12 +- ...{gUnk_080132E4.inc => script_080132E4.inc} | 2 +- ...{gUnk_0801330C.inc => script_0801330C.inc} | 2 +- ...{gUnk_08013330.inc => script_08013330.inc} | 2 +- ...{gUnk_0801334C.inc => script_0801334C.inc} | 2 +- ...{gUnk_08013378.inc => script_08013378.inc} | 2 +- ...{gUnk_080133C4.inc => script_080133C4.inc} | 2 +- ...{gUnk_080133F8.inc => script_080133F8.inc} | 2 +- ...{gUnk_08013494.inc => script_08013494.inc} | 2 +- ...{gUnk_080134DC.inc => script_080134DC.inc} | 6 +- ...{gUnk_08013650.inc => script_08013650.inc} | 4 +- ...{gUnk_080136B4.inc => script_080136B4.inc} | 2 +- ...{gUnk_080136D8.inc => script_080136D8.inc} | 2 +- ...{gUnk_08013720.inc => script_08013720.inc} | 6 +- ...{gUnk_080138B4.inc => script_080138B4.inc} | 6 +- ...{gUnk_08013AA6.inc => script_08013AA6.inc} | 2 +- ...{gUnk_08013B18.inc => script_08013B18.inc} | 4 +- ...{gUnk_08013B70.inc => script_08013B70.inc} | 2 +- ...{gUnk_08013BA8.inc => script_08013BA8.inc} | 2 +- ...{gUnk_08013BE8.inc => script_08013BE8.inc} | 2 +- ...{gUnk_08013CA4.inc => script_08013CA4.inc} | 2 +- ...{gUnk_08013D04.inc => script_08013D04.inc} | 2 +- ...{gUnk_08013D44.inc => script_08013D44.inc} | 2 +- ...{gUnk_08013D84.inc => script_08013D84.inc} | 2 +- ...{gUnk_08013DC4.inc => script_08013DC4.inc} | 2 +- ...{gUnk_08013E04.inc => script_08013E04.inc} | 2 +- ...{gUnk_08013E28.inc => script_08013E28.inc} | 2 +- ...{gUnk_08013E4C.inc => script_08013E4C.inc} | 2 +- ...{gUnk_08013E70.inc => script_08013E70.inc} | 2 +- ...{gUnk_08013E94.inc => script_08013E94.inc} | 2 +- ...{gUnk_08013EB0.inc => script_08013EB0.inc} | 2 +- ...{gUnk_08013ECC.inc => script_08013ECC.inc} | 2 +- ...{gUnk_08013EE8.inc => script_08013EE8.inc} | 2 +- ...{gUnk_08013F04.inc => script_08013F04.inc} | 2 +- ...{gUnk_08013F34.inc => script_08013F34.inc} | 2 +- ...{gUnk_08013F64.inc => script_08013F64.inc} | 2 +- ...{gUnk_08013F94.inc => script_08013F94.inc} | 2 +- ...{gUnk_08013FE8.inc => script_08013FE8.inc} | 4 +- ...{gUnk_08014054.inc => script_08014054.inc} | 2 +- ...{gUnk_08014074.inc => script_08014074.inc} | 2 +- ...{gUnk_08014094.inc => script_08014094.inc} | 2 +- ...{gUnk_080140B8.inc => script_080140B8.inc} | 2 +- ...{gUnk_080140DC.inc => script_080140DC.inc} | 2 +- ...{gUnk_08014118.inc => script_08014118.inc} | 2 +- ...{gUnk_08014154.inc => script_08014154.inc} | 2 +- ...{gUnk_08014198.inc => script_08014198.inc} | 2 +- ...{gUnk_080141DC.inc => script_080141DC.inc} | 2 +- ...{gUnk_08014210.inc => script_08014210.inc} | 2 +- ...{gUnk_08014248.inc => script_08014248.inc} | 2 +- ...{gUnk_080142B0.inc => script_080142B0.inc} | 2 +- ...{gUnk_08014384.inc => script_08014384.inc} | 2 +- ...{gUnk_080143C0.inc => script_080143C0.inc} | 2 +- ...{gUnk_08014450.inc => script_08014450.inc} | 2 +- ...{gUnk_0801450C.inc => script_0801450C.inc} | 4 +- ...{gUnk_08014588.inc => script_08014588.inc} | 2 +- ...{gUnk_080145B0.inc => script_080145B0.inc} | 2 +- ...{gUnk_080145E8.inc => script_080145E8.inc} | 4 +- ...{gUnk_080147DC.inc => script_080147DC.inc} | 2 +- ...{gUnk_08014804.inc => script_08014804.inc} | 2 +- ...{gUnk_08014958.inc => script_08014958.inc} | 2 +- ...{gUnk_080149CC.inc => script_080149CC.inc} | 2 +- ...{gUnk_08014A80.inc => script_08014A80.inc} | 4 +- ...{gUnk_08014B10.inc => script_08014B10.inc} | 2 +- ...{gUnk_08014B34.inc => script_08014B34.inc} | 2 +- ...{gUnk_08014CDC.inc => script_08014CDC.inc} | 2 +- ...{gUnk_08014DCC.inc => script_08014DCC.inc} | 2 +- ...{gUnk_08014E14.inc => script_08014E14.inc} | 12 +- ...{gUnk_08015234.inc => script_08015234.inc} | 2 +- ...{gUnk_080152B4.inc => script_080152B4.inc} | 2 +- ...{gUnk_080152DC.inc => script_080152DC.inc} | 2 +- ...{gUnk_08015304.inc => script_08015304.inc} | 2 +- ...{gUnk_08015338.inc => script_08015338.inc} | 2 +- ...{gUnk_08015360.inc => script_08015360.inc} | 2 +- ...{gUnk_08015384.inc => script_08015384.inc} | 2 +- ...{gUnk_08015390.inc => script_08015390.inc} | 4 +- ...{gUnk_080153EC.inc => script_080153EC.inc} | 2 +- ...{gUnk_0801548E.inc => script_0801548E.inc} | 2 +- ...{gUnk_0801550C.inc => script_0801550C.inc} | 2 +- ...{gUnk_080155F4.inc => script_080155F4.inc} | 2 +- ...{gUnk_08015618.inc => script_08015618.inc} | 2 +- ...{gUnk_08015684.inc => script_08015684.inc} | 2 +- ...{gUnk_08015754.inc => script_08015754.inc} | 2 +- ...{gUnk_080157AC.inc => script_080157AC.inc} | 8 +- ...{gUnk_080158F8.inc => script_080158F8.inc} | 2 +- ...{gUnk_08015918.inc => script_08015918.inc} | 2 +- ...{gUnk_08015938.inc => script_08015938.inc} | 2 +- ...{gUnk_08015958.inc => script_08015958.inc} | 2 +- ...{gUnk_08015A7C.inc => script_08015A7C.inc} | 2 +- ...{gUnk_08015AA0.inc => script_08015AA0.inc} | 2 +- ...{gUnk_08015AC4.inc => script_08015AC4.inc} | 2 +- ...{gUnk_08015B14.inc => script_08015B14.inc} | 2 +- ...{gUnk_08015B34.inc => script_08015B34.inc} | 4 +- ...{gUnk_08015B84.inc => script_08015B84.inc} | 2 +- ...{gUnk_08015BA8.inc => script_08015BA8.inc} | 2 +- ...{gUnk_08015BE8.inc => script_08015BE8.inc} | 4 +- ...{gUnk_08015C7C.inc => script_08015C7C.inc} | 2 +- ...{gUnk_08015CD4.inc => script_08015CD4.inc} | 2 +- ...{gUnk_08015DF0.inc => script_08015DF0.inc} | 2 +- ...{gUnk_08015E58.inc => script_08015E58.inc} | 2 +- ...{gUnk_08015F08.inc => script_08015F08.inc} | 2 +- ...{gUnk_08015F3C.inc => script_08015F3C.inc} | 2 +- ...{gUnk_08015F80.inc => script_08015F80.inc} | 2 +- ...{gUnk_08015FA4.inc => script_08015FA4.inc} | 2 +- ...{gUnk_08015FC0.inc => script_08015FC0.inc} | 2 +- ...{gUnk_08016004.inc => script_08016004.inc} | 2 +- ...{gUnk_08016030.inc => script_08016030.inc} | 2 +- ...{gUnk_08016062.inc => script_08016062.inc} | 2 +- ...{gUnk_0801606C.inc => script_0801606C.inc} | 2 +- ...{gUnk_0801609E.inc => script_0801609E.inc} | 2 +- ...{gUnk_080160A8.inc => script_080160A8.inc} | 4 +- ...{gUnk_0801635C.inc => script_0801635C.inc} | 2 +- ...{gUnk_0801637C.inc => script_0801637C.inc} | 2 +- ...{gUnk_08016384.inc => script_08016384.inc} | 16 +- ...{gUnk_08016482.inc => script_08016482.inc} | 4 +- ...{gUnk_080165A4.inc => script_080165A4.inc} | 4 +- ...{gUnk_080165D8.inc => script_080165D8.inc} | 8 +- src/npc/ezloCap.c | 8 +- src/npc/rem.c | 4 +- src/npc/talon.c | 4 +- src/npc/windTribespeople.c | 4 +- src/room.c | 26 +- tools/script_disassembler/incbin_parser.py | 2 +- .../script_disassembler.py | 62 +- 418 files changed, 1004 insertions(+), 986 deletions(-) rename data/scripts/{gUnk_08008B5C.inc => script_08008B5C.inc} (98%) rename data/scripts/{gUnk_08008D50.inc => script_08008D50.inc} (90%) rename data/scripts/{gUnk_08008D8C.inc => script_08008D8C.inc} (95%) rename data/scripts/{gUnk_08008F74.inc => script_08008F74.inc} (92%) rename data/scripts/{gUnk_08008FC0.inc => script_08008FC0.inc} (89%) rename data/scripts/{gUnk_08008FFC.inc => script_08008FFC.inc} (90%) rename data/scripts/{gUnk_0800903C.inc => script_0800903C.inc} (99%) rename data/scripts/{gUnk_08009320.inc => script_08009320.inc} (83%) rename data/scripts/{gUnk_08009340.inc => script_08009340.inc} (63%) rename data/scripts/{gUnk_08009348.inc => script_08009348.inc} (92%) rename data/scripts/{gUnk_0800939A.inc => script_0800939A.inc} (96%) rename data/scripts/{gUnk_08009464.inc => script_08009464.inc} (93%) rename data/scripts/{gUnk_080094CC.inc => script_080094CC.inc} (88%) rename data/scripts/{gUnk_080094FC.inc => script_080094FC.inc} (97%) rename data/scripts/{gUnk_080095F2.inc => script_080095F2.inc} (94%) rename data/scripts/{gUnk_08009704.inc => script_08009704.inc} (90%) rename data/scripts/{gUnk_08009740.inc => script_08009740.inc} (91%) rename data/scripts/{gUnk_080097F0.inc => script_080097F0.inc} (91%) rename data/scripts/{gUnk_08009838.inc => script_08009838.inc} (90%) rename data/scripts/{gUnk_0800987C.inc => script_0800987C.inc} (92%) rename data/scripts/{gUnk_080098D4.inc => script_080098D4.inc} (91%) rename data/scripts/{gUnk_08009918.inc => script_08009918.inc} (88%) rename data/scripts/{gUnk_08009950.inc => script_08009950.inc} (95%) rename data/scripts/{gUnk_080099DC.inc => script_080099DC.inc} (93%) rename data/scripts/{gUnk_08009A34.inc => script_08009A34.inc} (91%) rename data/scripts/{gUnk_08009A84.inc => script_08009A84.inc} (95%) rename data/scripts/{gUnk_08009AF8.inc => script_08009AF8.inc} (89%) rename data/scripts/{gUnk_08009B30.inc => script_08009B30.inc} (90%) rename data/scripts/{gUnk_08009B78.inc => script_08009B78.inc} (94%) rename data/scripts/{gUnk_08009C68.inc => script_08009C68.inc} (95%) rename data/scripts/{gUnk_08009CFC.inc => script_08009CFC.inc} (94%) rename data/scripts/{gUnk_08009D6C.inc => script_08009D6C.inc} (90%) rename data/scripts/{gUnk_08009DB0.inc => script_08009DB0.inc} (95%) rename data/scripts/{gUnk_08009E4E.inc => script_08009E4E.inc} (64%) rename data/scripts/{gUnk_08009E58.inc => script_08009E58.inc} (85%) rename data/scripts/{gUnk_08009E80.inc => script_08009E80.inc} (63%) rename data/scripts/{gUnk_08009E88.inc => script_08009E88.inc} (90%) rename data/scripts/{gUnk_08009ECC.inc => script_08009ECC.inc} (85%) rename data/scripts/{gUnk_08009EF0.inc => script_08009EF0.inc} (85%) rename data/scripts/{gUnk_08009F14.inc => script_08009F14.inc} (96%) rename data/scripts/{gUnk_0800A088.inc => script_0800A088.inc} (87%) rename data/scripts/{gUnk_0800A0B4.inc => script_0800A0B4.inc} (91%) rename data/scripts/{gUnk_0800A0FC.inc => script_0800A0FC.inc} (93%) rename data/scripts/{gUnk_0800A160.inc => script_0800A160.inc} (92%) rename data/scripts/{gUnk_0800A1B4.inc => script_0800A1B4.inc} (85%) rename data/scripts/{gUnk_0800A1D8.inc => script_0800A1D8.inc} (95%) rename data/scripts/{gUnk_0800A310.inc => script_0800A310.inc} (96%) rename data/scripts/{gUnk_0800A3D8.inc => script_0800A3D8.inc} (97%) rename data/scripts/{gUnk_0800A500.inc => script_0800A500.inc} (95%) rename data/scripts/{gUnk_0800A590.inc => script_0800A590.inc} (95%) rename data/scripts/{gUnk_0800A638.inc => script_0800A638.inc} (85%) rename data/scripts/{gUnk_0800A65C.inc => script_0800A65C.inc} (85%) rename data/scripts/{gUnk_0800A680.inc => script_0800A680.inc} (85%) rename data/scripts/{gUnk_0800A6A4.inc => script_0800A6A4.inc} (87%) rename data/scripts/{gUnk_0800A6D4.inc => script_0800A6D4.inc} (87%) rename data/scripts/{gUnk_0800A704.inc => script_0800A704.inc} (87%) rename data/scripts/{gUnk_0800A734.inc => script_0800A734.inc} (87%) rename data/scripts/{gUnk_0800A764.inc => script_0800A764.inc} (94%) rename data/scripts/{gUnk_0800A7E4.inc => script_0800A7E4.inc} (98%) rename data/scripts/{gUnk_0800A964.inc => script_0800A964.inc} (84%) rename data/scripts/{gUnk_0800A988.inc => script_0800A988.inc} (84%) rename data/scripts/{gUnk_0800A9AC.inc => script_0800A9AC.inc} (84%) rename data/scripts/{gUnk_0800A9D0.inc => script_0800A9D0.inc} (84%) rename data/scripts/{gUnk_0800A9F4.inc => script_0800A9F4.inc} (91%) rename data/scripts/{gUnk_0800AA48.inc => script_0800AA48.inc} (84%) rename data/scripts/{gUnk_0800AA6C.inc => script_0800AA6C.inc} (84%) rename data/scripts/{gUnk_0800AA90.inc => script_0800AA90.inc} (84%) rename data/scripts/{gUnk_0800AAB4.inc => script_0800AAB4.inc} (84%) rename data/scripts/{gUnk_0800AAD8.inc => script_0800AAD8.inc} (87%) rename data/scripts/{gUnk_0800AB08.inc => script_0800AB08.inc} (93%) rename data/scripts/{gUnk_0800AB6E.inc => script_0800AB6E.inc} (91%) rename data/scripts/{gUnk_0800ACBC.inc => script_0800ACBC.inc} (85%) rename data/scripts/{gUnk_0800ACE0.inc => script_0800ACE0.inc} (93%) rename data/scripts/{gUnk_0800AD54.inc => script_0800AD54.inc} (97%) rename data/scripts/{gUnk_0800AEA4.inc => script_0800AEA4.inc} (90%) rename data/scripts/{gUnk_0800AEDC.inc => script_0800AEDC.inc} (90%) rename data/scripts/{gUnk_0800AF18.inc => script_0800AF18.inc} (87%) rename data/scripts/{gUnk_0800AF44.inc => script_0800AF44.inc} (84%) rename data/scripts/{gUnk_0800AF68.inc => script_0800AF68.inc} (84%) rename data/scripts/{gUnk_0800AF8C.inc => script_0800AF8C.inc} (84%) rename data/scripts/{gUnk_0800AFB0.inc => script_0800AFB0.inc} (90%) rename data/scripts/{gUnk_0800AFE8.inc => script_0800AFE8.inc} (84%) rename data/scripts/{gUnk_0800B00C.inc => script_0800B00C.inc} (96%) rename data/scripts/{gUnk_0800B0AC.inc => script_0800B0AC.inc} (83%) rename data/scripts/{gUnk_0800B0D0.inc => script_0800B0D0.inc} (93%) rename data/scripts/{gUnk_0800B1C0.inc => script_0800B1C0.inc} (90%) rename data/scripts/{gUnk_0800B200.inc => script_0800B200.inc} (93%) rename data/scripts/{gUnk_0800B254.inc => script_0800B254.inc} (96%) rename data/scripts/{gUnk_0800B308.inc => script_0800B308.inc} (96%) rename data/scripts/{gUnk_0800B3A4.inc => script_0800B3A4.inc} (93%) rename data/scripts/{gUnk_0800B41C.inc => script_0800B41C.inc} (90%) rename data/scripts/{gUnk_0800B4AC.inc => script_0800B4AC.inc} (96%) rename data/scripts/{gUnk_0800B54C.inc => script_0800B54C.inc} (86%) rename data/scripts/{gUnk_0800B574.inc => script_0800B574.inc} (92%) rename data/scripts/{gUnk_0800B5C4.inc => script_0800B5C4.inc} (86%) rename data/scripts/{gUnk_0800B5EC.inc => script_0800B5EC.inc} (93%) rename data/scripts/{gUnk_0800B6C8.inc => script_0800B6C8.inc} (91%) rename data/scripts/{gUnk_0800B7C4.inc => script_0800B7C4.inc} (89%) rename data/scripts/{gUnk_0800B7FC.inc => script_0800B7FC.inc} (86%) rename data/scripts/{gUnk_0800B828.inc => script_0800B828.inc} (98%) rename data/scripts/{gUnk_0800B9B4.inc => script_0800B9B4.inc} (97%) rename data/scripts/{gUnk_0800BACC.inc => script_0800BACC.inc} (88%) rename data/scripts/{gUnk_0800BB00.inc => script_0800BB00.inc} (87%) rename data/scripts/{gUnk_0800BB30.inc => script_0800BB30.inc} (88%) rename data/scripts/{gUnk_0800BB64.inc => script_0800BB64.inc} (90%) rename data/scripts/{gUnk_0800BBA4.inc => script_0800BBA4.inc} (89%) rename data/scripts/{gUnk_0800BBDC.inc => script_0800BBDC.inc} (87%) rename data/scripts/{gUnk_0800BC08.inc => script_0800BC08.inc} (91%) rename data/scripts/{gUnk_0800BC50.inc => script_0800BC50.inc} (95%) rename data/scripts/{gUnk_0800BCE8.inc => script_0800BCE8.inc} (95%) rename data/scripts/{gUnk_0800BD78.inc => script_0800BD78.inc} (96%) rename data/scripts/{gUnk_0800BE1C.inc => script_0800BE1C.inc} (96%) rename data/scripts/{gUnk_0800BECC.inc => script_0800BECC.inc} (94%) rename data/scripts/{gUnk_0800BF38.inc => script_0800BF38.inc} (96%) rename data/scripts/{gUnk_0800C004.inc => script_0800C004.inc} (96%) rename data/scripts/{gUnk_0800C0B0.inc => script_0800C0B0.inc} (96%) rename data/scripts/{gUnk_0800C160.inc => script_0800C160.inc} (94%) rename data/scripts/{gUnk_0800C1D8.inc => script_0800C1D8.inc} (96%) rename data/scripts/{gUnk_0800C2A4.inc => script_0800C2A4.inc} (96%) rename data/scripts/{gUnk_0800C350.inc => script_0800C350.inc} (84%) rename data/scripts/{gUnk_0800C370.inc => script_0800C370.inc} (90%) rename data/scripts/{gUnk_0800C3B0.inc => script_0800C3B0.inc} (81%) rename data/scripts/{gUnk_0800C3CC.inc => script_0800C3CC.inc} (90%) rename data/scripts/{gUnk_0800C410.inc => script_0800C410.inc} (91%) rename data/scripts/{gUnk_0800C45C.inc => script_0800C45C.inc} (89%) rename data/scripts/{gUnk_0800C494.inc => script_0800C494.inc} (90%) rename data/scripts/{gUnk_0800C4D0.inc => script_0800C4D0.inc} (90%) rename data/scripts/{gUnk_0800C50C.inc => script_0800C50C.inc} (91%) rename data/scripts/{gUnk_0800C550.inc => script_0800C550.inc} (97%) rename data/scripts/{gUnk_0800C8C8.inc => script_0800C8C8.inc} (86%) rename data/scripts/{gUnk_0800C8F0.inc => script_0800C8F0.inc} (87%) rename data/scripts/{gUnk_0800C91C.inc => script_0800C91C.inc} (96%) rename data/scripts/{gUnk_0800CA8C.inc => script_0800CA8C.inc} (89%) rename data/scripts/{gUnk_0800CABC.inc => script_0800CABC.inc} (96%) rename data/scripts/{gUnk_0800CB54.inc => script_0800CB54.inc} (95%) rename data/scripts/{gUnk_0800CBD4.inc => script_0800CBD4.inc} (96%) rename data/scripts/{gUnk_0800CC6C.inc => script_0800CC6C.inc} (96%) rename data/scripts/{gUnk_0800CD04.inc => script_0800CD04.inc} (95%) rename data/scripts/{gUnk_0800CD7C.inc => script_0800CD7C.inc} (95%) rename data/scripts/{gUnk_0800D190.inc => script_0800D190.inc} (85%) rename data/scripts/{gUnk_0800D1B4.inc => script_0800D1B4.inc} (87%) rename data/scripts/{gUnk_0800D1E0.inc => script_0800D1E0.inc} (88%) rename data/scripts/{gUnk_0800D218.inc => script_0800D218.inc} (87%) rename data/scripts/{gUnk_0800D242.inc => script_0800D242.inc} (60%) rename data/scripts/{gUnk_0800D24C.inc => script_0800D24C.inc} (59%) rename data/scripts/{gUnk_0800D254.inc => script_0800D254.inc} (85%) rename data/scripts/{gUnk_0800D278.inc => script_0800D278.inc} (96%) rename data/scripts/{gUnk_0800D3EC.inc => script_0800D3EC.inc} (86%) rename data/scripts/{gUnk_0800D414.inc => script_0800D414.inc} (98%) rename data/scripts/{gUnk_0800D698.inc => script_0800D698.inc} (80%) rename data/scripts/{gUnk_0800D6B4.inc => script_0800D6B4.inc} (80%) rename data/scripts/{gUnk_0800D6D0.inc => script_0800D6D0.inc} (84%) rename data/scripts/{gUnk_0800D6F0.inc => script_0800D6F0.inc} (84%) rename data/scripts/{gUnk_0800D710.inc => script_0800D710.inc} (93%) rename data/scripts/{gUnk_0800D76C.inc => script_0800D76C.inc} (97%) rename data/scripts/{gUnk_0800D84C.inc => script_0800D84C.inc} (85%) rename data/scripts/{gUnk_0800D874.inc => script_0800D874.inc} (92%) rename data/scripts/{gUnk_0800D92C.inc => script_0800D92C.inc} (86%) rename data/scripts/{gUnk_0800D954.inc => script_0800D954.inc} (91%) rename data/scripts/{gUnk_0800DA00.inc => script_0800DA00.inc} (86%) rename data/scripts/{gUnk_0800DA28.inc => script_0800DA28.inc} (89%) rename data/scripts/{gUnk_0800DA60.inc => script_0800DA60.inc} (96%) rename data/scripts/{gUnk_0800DB18.inc => script_0800DB18.inc} (71%) rename data/scripts/{gUnk_0800DB28.inc => script_0800DB28.inc} (92%) rename data/scripts/{gUnk_0800DB78.inc => script_0800DB78.inc} (89%) rename data/scripts/{gUnk_0800DC4C.inc => script_0800DC4C.inc} (78%) rename data/scripts/{gUnk_0800DCAC.inc => script_0800DCAC.inc} (97%) rename data/scripts/{gUnk_0800DDD0.inc => script_0800DDD0.inc} (88%) rename data/scripts/{gUnk_0800DE00.inc => script_0800DE00.inc} (87%) rename data/scripts/{gUnk_0800DE2C.inc => script_0800DE2C.inc} (85%) rename data/scripts/{gUnk_0800DE50.inc => script_0800DE50.inc} (83%) rename data/scripts/{gUnk_0800DE78.inc => script_0800DE78.inc} (76%) rename data/scripts/{gUnk_0800DEB0.inc => script_0800DEB0.inc} (85%) rename data/scripts/{gUnk_0800DED4.inc => script_0800DED4.inc} (92%) rename data/scripts/{gUnk_0800DF24.inc => script_0800DF24.inc} (95%) rename data/scripts/{gUnk_0800DFB4.inc => script_0800DFB4.inc} (87%) rename data/scripts/{gUnk_0800DFE4.inc => script_0800DFE4.inc} (94%) rename data/scripts/{gUnk_0800E050.inc => script_0800E050.inc} (81%) rename data/scripts/{gUnk_0800E094.inc => script_0800E094.inc} (86%) rename data/scripts/{gUnk_0800E0BC.inc => script_0800E0BC.inc} (99%) rename data/scripts/{gUnk_0800E504.inc => script_0800E504.inc} (90%) rename data/scripts/{gUnk_0800E544.inc => script_0800E544.inc} (91%) rename data/scripts/{gUnk_0800E58C.inc => script_0800E58C.inc} (88%) rename data/scripts/{gUnk_0800E5C4.inc => script_0800E5C4.inc} (76%) rename data/scripts/{gUnk_0800E5D6.inc => script_0800E5D6.inc} (86%) rename data/scripts/{gUnk_0800E600.inc => script_0800E600.inc} (88%) rename data/scripts/{gUnk_0800E62C.inc => script_0800E62C.inc} (88%) rename data/scripts/{gUnk_0800E658.inc => script_0800E658.inc} (88%) rename data/scripts/{gUnk_0800E684.inc => script_0800E684.inc} (88%) rename data/scripts/{gUnk_0800E6B0.inc => script_0800E6B0.inc} (98%) rename data/scripts/{gUnk_0800E8A4.inc => script_0800E8A4.inc} (89%) rename data/scripts/{gUnk_0800E8D6.inc => script_0800E8D6.inc} (89%) rename data/scripts/{gUnk_0800E908.inc => script_0800E908.inc} (91%) rename data/scripts/{gUnk_0800E9F4.inc => script_0800E9F4.inc} (86%) rename data/scripts/{gUnk_0800EA1C.inc => script_0800EA1C.inc} (88%) rename data/scripts/{gUnk_0800EA54.inc => script_0800EA54.inc} (99%) rename data/scripts/{gUnk_0800EF40.inc => script_0800EF40.inc} (86%) rename data/scripts/{gUnk_0800EF9C.inc => script_0800EF9C.inc} (85%) rename data/scripts/{gUnk_0800EFC0.inc => script_0800EFC0.inc} (96%) rename data/scripts/{gUnk_0800F14C.inc => script_0800F14C.inc} (89%) rename data/scripts/{gUnk_0800F184.inc => script_0800F184.inc} (91%) rename data/scripts/{gUnk_0800F33C.inc => script_0800F33C.inc} (79%) rename data/scripts/{gUnk_0800F354.inc => script_0800F354.inc} (79%) rename data/scripts/{gUnk_0800F36C.inc => script_0800F36C.inc} (79%) rename data/scripts/{gUnk_0800F384.inc => script_0800F384.inc} (79%) rename data/scripts/{gUnk_0800F39C.inc => script_0800F39C.inc} (96%) rename data/scripts/{gUnk_0800F430.inc => script_0800F430.inc} (96%) rename data/scripts/{gUnk_0800F4C4.inc => script_0800F4C4.inc} (95%) rename data/scripts/{gUnk_0800F554.inc => script_0800F554.inc} (98%) rename data/scripts/{gUnk_0800F724.inc => script_0800F724.inc} (94%) rename data/scripts/{gUnk_0800FA54.inc => script_0800FA54.inc} (86%) rename data/scripts/{gUnk_0800FA78.inc => script_0800FA78.inc} (85%) rename data/scripts/{gUnk_0800FA9C.inc => script_0800FA9C.inc} (85%) rename data/scripts/{gUnk_0800FAC0.inc => script_0800FAC0.inc} (85%) rename data/scripts/{gUnk_0800FAE4.inc => script_0800FAE4.inc} (91%) rename data/scripts/{gUnk_0800FB2C.inc => script_0800FB2C.inc} (77%) rename data/scripts/{gUnk_0800FB44.inc => script_0800FB44.inc} (98%) rename data/scripts/{gUnk_0800FD0C.inc => script_0800FD0C.inc} (83%) rename data/scripts/{gUnk_0800FD80.inc => script_0800FD80.inc} (83%) rename data/scripts/{gUnk_0800FDA0.inc => script_0800FDA0.inc} (98%) rename data/scripts/{gUnk_0800FF18.inc => script_0800FF18.inc} (93%) rename data/scripts/{gUnk_0800FF74.inc => script_0800FF74.inc} (98%) rename data/scripts/{gUnk_080100C8.inc => script_080100C8.inc} (98%) rename data/scripts/{gUnk_08010264.inc => script_08010264.inc} (98%) rename data/scripts/{gUnk_08010964.inc => script_08010964.inc} (85%) rename data/scripts/{gUnk_080109F0.inc => script_080109F0.inc} (85%) rename data/scripts/{gUnk_08010A14.inc => script_08010A14.inc} (85%) rename data/scripts/{gUnk_08010A38.inc => script_08010A38.inc} (85%) rename data/scripts/{gUnk_08010A5C.inc => script_08010A5C.inc} (89%) rename data/scripts/{gUnk_08010A98.inc => script_08010A98.inc} (96%) rename data/scripts/{gUnk_08010B68.inc => script_08010B68.inc} (92%) rename data/scripts/{gUnk_08010BB4.inc => script_08010BB4.inc} (96%) rename data/scripts/{gUnk_08010E5A.inc => script_08010E5A.inc} (97%) rename data/scripts/{gUnk_08010F84.inc => script_08010F84.inc} (93%) rename data/scripts/{gUnk_08011074.inc => script_08011074.inc} (85%) rename data/scripts/{gUnk_08011098.inc => script_08011098.inc} (84%) rename data/scripts/{gUnk_080110BC.inc => script_080110BC.inc} (88%) rename data/scripts/{gUnk_080110E8.inc => script_080110E8.inc} (90%) rename data/scripts/{gUnk_08011128.inc => script_08011128.inc} (96%) rename data/scripts/{gUnk_080111CC.inc => script_080111CC.inc} (97%) rename data/scripts/{gUnk_080112C4.inc => script_080112C4.inc} (97%) rename data/scripts/{gUnk_080113AA.inc => script_080113AA.inc} (95%) rename data/scripts/{gUnk_08011442.inc => script_08011442.inc} (96%) rename data/scripts/{gUnk_08011508.inc => script_08011508.inc} (96%) rename data/scripts/{gUnk_080115D0.inc => script_080115D0.inc} (90%) rename data/scripts/{gUnk_08011608.inc => script_08011608.inc} (90%) rename data/scripts/{gUnk_08011640.inc => script_08011640.inc} (94%) rename data/scripts/{gUnk_080116A8.inc => script_080116A8.inc} (98%) rename data/scripts/{gUnk_0801183C.inc => script_0801183C.inc} (92%) rename data/scripts/{gUnk_08011890.inc => script_08011890.inc} (90%) rename data/scripts/{gUnk_080118D4.inc => script_080118D4.inc} (85%) rename data/scripts/{gUnk_08011930.inc => script_08011930.inc} (71%) rename data/scripts/{gUnk_08011940.inc => script_08011940.inc} (65%) rename data/scripts/{gUnk_0801194C.inc => script_0801194C.inc} (98%) rename data/scripts/{gUnk_08011B20.inc => script_08011B20.inc} (83%) rename data/scripts/{gUnk_08011B40.inc => script_08011B40.inc} (97%) rename data/scripts/{gUnk_08011C50.inc => script_08011C50.inc} (86%) rename data/scripts/{gUnk_08011C7C.inc => script_08011C7C.inc} (99%) rename data/scripts/{gUnk_0801232C.inc => script_0801232C.inc} (94%) rename data/scripts/{gUnk_08012410.inc => script_08012410.inc} (83%) rename data/scripts/{gUnk_08012430.inc => script_08012430.inc} (95%) rename data/scripts/{gUnk_080126FC.inc => script_080126FC.inc} (98%) rename data/scripts/{gUnk_08012AB0.inc => script_08012AB0.inc} (76%) rename data/scripts/{gUnk_08012AC8.inc => script_08012AC8.inc} (86%) rename data/scripts/{gUnk_08012AF0.inc => script_08012AF0.inc} (86%) rename data/scripts/{gUnk_08012B18.inc => script_08012B18.inc} (61%) rename data/scripts/{gUnk_08012B24.inc => script_08012B24.inc} (87%) rename data/scripts/{gUnk_08012B50.inc => script_08012B50.inc} (87%) rename data/scripts/{gUnk_08012B7C.inc => script_08012B7C.inc} (87%) rename data/scripts/{gUnk_08012BA8.inc => script_08012BA8.inc} (92%) rename data/scripts/{gUnk_08012BF8.inc => script_08012BF8.inc} (92%) rename data/scripts/{gUnk_08012C48.inc => script_08012C48.inc} (84%) rename data/scripts/{gUnk_08012C68.inc => script_08012C68.inc} (94%) rename data/scripts/{gUnk_08012CD8.inc => script_08012CD8.inc} (91%) rename data/scripts/{gUnk_08012D18.inc => script_08012D18.inc} (85%) rename data/scripts/{gUnk_08012D70.inc => script_08012D70.inc} (80%) rename data/scripts/{gUnk_08012DB0.inc => script_08012DB0.inc} (86%) rename data/scripts/{gUnk_08012DD8.inc => script_08012DD8.inc} (67%) rename data/scripts/{gUnk_08012DF8.inc => script_08012DF8.inc} (86%) rename data/scripts/{gUnk_08012E20.inc => script_08012E20.inc} (68%) rename data/scripts/{gUnk_08012E44.inc => script_08012E44.inc} (90%) rename data/scripts/{gUnk_08012E88.inc => script_08012E88.inc} (95%) rename data/scripts/{gUnk_08012F0C.inc => script_08012F0C.inc} (94%) rename data/scripts/{gUnk_08012F86.inc => script_08012F86.inc} (95%) rename data/scripts/{gUnk_080130E4.inc => script_080130E4.inc} (88%) rename data/scripts/{gUnk_08013114.inc => script_08013114.inc} (95%) rename data/scripts/{gUnk_0801319A.inc => script_0801319A.inc} (87%) rename data/scripts/{gUnk_080132E4.inc => script_080132E4.inc} (86%) rename data/scripts/{gUnk_0801330C.inc => script_0801330C.inc} (85%) rename data/scripts/{gUnk_08013330.inc => script_08013330.inc} (81%) rename data/scripts/{gUnk_0801334C.inc => script_0801334C.inc} (87%) rename data/scripts/{gUnk_08013378.inc => script_08013378.inc} (90%) rename data/scripts/{gUnk_080133C4.inc => script_080133C4.inc} (88%) rename data/scripts/{gUnk_080133F8.inc => script_080133F8.inc} (95%) rename data/scripts/{gUnk_08013494.inc => script_08013494.inc} (90%) rename data/scripts/{gUnk_080134DC.inc => script_080134DC.inc} (93%) rename data/scripts/{gUnk_08013650.inc => script_08013650.inc} (86%) rename data/scripts/{gUnk_080136B4.inc => script_080136B4.inc} (85%) rename data/scripts/{gUnk_080136D8.inc => script_080136D8.inc} (91%) rename data/scripts/{gUnk_08013720.inc => script_08013720.inc} (94%) rename data/scripts/{gUnk_080138B4.inc => script_080138B4.inc} (95%) rename data/scripts/{gUnk_08013AA6.inc => script_08013AA6.inc} (94%) rename data/scripts/{gUnk_08013B18.inc => script_08013B18.inc} (84%) rename data/scripts/{gUnk_08013B70.inc => script_08013B70.inc} (87%) rename data/scripts/{gUnk_08013BA8.inc => script_08013BA8.inc} (88%) rename data/scripts/{gUnk_08013BE8.inc => script_08013BE8.inc} (96%) rename data/scripts/{gUnk_08013CA4.inc => script_08013CA4.inc} (93%) rename data/scripts/{gUnk_08013D04.inc => script_08013D04.inc} (90%) rename data/scripts/{gUnk_08013D44.inc => script_08013D44.inc} (90%) rename data/scripts/{gUnk_08013D84.inc => script_08013D84.inc} (90%) rename data/scripts/{gUnk_08013DC4.inc => script_08013DC4.inc} (90%) rename data/scripts/{gUnk_08013E04.inc => script_08013E04.inc} (86%) rename data/scripts/{gUnk_08013E28.inc => script_08013E28.inc} (86%) rename data/scripts/{gUnk_08013E4C.inc => script_08013E4C.inc} (86%) rename data/scripts/{gUnk_08013E70.inc => script_08013E70.inc} (86%) rename data/scripts/{gUnk_08013E94.inc => script_08013E94.inc} (82%) rename data/scripts/{gUnk_08013EB0.inc => script_08013EB0.inc} (82%) rename data/scripts/{gUnk_08013ECC.inc => script_08013ECC.inc} (82%) rename data/scripts/{gUnk_08013EE8.inc => script_08013EE8.inc} (82%) rename data/scripts/{gUnk_08013F04.inc => script_08013F04.inc} (88%) rename data/scripts/{gUnk_08013F34.inc => script_08013F34.inc} (88%) rename data/scripts/{gUnk_08013F64.inc => script_08013F64.inc} (88%) rename data/scripts/{gUnk_08013F94.inc => script_08013F94.inc} (92%) rename data/scripts/{gUnk_08013FE8.inc => script_08013FE8.inc} (87%) rename data/scripts/{gUnk_08014054.inc => script_08014054.inc} (83%) rename data/scripts/{gUnk_08014074.inc => script_08014074.inc} (83%) rename data/scripts/{gUnk_08014094.inc => script_08014094.inc} (85%) rename data/scripts/{gUnk_080140B8.inc => script_080140B8.inc} (85%) rename data/scripts/{gUnk_080140DC.inc => script_080140DC.inc} (89%) rename data/scripts/{gUnk_08014118.inc => script_08014118.inc} (89%) rename data/scripts/{gUnk_08014154.inc => script_08014154.inc} (91%) rename data/scripts/{gUnk_08014198.inc => script_08014198.inc} (91%) rename data/scripts/{gUnk_080141DC.inc => script_080141DC.inc} (88%) rename data/scripts/{gUnk_08014210.inc => script_08014210.inc} (88%) rename data/scripts/{gUnk_08014248.inc => script_08014248.inc} (94%) rename data/scripts/{gUnk_080142B0.inc => script_080142B0.inc} (96%) rename data/scripts/{gUnk_08014384.inc => script_08014384.inc} (90%) rename data/scripts/{gUnk_080143C0.inc => script_080143C0.inc} (95%) rename data/scripts/{gUnk_08014450.inc => script_08014450.inc} (96%) rename data/scripts/{gUnk_0801450C.inc => script_0801450C.inc} (89%) rename data/scripts/{gUnk_08014588.inc => script_08014588.inc} (86%) rename data/scripts/{gUnk_080145B0.inc => script_080145B0.inc} (90%) rename data/scripts/{gUnk_080145E8.inc => script_080145E8.inc} (97%) rename data/scripts/{gUnk_080147DC.inc => script_080147DC.inc} (86%) rename data/scripts/{gUnk_08014804.inc => script_08014804.inc} (97%) rename data/scripts/{gUnk_08014958.inc => script_08014958.inc} (94%) rename data/scripts/{gUnk_080149CC.inc => script_080149CC.inc} (96%) rename data/scripts/{gUnk_08014A80.inc => script_08014A80.inc} (91%) rename data/scripts/{gUnk_08014B10.inc => script_08014B10.inc} (85%) rename data/scripts/{gUnk_08014B34.inc => script_08014B34.inc} (98%) rename data/scripts/{gUnk_08014CDC.inc => script_08014CDC.inc} (97%) rename data/scripts/{gUnk_08014DCC.inc => script_08014DCC.inc} (91%) rename data/scripts/{gUnk_08014E14.inc => script_08014E14.inc} (95%) rename data/scripts/{gUnk_08015234.inc => script_08015234.inc} (94%) rename data/scripts/{gUnk_080152B4.inc => script_080152B4.inc} (86%) rename data/scripts/{gUnk_080152DC.inc => script_080152DC.inc} (86%) rename data/scripts/{gUnk_08015304.inc => script_08015304.inc} (87%) rename data/scripts/{gUnk_08015338.inc => script_08015338.inc} (86%) rename data/scripts/{gUnk_08015360.inc => script_08015360.inc} (86%) rename data/scripts/{gUnk_08015384.inc => script_08015384.inc} (61%) rename data/scripts/{gUnk_08015390.inc => script_08015390.inc} (85%) rename data/scripts/{gUnk_080153EC.inc => script_080153EC.inc} (96%) rename data/scripts/{gUnk_0801548E.inc => script_0801548E.inc} (95%) rename data/scripts/{gUnk_0801550C.inc => script_0801550C.inc} (96%) rename data/scripts/{gUnk_080155F4.inc => script_080155F4.inc} (84%) rename data/scripts/{gUnk_08015618.inc => script_08015618.inc} (93%) rename data/scripts/{gUnk_08015684.inc => script_08015684.inc} (96%) rename data/scripts/{gUnk_08015754.inc => script_08015754.inc} (93%) rename data/scripts/{gUnk_080157AC.inc => script_080157AC.inc} (91%) rename data/scripts/{gUnk_080158F8.inc => script_080158F8.inc} (83%) rename data/scripts/{gUnk_08015918.inc => script_08015918.inc} (83%) rename data/scripts/{gUnk_08015938.inc => script_08015938.inc} (83%) rename data/scripts/{gUnk_08015958.inc => script_08015958.inc} (97%) rename data/scripts/{gUnk_08015A7C.inc => script_08015A7C.inc} (85%) rename data/scripts/{gUnk_08015AA0.inc => script_08015AA0.inc} (85%) rename data/scripts/{gUnk_08015AC4.inc => script_08015AC4.inc} (92%) rename data/scripts/{gUnk_08015B14.inc => script_08015B14.inc} (84%) rename data/scripts/{gUnk_08015B34.inc => script_08015B34.inc} (83%) rename data/scripts/{gUnk_08015B84.inc => script_08015B84.inc} (85%) rename data/scripts/{gUnk_08015BA8.inc => script_08015BA8.inc} (91%) rename data/scripts/{gUnk_08015BE8.inc => script_08015BE8.inc} (91%) rename data/scripts/{gUnk_08015C7C.inc => script_08015C7C.inc} (92%) rename data/scripts/{gUnk_08015CD4.inc => script_08015CD4.inc} (97%) rename data/scripts/{gUnk_08015DF0.inc => script_08015DF0.inc} (94%) rename data/scripts/{gUnk_08015E58.inc => script_08015E58.inc} (96%) rename data/scripts/{gUnk_08015F08.inc => script_08015F08.inc} (89%) rename data/scripts/{gUnk_08015F3C.inc => script_08015F3C.inc} (91%) rename data/scripts/{gUnk_08015F80.inc => script_08015F80.inc} (85%) rename data/scripts/{gUnk_08015FA4.inc => script_08015FA4.inc} (81%) rename data/scripts/{gUnk_08015FC0.inc => script_08015FC0.inc} (90%) rename data/scripts/{gUnk_08016004.inc => script_08016004.inc} (86%) rename data/scripts/{gUnk_08016030.inc => script_08016030.inc} (89%) rename data/scripts/{gUnk_08016062.inc => script_08016062.inc} (66%) rename data/scripts/{gUnk_0801606C.inc => script_0801606C.inc} (89%) rename data/scripts/{gUnk_0801609E.inc => script_0801609E.inc} (66%) rename data/scripts/{gUnk_080160A8.inc => script_080160A8.inc} (97%) rename data/scripts/{gUnk_0801635C.inc => script_0801635C.inc} (83%) rename data/scripts/{gUnk_0801637C.inc => script_0801637C.inc} (65%) rename data/scripts/{gUnk_08016384.inc => script_08016384.inc} (79%) rename data/scripts/{gUnk_08016482.inc => script_08016482.inc} (95%) rename data/scripts/{gUnk_080165A4.inc => script_080165A4.inc} (80%) rename data/scripts/{gUnk_080165D8.inc => script_080165D8.inc} (97%) diff --git a/asm/bird.s b/asm/bird.s index 7d16e5f0..fed030cc 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -515,7 +515,7 @@ _0809D5E6: adds r4, r0, #0 cmp r4, #0 beq _0809D62E - ldr r1, _0809D668 @ =gUnk_0800B0AC + ldr r1, _0809D668 @ =script_0800B0AC bl StartCutscene adds r1, r4, #0 adds r1, #0x84 @@ -545,7 +545,7 @@ _0809D658: .4byte gPlayerEntity _0809D65C: .4byte 0xFFF80000 _0809D660: .4byte gRoomControls _0809D664: .4byte gUnk_02034490 -_0809D668: .4byte gUnk_0800B0AC +_0809D668: .4byte script_0800B0AC thumb_func_start sub_0809D66C sub_0809D66C: @ 0x0809D66C diff --git a/asm/businessScrubPrologue.s b/asm/businessScrubPrologue.s index deb98135..f1e8909d 100644 --- a/asm/businessScrubPrologue.s +++ b/asm/businessScrubPrologue.s @@ -142,14 +142,14 @@ sub_08045C3C: @ 0x08045C3C bl sub_08046030 adds r0, r4, #0 bl sub_08095C48 - ldr r1, _08045CA0 @ =gUnk_08015AC4 + ldr r1, _08045CA0 @ =script_08015AC4 adds r0, r4, #0 bl StartCutscene adds r0, r4, #0 bl sub_0807DD50 pop {r4, pc} .align 2, 0 -_08045CA0: .4byte gUnk_08015AC4 +_08045CA0: .4byte script_08015AC4 thumb_func_start sub_08045CA4 sub_08045CA4: @ 0x08045CA4 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 0717d0c5..04b6dfbc 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -4223,16 +4223,16 @@ sub_080751E8: @ 0x080751E8 cmp r7, #0 bne _08075240 strb r7, [r3] - ldr r6, _0807523C @ =gUnk_08009ECC + ldr r6, _0807523C @ =script_08009ECC b _08075244 .align 2, 0 _08075230: .4byte gPlayerScriptExecutionContext _08075234: .4byte gPlayerEntity _08075238: .4byte gPlayerState -_0807523C: .4byte gUnk_08009ECC +_0807523C: .4byte script_08009ECC _08075240: strb r4, [r3] - ldr r6, _08075290 @ =gUnk_08009EF0 + ldr r6, _08075290 @ =script_08009EF0 _08075244: ldr r0, _08075294 @ =gPlayerState adds r0, #0x39 @@ -4270,7 +4270,7 @@ _08075270: _0807528C: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08075290: .4byte gUnk_08009EF0 +_08075290: .4byte script_08009EF0 _08075294: .4byte gPlayerState _08075298: .4byte gPlayerEntity diff --git a/asm/fourElements.s b/asm/fourElements.s index e69d1373..42e2badb 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -78,7 +78,7 @@ sub_080A01E0: @ 0x080A01E0 adds r0, #0x38 strb r3, [r0] _080A0246: - ldr r0, _080A028C @ =gUnk_0800A0B4 + ldr r0, _080A028C @ =script_0800A0B4 bl StartPlayerScript ldr r1, _080A0284 @ =gScreen adds r2, r1, #0 @@ -108,7 +108,7 @@ _080A027C: .4byte gUnk_080FD1A0 _080A0280: .4byte 0x0000FF40 _080A0284: .4byte gScreen _080A0288: .4byte 0x0000FDFF -_080A028C: .4byte gUnk_0800A0B4 +_080A028C: .4byte script_0800A0B4 thumb_func_start sub_080A0290 sub_080A0290: @ 0x080A0290 diff --git a/asm/mazaalMacro.s b/asm/mazaalMacro.s index 063718d6..85f2f709 100644 --- a/asm/mazaalMacro.s +++ b/asm/mazaalMacro.s @@ -300,7 +300,7 @@ _08034E8A: beq _08034EBC movs r0, #3 strb r0, [r4, #0xc] - ldr r1, _08034EB4 @ =gUnk_08012E20 + ldr r1, _08034EB4 @ =script_08012E20 adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -309,7 +309,7 @@ _08034E8A: b _08034EBC .align 2, 0 _08034EB0: .4byte gScreenTransition -_08034EB4: .4byte gUnk_08012E20 +_08034EB4: .4byte script_08012E20 _08034EB8: bl DeleteThisEntity _08034EBC: diff --git a/asm/object6A.s b/asm/object6A.s index ec4f6933..1f89494e 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -204,7 +204,7 @@ sub_08094B94: @ 0x08094B94 bl CopyPosition ldr r0, _08094BD8 @ =0x0000FFD0 strh r0, [r4, #0x36] - ldr r1, _08094BDC @ =gUnk_0800AEDC + ldr r1, _08094BDC @ =script_0800AEDC adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -223,7 +223,7 @@ _08094BD2: .align 2, 0 _08094BD4: .4byte gPlayerEntity _08094BD8: .4byte 0x0000FFD0 -_08094BDC: .4byte gUnk_0800AEDC +_08094BDC: .4byte script_0800AEDC thumb_func_start sub_08094BE0 sub_08094BE0: @ 0x08094BE0 @@ -1073,7 +1073,7 @@ sub_08095244: @ 0x08095244 adds r0, r5, #0 adds r1, r4, #0 bl PositionRelative - ldr r1, _08095284 @ =gUnk_0801183C + ldr r1, _08095284 @ =script_0801183C adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -1083,7 +1083,7 @@ _0809527C: pop {r4, r5, pc} .align 2, 0 _08095280: .4byte 0xFFF00000 -_08095284: .4byte gUnk_0801183C +_08095284: .4byte script_0801183C thumb_func_start sub_08095288 sub_08095288: @ 0x08095288 @@ -1374,7 +1374,7 @@ sub_080954AC: @ 0x080954AC adds r0, r5, #0 adds r1, r4, #0 bl CopyPosition - ldr r1, _080954D8 @ =gUnk_08015B14 + ldr r1, _080954D8 @ =script_08015B14 adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -1383,7 +1383,7 @@ sub_080954AC: @ 0x080954AC _080954D6: pop {r4, r5, pc} .align 2, 0 -_080954D8: .4byte gUnk_08015B14 +_080954D8: .4byte script_08015B14 thumb_func_start sub_080954DC sub_080954DC: @ 0x080954DC @@ -1821,7 +1821,7 @@ sub_08095810: @ 0x08095810 adds r0, r5, #0 adds r1, r4, #0 bl ResolveEntityOnTop - ldr r1, _08095848 @ =gUnk_08011940 + ldr r1, _08095848 @ =script_08011940 adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -1830,7 +1830,7 @@ sub_08095810: @ 0x08095810 _08095844: pop {r4, r5, pc} .align 2, 0 -_08095848: .4byte gUnk_08011940 +_08095848: .4byte script_08011940 thumb_func_start sub_0809584C sub_0809584C: @ 0x0809584C @@ -1984,7 +1984,7 @@ sub_08095954: @ 0x08095954 bl PositionRelative ldr r0, _080959B0 @ =0x0000FFFD strh r0, [r4, #0x36] - ldr r1, _080959B4 @ =gUnk_08012C48 + ldr r1, _080959B4 @ =script_08012C48 adds r0, r4, #0 bl StartCutscene adds r1, r4, #0 @@ -2003,7 +2003,7 @@ sub_08095954: @ 0x08095954 .align 2, 0 _080959AC: .4byte gUnk_08122AF8 _080959B0: .4byte 0x0000FFFD -_080959B4: .4byte gUnk_08012C48 +_080959B4: .4byte script_08012C48 _080959B8: ldr r0, _080959C8 @ =gActiveScriptInfo ldr r1, [r0] diff --git a/asm/object89.s b/asm/object89.s index 4dce01fc..504dccbe 100644 --- a/asm/object89.s +++ b/asm/object89.s @@ -85,7 +85,7 @@ _0809AB70: adds r1, #0x63 movs r0, #0x20 strb r0, [r1] - ldr r1, _0809ABA0 @ =gUnk_08012DD8 + ldr r1, _0809ABA0 @ =script_08012DD8 adds r0, r5, #0 bl StartCutscene adds r1, r5, #0 @@ -94,7 +94,7 @@ _0809AB70: _0809AB9C: pop {r4, r5, pc} .align 2, 0 -_0809ABA0: .4byte gUnk_08012DD8 +_0809ABA0: .4byte script_08012DD8 thumb_func_start sub_0809ABA4 sub_0809ABA4: @ 0x0809ABA4 diff --git a/asm/stockwell.s b/asm/stockwell.s index 343f4cbf..d7ea48f1 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -54,7 +54,7 @@ sub_08065080: @ 0x08065080 movs r1, #0 movs r2, #0 bl sub_08078850 - ldr r1, _080650C8 @ =gUnk_080142B0 + ldr r1, _080650C8 @ =script_080142B0 adds r0, r4, #0 bl StartCutscene adds r4, #0x84 @@ -62,7 +62,7 @@ sub_08065080: @ 0x08065080 pop {r4, pc} .align 2, 0 _080650C4: .4byte gUnk_0810FDA0 -_080650C8: .4byte gUnk_080142B0 +_080650C8: .4byte script_080142B0 thumb_func_start sub_080650CC sub_080650CC: @ 0x080650CC @@ -83,12 +83,12 @@ sub_080650CC: @ 0x080650CC adds r0, r5, #0 adds r0, #0x84 ldr r0, [r0] - ldr r1, _080650FC @ =gUnk_080143C0 + ldr r1, _080650FC @ =script_080143C0 bl sub_0807DB88 b _080651A6 .align 2, 0 _080650F8: .4byte gRoomVars -_080650FC: .4byte gUnk_080143C0 +_080650FC: .4byte script_080143C0 _08065100: adds r2, r5, #0 adds r2, #0x5a @@ -132,7 +132,7 @@ _0806513C: adds r0, r5, #0 adds r0, #0x84 ldr r0, [r0] - ldr r1, _08065174 @ =gUnk_08014384 + ldr r1, _08065174 @ =script_08014384 bl sub_0807DB88 _0806515E: adds r0, r7, #0 @@ -145,7 +145,7 @@ _0806515E: str r0, [r1, #0x10] b _080651A6 .align 2, 0 -_08065174: .4byte gUnk_08014384 +_08065174: .4byte script_08014384 _08065178: .4byte gTextBox _0806517C: ldrb r1, [r2] diff --git a/data/scripts.s b/data/scripts.s index 1382c174..3d208c56 100644 --- a/data/scripts.s +++ b/data/scripts.s @@ -7,405 +7,405 @@ .text - .include "data/scripts/gUnk_08008B5C.inc" - .include "data/scripts/gUnk_08008D50.inc" - .include "data/scripts/gUnk_08008D8C.inc" - .include "data/scripts/gUnk_08008F74.inc" - .include "data/scripts/gUnk_08008FC0.inc" - .include "data/scripts/gUnk_08008FFC.inc" - .include "data/scripts/gUnk_0800903C.inc" - .include "data/scripts/gUnk_08009320.inc" - .include "data/scripts/gUnk_08009340.inc" - .include "data/scripts/gUnk_08009348.inc" - .include "data/scripts/gUnk_0800939A.inc" - .include "data/scripts/gUnk_08009464.inc" - .include "data/scripts/gUnk_080094CC.inc" - .include "data/scripts/gUnk_080094FC.inc" - .include "data/scripts/gUnk_080095F2.inc" - .include "data/scripts/gUnk_08009704.inc" - .include "data/scripts/gUnk_08009740.inc" - .include "data/scripts/gUnk_080097F0.inc" - .include "data/scripts/gUnk_08009838.inc" - .include "data/scripts/gUnk_0800987C.inc" - .include "data/scripts/gUnk_080098D4.inc" - .include "data/scripts/gUnk_08009918.inc" - .include "data/scripts/gUnk_08009950.inc" - .include "data/scripts/gUnk_080099DC.inc" - .include "data/scripts/gUnk_08009A34.inc" - .include "data/scripts/gUnk_08009A84.inc" - .include "data/scripts/gUnk_08009AF8.inc" - .include "data/scripts/gUnk_08009B30.inc" - .include "data/scripts/gUnk_08009B78.inc" - .include "data/scripts/gUnk_08009C68.inc" - .include "data/scripts/gUnk_08009CFC.inc" - .include "data/scripts/gUnk_08009D6C.inc" - .include "data/scripts/gUnk_08009DB0.inc" - .include "data/scripts/gUnk_08009E4E.inc" - .include "data/scripts/gUnk_08009E58.inc" - .include "data/scripts/gUnk_08009E80.inc" - .include "data/scripts/gUnk_08009E88.inc" - .include "data/scripts/gUnk_08009ECC.inc" - .include "data/scripts/gUnk_08009EF0.inc" - .include "data/scripts/gUnk_08009F14.inc" - .include "data/scripts/gUnk_0800A088.inc" - .include "data/scripts/gUnk_0800A0B4.inc" - .include "data/scripts/gUnk_0800A0FC.inc" - .include "data/scripts/gUnk_0800A160.inc" - .include "data/scripts/gUnk_0800A1B4.inc" - .include "data/scripts/gUnk_0800A1D8.inc" - .include "data/scripts/gUnk_0800A310.inc" - .include "data/scripts/gUnk_0800A3D8.inc" - .include "data/scripts/gUnk_0800A500.inc" - .include "data/scripts/gUnk_0800A590.inc" - .include "data/scripts/gUnk_0800A638.inc" - .include "data/scripts/gUnk_0800A65C.inc" - .include "data/scripts/gUnk_0800A680.inc" - .include "data/scripts/gUnk_0800A6A4.inc" - .include "data/scripts/gUnk_0800A6D4.inc" - .include "data/scripts/gUnk_0800A704.inc" - .include "data/scripts/gUnk_0800A734.inc" - .include "data/scripts/gUnk_0800A764.inc" - .include "data/scripts/gUnk_0800A7E4.inc" - .include "data/scripts/gUnk_0800A964.inc" - .include "data/scripts/gUnk_0800A988.inc" - .include "data/scripts/gUnk_0800A9AC.inc" - .include "data/scripts/gUnk_0800A9D0.inc" - .include "data/scripts/gUnk_0800A9F4.inc" - .include "data/scripts/gUnk_0800AA48.inc" - .include "data/scripts/gUnk_0800AA6C.inc" - .include "data/scripts/gUnk_0800AA90.inc" - .include "data/scripts/gUnk_0800AAB4.inc" - .include "data/scripts/gUnk_0800AAD8.inc" - .include "data/scripts/gUnk_0800AB08.inc" - .include "data/scripts/gUnk_0800AB6E.inc" - .include "data/scripts/gUnk_0800ACBC.inc" - .include "data/scripts/gUnk_0800ACE0.inc" - .include "data/scripts/gUnk_0800AD54.inc" - .include "data/scripts/gUnk_0800AEA4.inc" - .include "data/scripts/gUnk_0800AEDC.inc" - .include "data/scripts/gUnk_0800AF18.inc" - .include "data/scripts/gUnk_0800AF44.inc" - .include "data/scripts/gUnk_0800AF68.inc" - .include "data/scripts/gUnk_0800AF8C.inc" - .include "data/scripts/gUnk_0800AFB0.inc" - .include "data/scripts/gUnk_0800AFE8.inc" - .include "data/scripts/gUnk_0800B00C.inc" - .include "data/scripts/gUnk_0800B0AC.inc" - .include "data/scripts/gUnk_0800B0D0.inc" - .include "data/scripts/gUnk_0800B1C0.inc" - .include "data/scripts/gUnk_0800B200.inc" - .include "data/scripts/gUnk_0800B254.inc" - .include "data/scripts/gUnk_0800B308.inc" - .include "data/scripts/gUnk_0800B3A4.inc" - .include "data/scripts/gUnk_0800B41C.inc" - .include "data/scripts/gUnk_0800B4AC.inc" - .include "data/scripts/gUnk_0800B54C.inc" - .include "data/scripts/gUnk_0800B574.inc" - .include "data/scripts/gUnk_0800B5C4.inc" - .include "data/scripts/gUnk_0800B5EC.inc" - .include "data/scripts/gUnk_0800B6C8.inc" - .include "data/scripts/gUnk_0800B7C4.inc" - .include "data/scripts/gUnk_0800B7FC.inc" - .include "data/scripts/gUnk_0800B828.inc" - .include "data/scripts/gUnk_0800B9B4.inc" - .include "data/scripts/gUnk_0800BACC.inc" - .include "data/scripts/gUnk_0800BB00.inc" - .include "data/scripts/gUnk_0800BB30.inc" - .include "data/scripts/gUnk_0800BB64.inc" - .include "data/scripts/gUnk_0800BBA4.inc" - .include "data/scripts/gUnk_0800BBDC.inc" - .include "data/scripts/gUnk_0800BC08.inc" - .include "data/scripts/gUnk_0800BC50.inc" - .include "data/scripts/gUnk_0800BCE8.inc" - .include "data/scripts/gUnk_0800BD78.inc" - .include "data/scripts/gUnk_0800BE1C.inc" - .include "data/scripts/gUnk_0800BECC.inc" - .include "data/scripts/gUnk_0800BF38.inc" - .include "data/scripts/gUnk_0800C004.inc" - .include "data/scripts/gUnk_0800C0B0.inc" - .include "data/scripts/gUnk_0800C160.inc" - .include "data/scripts/gUnk_0800C1D8.inc" - .include "data/scripts/gUnk_0800C2A4.inc" - .include "data/scripts/gUnk_0800C350.inc" - .include "data/scripts/gUnk_0800C370.inc" - .include "data/scripts/gUnk_0800C3B0.inc" - .include "data/scripts/gUnk_0800C3CC.inc" - .include "data/scripts/gUnk_0800C410.inc" - .include "data/scripts/gUnk_0800C45C.inc" - .include "data/scripts/gUnk_0800C494.inc" - .include "data/scripts/gUnk_0800C4D0.inc" - .include "data/scripts/gUnk_0800C50C.inc" - .include "data/scripts/gUnk_0800C550.inc" - .include "data/scripts/gUnk_0800C8C8.inc" - .include "data/scripts/gUnk_0800C8F0.inc" - .include "data/scripts/gUnk_0800C91C.inc" - .include "data/scripts/gUnk_0800CA8C.inc" - .include "data/scripts/gUnk_0800CABC.inc" - .include "data/scripts/gUnk_0800CB54.inc" - .include "data/scripts/gUnk_0800CBD4.inc" - .include "data/scripts/gUnk_0800CC6C.inc" - .include "data/scripts/gUnk_0800CD04.inc" - .include "data/scripts/gUnk_0800CD7C.inc" - .include "data/scripts/gUnk_0800D190.inc" - .include "data/scripts/gUnk_0800D1B4.inc" - .include "data/scripts/gUnk_0800D1E0.inc" - .include "data/scripts/gUnk_0800D218.inc" - .include "data/scripts/gUnk_0800D242.inc" - .include "data/scripts/gUnk_0800D24C.inc" - .include "data/scripts/gUnk_0800D254.inc" - .include "data/scripts/gUnk_0800D278.inc" - .include "data/scripts/gUnk_0800D3EC.inc" - .include "data/scripts/gUnk_0800D414.inc" - .include "data/scripts/gUnk_0800D698.inc" - .include "data/scripts/gUnk_0800D6B4.inc" - .include "data/scripts/gUnk_0800D6D0.inc" - .include "data/scripts/gUnk_0800D6F0.inc" - .include "data/scripts/gUnk_0800D710.inc" - .include "data/scripts/gUnk_0800D76C.inc" - .include "data/scripts/gUnk_0800D84C.inc" - .include "data/scripts/gUnk_0800D874.inc" - .include "data/scripts/gUnk_0800D92C.inc" - .include "data/scripts/gUnk_0800D954.inc" - .include "data/scripts/gUnk_0800DA00.inc" - .include "data/scripts/gUnk_0800DA28.inc" - .include "data/scripts/gUnk_0800DA60.inc" - .include "data/scripts/gUnk_0800DB18.inc" - .include "data/scripts/gUnk_0800DB28.inc" - .include "data/scripts/gUnk_0800DB78.inc" - .include "data/scripts/gUnk_0800DC4C.inc" - .include "data/scripts/gUnk_0800DCAC.inc" - .include "data/scripts/gUnk_0800DDD0.inc" - .include "data/scripts/gUnk_0800DE00.inc" - .include "data/scripts/gUnk_0800DE2C.inc" - .include "data/scripts/gUnk_0800DE50.inc" - .include "data/scripts/gUnk_0800DE78.inc" - .include "data/scripts/gUnk_0800DEB0.inc" - .include "data/scripts/gUnk_0800DED4.inc" - .include "data/scripts/gUnk_0800DF24.inc" - .include "data/scripts/gUnk_0800DFB4.inc" - .include "data/scripts/gUnk_0800DFE4.inc" - .include "data/scripts/gUnk_0800E050.inc" - .include "data/scripts/gUnk_0800E094.inc" - .include "data/scripts/gUnk_0800E0BC.inc" - .include "data/scripts/gUnk_0800E504.inc" - .include "data/scripts/gUnk_0800E544.inc" - .include "data/scripts/gUnk_0800E58C.inc" - .include "data/scripts/gUnk_0800E5C4.inc" - .include "data/scripts/gUnk_0800E5D6.inc" - .include "data/scripts/gUnk_0800E600.inc" - .include "data/scripts/gUnk_0800E62C.inc" - .include "data/scripts/gUnk_0800E658.inc" - .include "data/scripts/gUnk_0800E684.inc" - .include "data/scripts/gUnk_0800E6B0.inc" - .include "data/scripts/gUnk_0800E8A4.inc" - .include "data/scripts/gUnk_0800E8D6.inc" - .include "data/scripts/gUnk_0800E908.inc" - .include "data/scripts/gUnk_0800E9F4.inc" - .include "data/scripts/gUnk_0800EA1C.inc" - .include "data/scripts/gUnk_0800EA54.inc" - .include "data/scripts/gUnk_0800EF40.inc" - .include "data/scripts/gUnk_0800EF9C.inc" - .include "data/scripts/gUnk_0800EFC0.inc" - .include "data/scripts/gUnk_0800F14C.inc" - .include "data/scripts/gUnk_0800F184.inc" - .include "data/scripts/gUnk_0800F33C.inc" - .include "data/scripts/gUnk_0800F354.inc" - .include "data/scripts/gUnk_0800F36C.inc" - .include "data/scripts/gUnk_0800F384.inc" - .include "data/scripts/gUnk_0800F39C.inc" - .include "data/scripts/gUnk_0800F430.inc" - .include "data/scripts/gUnk_0800F4C4.inc" - .include "data/scripts/gUnk_0800F554.inc" - .include "data/scripts/gUnk_0800F724.inc" - .include "data/scripts/gUnk_0800FA54.inc" - .include "data/scripts/gUnk_0800FA78.inc" - .include "data/scripts/gUnk_0800FA9C.inc" - .include "data/scripts/gUnk_0800FAC0.inc" - .include "data/scripts/gUnk_0800FAE4.inc" - .include "data/scripts/gUnk_0800FB2C.inc" - .include "data/scripts/gUnk_0800FB44.inc" - .include "data/scripts/gUnk_0800FD0C.inc" - .include "data/scripts/gUnk_0800FD80.inc" - .include "data/scripts/gUnk_0800FDA0.inc" - .include "data/scripts/gUnk_0800FF18.inc" - .include "data/scripts/gUnk_0800FF74.inc" - .include "data/scripts/gUnk_080100C8.inc" - .include "data/scripts/gUnk_08010264.inc" - .include "data/scripts/gUnk_08010964.inc" - .include "data/scripts/gUnk_080109F0.inc" - .include "data/scripts/gUnk_08010A14.inc" - .include "data/scripts/gUnk_08010A38.inc" - .include "data/scripts/gUnk_08010A5C.inc" - .include "data/scripts/gUnk_08010A98.inc" - .include "data/scripts/gUnk_08010B68.inc" - .include "data/scripts/gUnk_08010BB4.inc" - .include "data/scripts/gUnk_08010E5A.inc" - .include "data/scripts/gUnk_08010F84.inc" - .include "data/scripts/gUnk_08011074.inc" - .include "data/scripts/gUnk_08011098.inc" - .include "data/scripts/gUnk_080110BC.inc" - .include "data/scripts/gUnk_080110E8.inc" - .include "data/scripts/gUnk_08011128.inc" - .include "data/scripts/gUnk_080111CC.inc" - .include "data/scripts/gUnk_080112C4.inc" - .include "data/scripts/gUnk_080113AA.inc" - .include "data/scripts/gUnk_08011442.inc" - .include "data/scripts/gUnk_08011508.inc" - .include "data/scripts/gUnk_080115D0.inc" - .include "data/scripts/gUnk_08011608.inc" - .include "data/scripts/gUnk_08011640.inc" - .include "data/scripts/gUnk_080116A8.inc" - .include "data/scripts/gUnk_0801183C.inc" - .include "data/scripts/gUnk_08011890.inc" - .include "data/scripts/gUnk_080118D4.inc" - .include "data/scripts/gUnk_08011930.inc" - .include "data/scripts/gUnk_08011940.inc" - .include "data/scripts/gUnk_0801194C.inc" - .include "data/scripts/gUnk_08011B20.inc" - .include "data/scripts/gUnk_08011B40.inc" - .include "data/scripts/gUnk_08011C50.inc" - .include "data/scripts/gUnk_08011C7C.inc" - .include "data/scripts/gUnk_0801232C.inc" - .include "data/scripts/gUnk_08012410.inc" - .include "data/scripts/gUnk_08012430.inc" - .include "data/scripts/gUnk_080126FC.inc" - .include "data/scripts/gUnk_08012AB0.inc" - .include "data/scripts/gUnk_08012AC8.inc" - .include "data/scripts/gUnk_08012AF0.inc" - .include "data/scripts/gUnk_08012B18.inc" - .include "data/scripts/gUnk_08012B24.inc" - .include "data/scripts/gUnk_08012B50.inc" - .include "data/scripts/gUnk_08012B7C.inc" - .include "data/scripts/gUnk_08012BA8.inc" - .include "data/scripts/gUnk_08012BF8.inc" - .include "data/scripts/gUnk_08012C48.inc" - .include "data/scripts/gUnk_08012C68.inc" - .include "data/scripts/gUnk_08012CD8.inc" - .include "data/scripts/gUnk_08012D18.inc" - .include "data/scripts/gUnk_08012D70.inc" - .include "data/scripts/gUnk_08012DB0.inc" - .include "data/scripts/gUnk_08012DD8.inc" - .include "data/scripts/gUnk_08012DF8.inc" - .include "data/scripts/gUnk_08012E20.inc" - .include "data/scripts/gUnk_08012E44.inc" - .include "data/scripts/gUnk_08012E88.inc" - .include "data/scripts/gUnk_08012F0C.inc" - .include "data/scripts/gUnk_08012F86.inc" - .include "data/scripts/gUnk_080130E4.inc" - .include "data/scripts/gUnk_08013114.inc" - .include "data/scripts/gUnk_0801319A.inc" - .include "data/scripts/gUnk_080132E4.inc" - .include "data/scripts/gUnk_0801330C.inc" - .include "data/scripts/gUnk_08013330.inc" - .include "data/scripts/gUnk_0801334C.inc" - .include "data/scripts/gUnk_08013378.inc" - .include "data/scripts/gUnk_080133C4.inc" - .include "data/scripts/gUnk_080133F8.inc" - .include "data/scripts/gUnk_08013494.inc" - .include "data/scripts/gUnk_080134DC.inc" - .include "data/scripts/gUnk_08013650.inc" - .include "data/scripts/gUnk_080136B4.inc" - .include "data/scripts/gUnk_080136D8.inc" - .include "data/scripts/gUnk_08013720.inc" - .include "data/scripts/gUnk_080138B4.inc" - .include "data/scripts/gUnk_08013AA6.inc" - .include "data/scripts/gUnk_08013B18.inc" - .include "data/scripts/gUnk_08013B70.inc" - .include "data/scripts/gUnk_08013BA8.inc" - .include "data/scripts/gUnk_08013BE8.inc" - .include "data/scripts/gUnk_08013CA4.inc" - .include "data/scripts/gUnk_08013D04.inc" - .include "data/scripts/gUnk_08013D44.inc" - .include "data/scripts/gUnk_08013D84.inc" - .include "data/scripts/gUnk_08013DC4.inc" - .include "data/scripts/gUnk_08013E04.inc" - .include "data/scripts/gUnk_08013E28.inc" - .include "data/scripts/gUnk_08013E4C.inc" - .include "data/scripts/gUnk_08013E70.inc" - .include "data/scripts/gUnk_08013E94.inc" - .include "data/scripts/gUnk_08013EB0.inc" - .include "data/scripts/gUnk_08013ECC.inc" - .include "data/scripts/gUnk_08013EE8.inc" - .include "data/scripts/gUnk_08013F04.inc" - .include "data/scripts/gUnk_08013F34.inc" - .include "data/scripts/gUnk_08013F64.inc" - .include "data/scripts/gUnk_08013F94.inc" - .include "data/scripts/gUnk_08013FE8.inc" - .include "data/scripts/gUnk_08014054.inc" - .include "data/scripts/gUnk_08014074.inc" - .include "data/scripts/gUnk_08014094.inc" - .include "data/scripts/gUnk_080140B8.inc" - .include "data/scripts/gUnk_080140DC.inc" - .include "data/scripts/gUnk_08014118.inc" - .include "data/scripts/gUnk_08014154.inc" - .include "data/scripts/gUnk_08014198.inc" - .include "data/scripts/gUnk_080141DC.inc" - .include "data/scripts/gUnk_08014210.inc" - .include "data/scripts/gUnk_08014248.inc" - .include "data/scripts/gUnk_080142B0.inc" - .include "data/scripts/gUnk_08014384.inc" - .include "data/scripts/gUnk_080143C0.inc" - .include "data/scripts/gUnk_08014450.inc" - .include "data/scripts/gUnk_0801450C.inc" - .include "data/scripts/gUnk_08014588.inc" - .include "data/scripts/gUnk_080145B0.inc" - .include "data/scripts/gUnk_080145E8.inc" - .include "data/scripts/gUnk_080147DC.inc" - .include "data/scripts/gUnk_08014804.inc" - .include "data/scripts/gUnk_08014958.inc" - .include "data/scripts/gUnk_080149CC.inc" - .include "data/scripts/gUnk_08014A80.inc" - .include "data/scripts/gUnk_08014B10.inc" - .include "data/scripts/gUnk_08014B34.inc" - .include "data/scripts/gUnk_08014CDC.inc" - .include "data/scripts/gUnk_08014DCC.inc" - .include "data/scripts/gUnk_08014E14.inc" - .include "data/scripts/gUnk_08015234.inc" - .include "data/scripts/gUnk_080152B4.inc" - .include "data/scripts/gUnk_080152DC.inc" - .include "data/scripts/gUnk_08015304.inc" - .include "data/scripts/gUnk_08015338.inc" - .include "data/scripts/gUnk_08015360.inc" - .include "data/scripts/gUnk_08015384.inc" - .include "data/scripts/gUnk_08015390.inc" - .include "data/scripts/gUnk_080153EC.inc" - .include "data/scripts/gUnk_0801548E.inc" - .include "data/scripts/gUnk_0801550C.inc" - .include "data/scripts/gUnk_080155F4.inc" - .include "data/scripts/gUnk_08015618.inc" - .include "data/scripts/gUnk_08015684.inc" - .include "data/scripts/gUnk_08015754.inc" - .include "data/scripts/gUnk_080157AC.inc" - .include "data/scripts/gUnk_080158F8.inc" - .include "data/scripts/gUnk_08015918.inc" - .include "data/scripts/gUnk_08015938.inc" - .include "data/scripts/gUnk_08015958.inc" - .include "data/scripts/gUnk_08015A7C.inc" - .include "data/scripts/gUnk_08015AA0.inc" - .include "data/scripts/gUnk_08015AC4.inc" - .include "data/scripts/gUnk_08015B14.inc" - .include "data/scripts/gUnk_08015B34.inc" - .include "data/scripts/gUnk_08015B84.inc" - .include "data/scripts/gUnk_08015BA8.inc" - .include "data/scripts/gUnk_08015BE8.inc" - .include "data/scripts/gUnk_08015C7C.inc" - .include "data/scripts/gUnk_08015CD4.inc" - .include "data/scripts/gUnk_08015DF0.inc" - .include "data/scripts/gUnk_08015E58.inc" - .include "data/scripts/gUnk_08015F08.inc" - .include "data/scripts/gUnk_08015F3C.inc" - .include "data/scripts/gUnk_08015F80.inc" - .include "data/scripts/gUnk_08015FA4.inc" - .include "data/scripts/gUnk_08015FC0.inc" - .include "data/scripts/gUnk_08016004.inc" - .include "data/scripts/gUnk_08016030.inc" - .include "data/scripts/gUnk_08016062.inc" - .include "data/scripts/gUnk_0801606C.inc" - .include "data/scripts/gUnk_0801609E.inc" - .include "data/scripts/gUnk_080160A8.inc" - .include "data/scripts/gUnk_0801635C.inc" - .include "data/scripts/gUnk_0801637C.inc" - .include "data/scripts/gUnk_08016384.inc" - .include "data/scripts/gUnk_08016482.inc" - .include "data/scripts/gUnk_080165A4.inc" - .include "data/scripts/gUnk_080165D8.inc" + .include "data/scripts/script_08008B5C.inc" + .include "data/scripts/script_08008D50.inc" + .include "data/scripts/script_08008D8C.inc" + .include "data/scripts/script_08008F74.inc" + .include "data/scripts/script_08008FC0.inc" + .include "data/scripts/script_08008FFC.inc" + .include "data/scripts/script_0800903C.inc" + .include "data/scripts/script_08009320.inc" + .include "data/scripts/script_08009340.inc" + .include "data/scripts/script_08009348.inc" + .include "data/scripts/script_0800939A.inc" + .include "data/scripts/script_08009464.inc" + .include "data/scripts/script_080094CC.inc" + .include "data/scripts/script_080094FC.inc" + .include "data/scripts/script_080095F2.inc" + .include "data/scripts/script_08009704.inc" + .include "data/scripts/script_08009740.inc" + .include "data/scripts/script_080097F0.inc" + .include "data/scripts/script_08009838.inc" + .include "data/scripts/script_0800987C.inc" + .include "data/scripts/script_080098D4.inc" + .include "data/scripts/script_08009918.inc" + .include "data/scripts/script_08009950.inc" + .include "data/scripts/script_080099DC.inc" + .include "data/scripts/script_08009A34.inc" + .include "data/scripts/script_08009A84.inc" + .include "data/scripts/script_08009AF8.inc" + .include "data/scripts/script_08009B30.inc" + .include "data/scripts/script_08009B78.inc" + .include "data/scripts/script_08009C68.inc" + .include "data/scripts/script_08009CFC.inc" + .include "data/scripts/script_08009D6C.inc" + .include "data/scripts/script_08009DB0.inc" + .include "data/scripts/script_08009E4E.inc" + .include "data/scripts/script_08009E58.inc" + .include "data/scripts/script_08009E80.inc" + .include "data/scripts/script_08009E88.inc" + .include "data/scripts/script_08009ECC.inc" + .include "data/scripts/script_08009EF0.inc" + .include "data/scripts/script_08009F14.inc" + .include "data/scripts/script_0800A088.inc" + .include "data/scripts/script_0800A0B4.inc" + .include "data/scripts/script_0800A0FC.inc" + .include "data/scripts/script_0800A160.inc" + .include "data/scripts/script_0800A1B4.inc" + .include "data/scripts/script_0800A1D8.inc" + .include "data/scripts/script_0800A310.inc" + .include "data/scripts/script_0800A3D8.inc" + .include "data/scripts/script_0800A500.inc" + .include "data/scripts/script_0800A590.inc" + .include "data/scripts/script_0800A638.inc" + .include "data/scripts/script_0800A65C.inc" + .include "data/scripts/script_0800A680.inc" + .include "data/scripts/script_0800A6A4.inc" + .include "data/scripts/script_0800A6D4.inc" + .include "data/scripts/script_0800A704.inc" + .include "data/scripts/script_0800A734.inc" + .include "data/scripts/script_0800A764.inc" + .include "data/scripts/script_0800A7E4.inc" + .include "data/scripts/script_0800A964.inc" + .include "data/scripts/script_0800A988.inc" + .include "data/scripts/script_0800A9AC.inc" + .include "data/scripts/script_0800A9D0.inc" + .include "data/scripts/script_0800A9F4.inc" + .include "data/scripts/script_0800AA48.inc" + .include "data/scripts/script_0800AA6C.inc" + .include "data/scripts/script_0800AA90.inc" + .include "data/scripts/script_0800AAB4.inc" + .include "data/scripts/script_0800AAD8.inc" + .include "data/scripts/script_0800AB08.inc" + .include "data/scripts/script_0800AB6E.inc" + .include "data/scripts/script_0800ACBC.inc" + .include "data/scripts/script_0800ACE0.inc" + .include "data/scripts/script_0800AD54.inc" + .include "data/scripts/script_0800AEA4.inc" + .include "data/scripts/script_0800AEDC.inc" + .include "data/scripts/script_0800AF18.inc" + .include "data/scripts/script_0800AF44.inc" + .include "data/scripts/script_0800AF68.inc" + .include "data/scripts/script_0800AF8C.inc" + .include "data/scripts/script_0800AFB0.inc" + .include "data/scripts/script_0800AFE8.inc" + .include "data/scripts/script_0800B00C.inc" + .include "data/scripts/script_0800B0AC.inc" + .include "data/scripts/script_0800B0D0.inc" + .include "data/scripts/script_0800B1C0.inc" + .include "data/scripts/script_0800B200.inc" + .include "data/scripts/script_0800B254.inc" + .include "data/scripts/script_0800B308.inc" + .include "data/scripts/script_0800B3A4.inc" + .include "data/scripts/script_0800B41C.inc" + .include "data/scripts/script_0800B4AC.inc" + .include "data/scripts/script_0800B54C.inc" + .include "data/scripts/script_0800B574.inc" + .include "data/scripts/script_0800B5C4.inc" + .include "data/scripts/script_0800B5EC.inc" + .include "data/scripts/script_0800B6C8.inc" + .include "data/scripts/script_0800B7C4.inc" + .include "data/scripts/script_0800B7FC.inc" + .include "data/scripts/script_0800B828.inc" + .include "data/scripts/script_0800B9B4.inc" + .include "data/scripts/script_0800BACC.inc" + .include "data/scripts/script_0800BB00.inc" + .include "data/scripts/script_0800BB30.inc" + .include "data/scripts/script_0800BB64.inc" + .include "data/scripts/script_0800BBA4.inc" + .include "data/scripts/script_0800BBDC.inc" + .include "data/scripts/script_0800BC08.inc" + .include "data/scripts/script_0800BC50.inc" + .include "data/scripts/script_0800BCE8.inc" + .include "data/scripts/script_0800BD78.inc" + .include "data/scripts/script_0800BE1C.inc" + .include "data/scripts/script_0800BECC.inc" + .include "data/scripts/script_0800BF38.inc" + .include "data/scripts/script_0800C004.inc" + .include "data/scripts/script_0800C0B0.inc" + .include "data/scripts/script_0800C160.inc" + .include "data/scripts/script_0800C1D8.inc" + .include "data/scripts/script_0800C2A4.inc" + .include "data/scripts/script_0800C350.inc" + .include "data/scripts/script_0800C370.inc" + .include "data/scripts/script_0800C3B0.inc" + .include "data/scripts/script_0800C3CC.inc" + .include "data/scripts/script_0800C410.inc" + .include "data/scripts/script_0800C45C.inc" + .include "data/scripts/script_0800C494.inc" + .include "data/scripts/script_0800C4D0.inc" + .include "data/scripts/script_0800C50C.inc" + .include "data/scripts/script_0800C550.inc" + .include "data/scripts/script_0800C8C8.inc" + .include "data/scripts/script_0800C8F0.inc" + .include "data/scripts/script_0800C91C.inc" + .include "data/scripts/script_0800CA8C.inc" + .include "data/scripts/script_0800CABC.inc" + .include "data/scripts/script_0800CB54.inc" + .include "data/scripts/script_0800CBD4.inc" + .include "data/scripts/script_0800CC6C.inc" + .include "data/scripts/script_0800CD04.inc" + .include "data/scripts/script_0800CD7C.inc" + .include "data/scripts/script_0800D190.inc" + .include "data/scripts/script_0800D1B4.inc" + .include "data/scripts/script_0800D1E0.inc" + .include "data/scripts/script_0800D218.inc" + .include "data/scripts/script_0800D242.inc" + .include "data/scripts/script_0800D24C.inc" + .include "data/scripts/script_0800D254.inc" + .include "data/scripts/script_0800D278.inc" + .include "data/scripts/script_0800D3EC.inc" + .include "data/scripts/script_0800D414.inc" + .include "data/scripts/script_0800D698.inc" + .include "data/scripts/script_0800D6B4.inc" + .include "data/scripts/script_0800D6D0.inc" + .include "data/scripts/script_0800D6F0.inc" + .include "data/scripts/script_0800D710.inc" + .include "data/scripts/script_0800D76C.inc" + .include "data/scripts/script_0800D84C.inc" + .include "data/scripts/script_0800D874.inc" + .include "data/scripts/script_0800D92C.inc" + .include "data/scripts/script_0800D954.inc" + .include "data/scripts/script_0800DA00.inc" + .include "data/scripts/script_0800DA28.inc" + .include "data/scripts/script_0800DA60.inc" + .include "data/scripts/script_0800DB18.inc" + .include "data/scripts/script_0800DB28.inc" + .include "data/scripts/script_0800DB78.inc" + .include "data/scripts/script_0800DC4C.inc" + .include "data/scripts/script_0800DCAC.inc" + .include "data/scripts/script_0800DDD0.inc" + .include "data/scripts/script_0800DE00.inc" + .include "data/scripts/script_0800DE2C.inc" + .include "data/scripts/script_0800DE50.inc" + .include "data/scripts/script_0800DE78.inc" + .include "data/scripts/script_0800DEB0.inc" + .include "data/scripts/script_0800DED4.inc" + .include "data/scripts/script_0800DF24.inc" + .include "data/scripts/script_0800DFB4.inc" + .include "data/scripts/script_0800DFE4.inc" + .include "data/scripts/script_0800E050.inc" + .include "data/scripts/script_0800E094.inc" + .include "data/scripts/script_0800E0BC.inc" + .include "data/scripts/script_0800E504.inc" + .include "data/scripts/script_0800E544.inc" + .include "data/scripts/script_0800E58C.inc" + .include "data/scripts/script_0800E5C4.inc" + .include "data/scripts/script_0800E5D6.inc" + .include "data/scripts/script_0800E600.inc" + .include "data/scripts/script_0800E62C.inc" + .include "data/scripts/script_0800E658.inc" + .include "data/scripts/script_0800E684.inc" + .include "data/scripts/script_0800E6B0.inc" + .include "data/scripts/script_0800E8A4.inc" + .include "data/scripts/script_0800E8D6.inc" + .include "data/scripts/script_0800E908.inc" + .include "data/scripts/script_0800E9F4.inc" + .include "data/scripts/script_0800EA1C.inc" + .include "data/scripts/script_0800EA54.inc" + .include "data/scripts/script_0800EF40.inc" + .include "data/scripts/script_0800EF9C.inc" + .include "data/scripts/script_0800EFC0.inc" + .include "data/scripts/script_0800F14C.inc" + .include "data/scripts/script_0800F184.inc" + .include "data/scripts/script_0800F33C.inc" + .include "data/scripts/script_0800F354.inc" + .include "data/scripts/script_0800F36C.inc" + .include "data/scripts/script_0800F384.inc" + .include "data/scripts/script_0800F39C.inc" + .include "data/scripts/script_0800F430.inc" + .include "data/scripts/script_0800F4C4.inc" + .include "data/scripts/script_0800F554.inc" + .include "data/scripts/script_0800F724.inc" + .include "data/scripts/script_0800FA54.inc" + .include "data/scripts/script_0800FA78.inc" + .include "data/scripts/script_0800FA9C.inc" + .include "data/scripts/script_0800FAC0.inc" + .include "data/scripts/script_0800FAE4.inc" + .include "data/scripts/script_0800FB2C.inc" + .include "data/scripts/script_0800FB44.inc" + .include "data/scripts/script_0800FD0C.inc" + .include "data/scripts/script_0800FD80.inc" + .include "data/scripts/script_0800FDA0.inc" + .include "data/scripts/script_0800FF18.inc" + .include "data/scripts/script_0800FF74.inc" + .include "data/scripts/script_080100C8.inc" + .include "data/scripts/script_08010264.inc" + .include "data/scripts/script_08010964.inc" + .include "data/scripts/script_080109F0.inc" + .include "data/scripts/script_08010A14.inc" + .include "data/scripts/script_08010A38.inc" + .include "data/scripts/script_08010A5C.inc" + .include "data/scripts/script_08010A98.inc" + .include "data/scripts/script_08010B68.inc" + .include "data/scripts/script_08010BB4.inc" + .include "data/scripts/script_08010E5A.inc" + .include "data/scripts/script_08010F84.inc" + .include "data/scripts/script_08011074.inc" + .include "data/scripts/script_08011098.inc" + .include "data/scripts/script_080110BC.inc" + .include "data/scripts/script_080110E8.inc" + .include "data/scripts/script_08011128.inc" + .include "data/scripts/script_080111CC.inc" + .include "data/scripts/script_080112C4.inc" + .include "data/scripts/script_080113AA.inc" + .include "data/scripts/script_08011442.inc" + .include "data/scripts/script_08011508.inc" + .include "data/scripts/script_080115D0.inc" + .include "data/scripts/script_08011608.inc" + .include "data/scripts/script_08011640.inc" + .include "data/scripts/script_080116A8.inc" + .include "data/scripts/script_0801183C.inc" + .include "data/scripts/script_08011890.inc" + .include "data/scripts/script_080118D4.inc" + .include "data/scripts/script_08011930.inc" + .include "data/scripts/script_08011940.inc" + .include "data/scripts/script_0801194C.inc" + .include "data/scripts/script_08011B20.inc" + .include "data/scripts/script_08011B40.inc" + .include "data/scripts/script_08011C50.inc" + .include "data/scripts/script_08011C7C.inc" + .include "data/scripts/script_0801232C.inc" + .include "data/scripts/script_08012410.inc" + .include "data/scripts/script_08012430.inc" + .include "data/scripts/script_080126FC.inc" + .include "data/scripts/script_08012AB0.inc" + .include "data/scripts/script_08012AC8.inc" + .include "data/scripts/script_08012AF0.inc" + .include "data/scripts/script_08012B18.inc" + .include "data/scripts/script_08012B24.inc" + .include "data/scripts/script_08012B50.inc" + .include "data/scripts/script_08012B7C.inc" + .include "data/scripts/script_08012BA8.inc" + .include "data/scripts/script_08012BF8.inc" + .include "data/scripts/script_08012C48.inc" + .include "data/scripts/script_08012C68.inc" + .include "data/scripts/script_08012CD8.inc" + .include "data/scripts/script_08012D18.inc" + .include "data/scripts/script_08012D70.inc" + .include "data/scripts/script_08012DB0.inc" + .include "data/scripts/script_08012DD8.inc" + .include "data/scripts/script_08012DF8.inc" + .include "data/scripts/script_08012E20.inc" + .include "data/scripts/script_08012E44.inc" + .include "data/scripts/script_08012E88.inc" + .include "data/scripts/script_08012F0C.inc" + .include "data/scripts/script_08012F86.inc" + .include "data/scripts/script_080130E4.inc" + .include "data/scripts/script_08013114.inc" + .include "data/scripts/script_0801319A.inc" + .include "data/scripts/script_080132E4.inc" + .include "data/scripts/script_0801330C.inc" + .include "data/scripts/script_08013330.inc" + .include "data/scripts/script_0801334C.inc" + .include "data/scripts/script_08013378.inc" + .include "data/scripts/script_080133C4.inc" + .include "data/scripts/script_080133F8.inc" + .include "data/scripts/script_08013494.inc" + .include "data/scripts/script_080134DC.inc" + .include "data/scripts/script_08013650.inc" + .include "data/scripts/script_080136B4.inc" + .include "data/scripts/script_080136D8.inc" + .include "data/scripts/script_08013720.inc" + .include "data/scripts/script_080138B4.inc" + .include "data/scripts/script_08013AA6.inc" + .include "data/scripts/script_08013B18.inc" + .include "data/scripts/script_08013B70.inc" + .include "data/scripts/script_08013BA8.inc" + .include "data/scripts/script_08013BE8.inc" + .include "data/scripts/script_08013CA4.inc" + .include "data/scripts/script_08013D04.inc" + .include "data/scripts/script_08013D44.inc" + .include "data/scripts/script_08013D84.inc" + .include "data/scripts/script_08013DC4.inc" + .include "data/scripts/script_08013E04.inc" + .include "data/scripts/script_08013E28.inc" + .include "data/scripts/script_08013E4C.inc" + .include "data/scripts/script_08013E70.inc" + .include "data/scripts/script_08013E94.inc" + .include "data/scripts/script_08013EB0.inc" + .include "data/scripts/script_08013ECC.inc" + .include "data/scripts/script_08013EE8.inc" + .include "data/scripts/script_08013F04.inc" + .include "data/scripts/script_08013F34.inc" + .include "data/scripts/script_08013F64.inc" + .include "data/scripts/script_08013F94.inc" + .include "data/scripts/script_08013FE8.inc" + .include "data/scripts/script_08014054.inc" + .include "data/scripts/script_08014074.inc" + .include "data/scripts/script_08014094.inc" + .include "data/scripts/script_080140B8.inc" + .include "data/scripts/script_080140DC.inc" + .include "data/scripts/script_08014118.inc" + .include "data/scripts/script_08014154.inc" + .include "data/scripts/script_08014198.inc" + .include "data/scripts/script_080141DC.inc" + .include "data/scripts/script_08014210.inc" + .include "data/scripts/script_08014248.inc" + .include "data/scripts/script_080142B0.inc" + .include "data/scripts/script_08014384.inc" + .include "data/scripts/script_080143C0.inc" + .include "data/scripts/script_08014450.inc" + .include "data/scripts/script_0801450C.inc" + .include "data/scripts/script_08014588.inc" + .include "data/scripts/script_080145B0.inc" + .include "data/scripts/script_080145E8.inc" + .include "data/scripts/script_080147DC.inc" + .include "data/scripts/script_08014804.inc" + .include "data/scripts/script_08014958.inc" + .include "data/scripts/script_080149CC.inc" + .include "data/scripts/script_08014A80.inc" + .include "data/scripts/script_08014B10.inc" + .include "data/scripts/script_08014B34.inc" + .include "data/scripts/script_08014CDC.inc" + .include "data/scripts/script_08014DCC.inc" + .include "data/scripts/script_08014E14.inc" + .include "data/scripts/script_08015234.inc" + .include "data/scripts/script_080152B4.inc" + .include "data/scripts/script_080152DC.inc" + .include "data/scripts/script_08015304.inc" + .include "data/scripts/script_08015338.inc" + .include "data/scripts/script_08015360.inc" + .include "data/scripts/script_08015384.inc" + .include "data/scripts/script_08015390.inc" + .include "data/scripts/script_080153EC.inc" + .include "data/scripts/script_0801548E.inc" + .include "data/scripts/script_0801550C.inc" + .include "data/scripts/script_080155F4.inc" + .include "data/scripts/script_08015618.inc" + .include "data/scripts/script_08015684.inc" + .include "data/scripts/script_08015754.inc" + .include "data/scripts/script_080157AC.inc" + .include "data/scripts/script_080158F8.inc" + .include "data/scripts/script_08015918.inc" + .include "data/scripts/script_08015938.inc" + .include "data/scripts/script_08015958.inc" + .include "data/scripts/script_08015A7C.inc" + .include "data/scripts/script_08015AA0.inc" + .include "data/scripts/script_08015AC4.inc" + .include "data/scripts/script_08015B14.inc" + .include "data/scripts/script_08015B34.inc" + .include "data/scripts/script_08015B84.inc" + .include "data/scripts/script_08015BA8.inc" + .include "data/scripts/script_08015BE8.inc" + .include "data/scripts/script_08015C7C.inc" + .include "data/scripts/script_08015CD4.inc" + .include "data/scripts/script_08015DF0.inc" + .include "data/scripts/script_08015E58.inc" + .include "data/scripts/script_08015F08.inc" + .include "data/scripts/script_08015F3C.inc" + .include "data/scripts/script_08015F80.inc" + .include "data/scripts/script_08015FA4.inc" + .include "data/scripts/script_08015FC0.inc" + .include "data/scripts/script_08016004.inc" + .include "data/scripts/script_08016030.inc" + .include "data/scripts/script_08016062.inc" + .include "data/scripts/script_0801606C.inc" + .include "data/scripts/script_0801609E.inc" + .include "data/scripts/script_080160A8.inc" + .include "data/scripts/script_0801635C.inc" + .include "data/scripts/script_0801637C.inc" + .include "data/scripts/script_08016384.inc" + .include "data/scripts/script_08016482.inc" + .include "data/scripts/script_080165A4.inc" + .include "data/scripts/script_080165D8.inc" diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/script_08008B5C.inc similarity index 98% rename from data/scripts/gUnk_08008B5C.inc rename to data/scripts/script_08008B5C.inc index 7ababbc6..29fac399 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008B5C +SCRIPT_START script_08008B5C StartScript _0807E9D4 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_08008D50.inc b/data/scripts/script_08008D50.inc similarity index 90% rename from data/scripts/gUnk_08008D50.inc rename to data/scripts/script_08008D50.inc index a26efd03..66abeeb8 100644 --- a/data/scripts/gUnk_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008D50 +SCRIPT_START script_08008D50 StartScript SetEntityPositionRelative 0x00680068 _0807F0B4 0x0004 diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/script_08008D8C.inc similarity index 95% rename from data/scripts/gUnk_08008D8C.inc rename to data/scripts/script_08008D8C.inc index 105f3c07..c9ee8f7d 100644 --- a/data/scripts/gUnk_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008D8C +SCRIPT_START script_08008D8C StartScript Call sub_08061FD8 Call sub_08061E70 @@ -43,7 +43,7 @@ _0807F0B4 0x0001 CameraTargetEntity WaitForPlayerAction0x17 Wait 0x003c -StartPlayerScript gUnk_08008F74 +StartPlayerScript script_08008F74 WaitForSomething2 0x00000020 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -77,7 +77,7 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0035 WaitPlayerAction8 -StartPlayerScript gUnk_08008FC0 +StartPlayerScript script_08008FC0 WaitForSomething2 0x00000020 _0807E8E4_0 _0807E5F8 0x00000080 diff --git a/data/scripts/gUnk_08008F74.inc b/data/scripts/script_08008F74.inc similarity index 92% rename from data/scripts/gUnk_08008F74.inc rename to data/scripts/script_08008F74.inc index 7fe1aeee..7885d2a5 100644 --- a/data/scripts/gUnk_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008F74 +SCRIPT_START script_08008F74 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/script_08008FC0.inc similarity index 89% rename from data/scripts/gUnk_08008FC0.inc rename to data/scripts/script_08008FC0.inc index 4fe5a130..3480d0a2 100644 --- a/data/scripts/gUnk_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008FC0 +SCRIPT_START script_08008FC0 _0807F078 0x0001, 0x0001 CallWithArg sub_0807F918, 0x00000001 SoundReq 0x0109 diff --git a/data/scripts/gUnk_08008FFC.inc b/data/scripts/script_08008FFC.inc similarity index 90% rename from data/scripts/gUnk_08008FFC.inc rename to data/scripts/script_08008FFC.inc index e65061c3..5414ad80 100644 --- a/data/scripts/gUnk_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08008FFC +SCRIPT_START script_08008FFC StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/script_0800903C.inc similarity index 99% rename from data/scripts/gUnk_0800903C.inc rename to data/scripts/script_0800903C.inc index a1a124ed..352bd061 100644 --- a/data/scripts/gUnk_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800903C +SCRIPT_START script_0800903C StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/script_08009320.inc similarity index 83% rename from data/scripts/gUnk_08009320.inc rename to data/scripts/script_08009320.inc index 381ac07b..10935b22 100644 --- a/data/scripts/gUnk_08009320.inc +++ b/data/scripts/script_08009320.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009320 +SCRIPT_START script_08009320 StartScript Call sub_0806D650 SetEntityNonPlanarMovement 0x0010 diff --git a/data/scripts/gUnk_08009340.inc b/data/scripts/script_08009340.inc similarity index 63% rename from data/scripts/gUnk_08009340.inc rename to data/scripts/script_08009340.inc index 649b253d..78861283 100644 --- a/data/scripts/gUnk_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009340 +SCRIPT_START script_08009340 StartScript StopScript SCRIPT_END diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/script_08009348.inc similarity index 92% rename from data/scripts/gUnk_08009348.inc rename to data/scripts/script_08009348.inc index cf893fae..fcfdafd9 100644 --- a/data/scripts/gUnk_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009348 +SCRIPT_START script_08009348 StartScript _0807E9D4 StopScript diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/script_0800939A.inc similarity index 96% rename from data/scripts/gUnk_0800939A.inc rename to data/scripts/script_0800939A.inc index 42562c04..a6880a48 100644 --- a/data/scripts/gUnk_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800939A +SCRIPT_START script_0800939A CheckLocalFlag 0x00ae JumpIf 0x009e CheckInventory1 0x000d diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/script_08009464.inc similarity index 93% rename from data/scripts/gUnk_08009464.inc rename to data/scripts/script_08009464.inc index bf0ba878..727eb0b6 100644 --- a/data/scripts/gUnk_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009464 +SCRIPT_START script_08009464 Wait 0x003c _0807F0C8 0x0000, 0x0000 LoadRoomEntityList gUnk_080F9C58 diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/script_080094CC.inc similarity index 88% rename from data/scripts/gUnk_080094CC.inc rename to data/scripts/script_080094CC.inc index 9cd6240f..50758bea 100644 --- a/data/scripts/gUnk_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080094CC +SCRIPT_START script_080094CC StartScript Call sub_0806D804 SetEntityNonPlanarMovement 0x0180 diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/script_080094FC.inc similarity index 97% rename from data/scripts/gUnk_080094FC.inc rename to data/scripts/script_080094FC.inc index 75784bd1..45fe9870 100644 --- a/data/scripts/gUnk_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080094FC +SCRIPT_START script_080094FC StartScript Call sub_08067100 _0807EF80 0x000a diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/script_080095F2.inc similarity index 94% rename from data/scripts/gUnk_080095F2.inc rename to data/scripts/script_080095F2.inc index 2e76a019..5b177c6f 100644 --- a/data/scripts/gUnk_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080095F2 +SCRIPT_START script_080095F2 CheckEntityInteractType JumpIfNot 0xffe8 _0807E864 @@ -57,7 +57,7 @@ JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08009704 +StartPlayerScript script_08009704 WaitForSomething2 0x00000001 SoundReq 0x0111 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/script_08009704.inc similarity index 90% rename from data/scripts/gUnk_08009704.inc rename to data/scripts/script_08009704.inc index f2dbe820..0738cbac 100644 --- a/data/scripts/gUnk_08009704.inc +++ b/data/scripts/script_08009704.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009704 +SCRIPT_START script_08009704 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0001 _0807EDD4 0x01a0, 0x01b0 diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/script_08009740.inc similarity index 91% rename from data/scripts/gUnk_08009740.inc rename to data/scripts/script_08009740.inc index 5f523eef..f443adb3 100644 --- a/data/scripts/gUnk_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009740 +SCRIPT_START script_08009740 StartScript Call sub_08065D00 _0807EB44 0x0004 @@ -27,7 +27,7 @@ _0807E8E4_3 Wait 0x0032 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -StartPlayerScript gUnk_0800987C +StartPlayerScript script_0800987C WaitForSomething2 0x00000040 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/script_080097F0.inc similarity index 91% rename from data/scripts/gUnk_080097F0.inc rename to data/scripts/script_080097F0.inc index a6bab11d..98e06831 100644 --- a/data/scripts/gUnk_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080097F0 +SCRIPT_START script_080097F0 StartScript _0807E930 0x0003 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/script_08009838.inc similarity index 90% rename from data/scripts/gUnk_08009838.inc rename to data/scripts/script_08009838.inc index 3c5ae921..9ff46dfd 100644 --- a/data/scripts/gUnk_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009838 +SCRIPT_START script_08009838 StartScript _0807E930 0x0003 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800987C.inc b/data/scripts/script_0800987C.inc similarity index 92% rename from data/scripts/gUnk_0800987C.inc rename to data/scripts/script_0800987C.inc index 85662f4e..92c1e4f4 100644 --- a/data/scripts/gUnk_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800987C +SCRIPT_START script_0800987C SoundReq 0x007a _0807EB44 0x0004 SoundReq 0x0086 diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/script_080098D4.inc similarity index 91% rename from data/scripts/gUnk_080098D4.inc rename to data/scripts/script_080098D4.inc index ef2ea423..0f027694 100644 --- a/data/scripts/gUnk_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080098D4 +SCRIPT_START script_080098D4 StartScript StopScript CheckGlobalFlag 0x0020 diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/script_08009918.inc similarity index 88% rename from data/scripts/gUnk_08009918.inc rename to data/scripts/script_08009918.inc index e029d341..1722df97 100644 --- a/data/scripts/gUnk_08009918.inc +++ b/data/scripts/script_08009918.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009918 +SCRIPT_START script_08009918 StartScript Call sub_0807DF28 _0807E864 diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/script_08009950.inc similarity index 95% rename from data/scripts/gUnk_08009950.inc rename to data/scripts/script_08009950.inc index c4f64c1e..3ac1419c 100644 --- a/data/scripts/gUnk_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009950 +SCRIPT_START script_08009950 StartScript Call sub_0807F348 SetEntityNonPlanarMovement 0x0040 diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/script_080099DC.inc similarity index 93% rename from data/scripts/gUnk_080099DC.inc rename to data/scripts/script_080099DC.inc index d8d125c3..30916b9d 100644 --- a/data/scripts/gUnk_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080099DC +SCRIPT_START script_080099DC StartScript Call sub_0807F348 SetEntityNonPlanarMovement 0x00c0 diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/script_08009A34.inc similarity index 91% rename from data/scripts/gUnk_08009A34.inc rename to data/scripts/script_08009A34.inc index a75ff516..cc58658e 100644 --- a/data/scripts/gUnk_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009A34 +SCRIPT_START script_08009A34 Wait 0x003c Call sub_08066258 Wait 0x001e diff --git a/data/scripts/gUnk_08009A84.inc b/data/scripts/script_08009A84.inc similarity index 95% rename from data/scripts/gUnk_08009A84.inc rename to data/scripts/script_08009A84.inc index f082bf1f..f5aabb94 100644 --- a/data/scripts/gUnk_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009A84 +SCRIPT_START script_08009A84 StartScript SetEntityPositionRelative 0x011001e8 SetEntityNonPlanarMovement 0x00c0 diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/script_08009AF8.inc similarity index 89% rename from data/scripts/gUnk_08009AF8.inc rename to data/scripts/script_08009AF8.inc index ebcae1d4..1c416468 100644 --- a/data/scripts/gUnk_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009AF8 +SCRIPT_START script_08009AF8 StartScript StopScript WaitForSomething2 0x00000010 diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/script_08009B30.inc similarity index 90% rename from data/scripts/gUnk_08009B30.inc rename to data/scripts/script_08009B30.inc index 4edd60e8..ec9af874 100644 --- a/data/scripts/gUnk_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009B30 +SCRIPT_START script_08009B30 StartScript Call sub_0807DF28 _0807E864 diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/script_08009B78.inc similarity index 94% rename from data/scripts/gUnk_08009B78.inc rename to data/scripts/script_08009B78.inc index 7ba8eafb..a7450ecf 100644 --- a/data/scripts/gUnk_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009B78 +SCRIPT_START script_08009B78 StartScript _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0080 @@ -10,7 +10,7 @@ JumpIf 0x00ba _0807E888 Wait 0x000a _0807E864 -StartPlayerScript gUnk_08009CFC +StartPlayerScript script_08009CFC Call sub_0807DF28 WaitForSomething2 0x00000008 _0807EDD4 0x0080, 0x005c diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/script_08009C68.inc similarity index 95% rename from data/scripts/gUnk_08009C68.inc rename to data/scripts/script_08009C68.inc index 6d6a4d03..4dfe4771 100644 --- a/data/scripts/gUnk_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009C68 +SCRIPT_START script_08009C68 StartScript _0807EB44 0x0002 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/gUnk_08009CFC.inc b/data/scripts/script_08009CFC.inc similarity index 94% rename from data/scripts/gUnk_08009CFC.inc rename to data/scripts/script_08009CFC.inc index a9564043..e096f627 100644 --- a/data/scripts/gUnk_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009CFC +SCRIPT_START script_08009CFC StartScript _0807E8E4_1 SetEntityNonPlanarMovement 0x00c0 diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/script_08009D6C.inc similarity index 90% rename from data/scripts/gUnk_08009D6C.inc rename to data/scripts/script_08009D6C.inc index df0e7120..80d89114 100644 --- a/data/scripts/gUnk_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009D6C +SCRIPT_START script_08009D6C StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0006 diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/script_08009DB0.inc similarity index 95% rename from data/scripts/gUnk_08009DB0.inc rename to data/scripts/script_08009DB0.inc index cf4d21a6..32ec35e1 100644 --- a/data/scripts/gUnk_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009DB0 +SCRIPT_START script_08009DB0 StartScript Call sub_0807F348 Call sub_08066288 diff --git a/data/scripts/gUnk_08009E4E.inc b/data/scripts/script_08009E4E.inc similarity index 64% rename from data/scripts/gUnk_08009E4E.inc rename to data/scripts/script_08009E4E.inc index 9430cdc2..6291b750 100644 --- a/data/scripts/gUnk_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009E4E +SCRIPT_START script_08009E4E _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/script_08009E58.inc similarity index 85% rename from data/scripts/gUnk_08009E58.inc rename to data/scripts/script_08009E58.inc index 40af0a02..7b6d0607 100644 --- a/data/scripts/gUnk_08009E58.inc +++ b/data/scripts/script_08009E58.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009E58 +SCRIPT_START script_08009E58 StartScript Call sub_0807DF28 StopScript diff --git a/data/scripts/gUnk_08009E80.inc b/data/scripts/script_08009E80.inc similarity index 63% rename from data/scripts/gUnk_08009E80.inc rename to data/scripts/script_08009E80.inc index b79a8e25..d6fd3b14 100644 --- a/data/scripts/gUnk_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009E80 +SCRIPT_START script_08009E80 StartScript StopScript SCRIPT_END diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/script_08009E88.inc similarity index 90% rename from data/scripts/gUnk_08009E88.inc rename to data/scripts/script_08009E88.inc index f7d12c39..61ff496f 100644 --- a/data/scripts/gUnk_08009E88.inc +++ b/data/scripts/script_08009E88.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009E88 +SCRIPT_START script_08009E88 StartScript Call sub_0807DF28 _0807E864 diff --git a/data/scripts/gUnk_08009ECC.inc b/data/scripts/script_08009ECC.inc similarity index 85% rename from data/scripts/gUnk_08009ECC.inc rename to data/scripts/script_08009ECC.inc index 171776d1..59e47d9a 100644 --- a/data/scripts/gUnk_08009ECC.inc +++ b/data/scripts/script_08009ECC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009ECC +SCRIPT_START script_08009ECC StartScript _0807E914 0x00000002 _0807EF80 0x0001 diff --git a/data/scripts/gUnk_08009EF0.inc b/data/scripts/script_08009EF0.inc similarity index 85% rename from data/scripts/gUnk_08009EF0.inc rename to data/scripts/script_08009EF0.inc index bc7f644a..0800fa63 100644 --- a/data/scripts/gUnk_08009EF0.inc +++ b/data/scripts/script_08009EF0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009EF0 +SCRIPT_START script_08009EF0 StartScript _0807E914 0x00000000 _0807EF80 0x0001 diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/script_08009F14.inc similarity index 96% rename from data/scripts/gUnk_08009F14.inc rename to data/scripts/script_08009F14.inc index 8294c40a..9ec617ac 100644 --- a/data/scripts/gUnk_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08009F14 +SCRIPT_START script_08009F14 StartScript _0807EB44 0x0004 Call sub_08060090 @@ -17,7 +17,7 @@ StopScript _0807E864 Call sub_0807DF28 _0807EF80 0x000b -StartPlayerScript gUnk_0800A088 +StartPlayerScript script_0800A088 WaitForSomething2 0x00000002 Call sub_0806014C TextboxNoOverlapFollowPos 0x00001f01 diff --git a/data/scripts/gUnk_0800A088.inc b/data/scripts/script_0800A088.inc similarity index 87% rename from data/scripts/gUnk_0800A088.inc rename to data/scripts/script_0800A088.inc index e62b573e..f868a306 100644 --- a/data/scripts/gUnk_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A088 +SCRIPT_START script_0800A088 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/script_0800A0B4.inc similarity index 91% rename from data/scripts/gUnk_0800A0B4.inc rename to data/scripts/script_0800A0B4.inc index 92f45a45..ba47f686 100644 --- a/data/scripts/gUnk_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A0B4 +SCRIPT_START script_0800A0B4 StartScript SetEntityNonPlanarMovement 0x0140 _0807E864 diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/script_0800A0FC.inc similarity index 93% rename from data/scripts/gUnk_0800A0FC.inc rename to data/scripts/script_0800A0FC.inc index 26f1620d..6970ec48 100644 --- a/data/scripts/gUnk_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A0FC +SCRIPT_START script_0800A0FC StopScript CheckGlobalFlag 0x0051 JumpIfNot 0xfffa diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/script_0800A160.inc similarity index 92% rename from data/scripts/gUnk_0800A160.inc rename to data/scripts/script_0800A160.inc index 8fb680cc..9016c077 100644 --- a/data/scripts/gUnk_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A160 +SCRIPT_START script_0800A160 StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/script_0800A1B4.inc similarity index 85% rename from data/scripts/gUnk_0800A1B4.inc rename to data/scripts/script_0800A1B4.inc index 6c66905f..bc7b9f02 100644 --- a/data/scripts/gUnk_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A1B4 +SCRIPT_START script_0800A1B4 StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/script_0800A1D8.inc similarity index 95% rename from data/scripts/gUnk_0800A1D8.inc rename to data/scripts/script_0800A1D8.inc index 59fefcec..7b80fe1b 100644 --- a/data/scripts/gUnk_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A1D8 +SCRIPT_START script_0800A1D8 StartScript _0807E864 Call sub_0807DF28 @@ -8,7 +8,7 @@ _0807E8E4_3 CallWithArg sub_0807F75C, 0x00a80088 StopScript Wait 0x003c -StartPlayerScript gUnk_0800A310 +StartPlayerScript script_0800A310 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/script_0800A310.inc similarity index 96% rename from data/scripts/gUnk_0800A310.inc rename to data/scripts/script_0800A310.inc index a5c7dbc1..0e351738 100644 --- a/data/scripts/gUnk_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A310 +SCRIPT_START script_0800A310 StopScript _0807EB44 0x0002 Wait 0x000a diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/script_0800A3D8.inc similarity index 97% rename from data/scripts/gUnk_0800A3D8.inc rename to data/scripts/script_0800A3D8.inc index ac087eda..ffa148db 100644 --- a/data/scripts/gUnk_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A3D8 +SCRIPT_START script_0800A3D8 StartScript SetEntityNonPlanarMovement 0x0100 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/script_0800A500.inc similarity index 95% rename from data/scripts/gUnk_0800A500.inc rename to data/scripts/script_0800A500.inc index 0379d003..3febb687 100644 --- a/data/scripts/gUnk_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A500 +SCRIPT_START script_0800A500 StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/script_0800A590.inc similarity index 95% rename from data/scripts/gUnk_0800A590.inc rename to data/scripts/script_0800A590.inc index f301574d..dfeeb93c 100644 --- a/data/scripts/gUnk_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A590 +SCRIPT_START script_0800A590 StartScript SetEntityNonPlanarMovement 0x0080 SetEntity0x20 0x00000000 diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/script_0800A638.inc similarity index 85% rename from data/scripts/gUnk_0800A638.inc rename to data/scripts/script_0800A638.inc index 66fb4804..b043d489 100644 --- a/data/scripts/gUnk_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A638 +SCRIPT_START script_0800A638 StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/script_0800A65C.inc similarity index 85% rename from data/scripts/gUnk_0800A65C.inc rename to data/scripts/script_0800A65C.inc index 3dca04c0..3bce0abf 100644 --- a/data/scripts/gUnk_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A65C +SCRIPT_START script_0800A65C StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/script_0800A680.inc similarity index 85% rename from data/scripts/gUnk_0800A680.inc rename to data/scripts/script_0800A680.inc index b065e201..a90d2cc0 100644 --- a/data/scripts/gUnk_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A680 +SCRIPT_START script_0800A680 StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/script_0800A6A4.inc similarity index 87% rename from data/scripts/gUnk_0800A6A4.inc rename to data/scripts/script_0800A6A4.inc index f661c904..bf51e73b 100644 --- a/data/scripts/gUnk_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A6A4 +SCRIPT_START script_0800A6A4 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/script_0800A6D4.inc similarity index 87% rename from data/scripts/gUnk_0800A6D4.inc rename to data/scripts/script_0800A6D4.inc index 5e8f1277..9b92c7aa 100644 --- a/data/scripts/gUnk_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A6D4 +SCRIPT_START script_0800A6D4 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/script_0800A704.inc similarity index 87% rename from data/scripts/gUnk_0800A704.inc rename to data/scripts/script_0800A704.inc index 7fe91929..19f20c8c 100644 --- a/data/scripts/gUnk_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A704 +SCRIPT_START script_0800A704 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/script_0800A734.inc similarity index 87% rename from data/scripts/gUnk_0800A734.inc rename to data/scripts/script_0800A734.inc index c54c8c81..17c68b8b 100644 --- a/data/scripts/gUnk_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A734 +SCRIPT_START script_0800A734 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/script_0800A764.inc similarity index 94% rename from data/scripts/gUnk_0800A764.inc rename to data/scripts/script_0800A764.inc index 8a63af09..ab94aa38 100644 --- a/data/scripts/gUnk_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A764 +SCRIPT_START script_0800A764 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/script_0800A7E4.inc similarity index 98% rename from data/scripts/gUnk_0800A7E4.inc rename to data/scripts/script_0800A7E4.inc index d9419cb4..be0e9930 100644 --- a/data/scripts/gUnk_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A7E4 +SCRIPT_START script_0800A7E4 StartScript _0807EF80 0x0007 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/script_0800A964.inc similarity index 84% rename from data/scripts/gUnk_0800A964.inc rename to data/scripts/script_0800A964.inc index 558fb639..f846c8ce 100644 --- a/data/scripts/gUnk_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A964 +SCRIPT_START script_0800A964 StartScript _0807EB44 0x0002 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/script_0800A988.inc similarity index 84% rename from data/scripts/gUnk_0800A988.inc rename to data/scripts/script_0800A988.inc index 9773d029..d3ea7f83 100644 --- a/data/scripts/gUnk_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A988 +SCRIPT_START script_0800A988 StartScript _0807EB44 0x0004 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/script_0800A9AC.inc similarity index 84% rename from data/scripts/gUnk_0800A9AC.inc rename to data/scripts/script_0800A9AC.inc index 75aafcd7..6c25b9fb 100644 --- a/data/scripts/gUnk_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A9AC +SCRIPT_START script_0800A9AC StartScript _0807EB44 0x0000 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/script_0800A9D0.inc similarity index 84% rename from data/scripts/gUnk_0800A9D0.inc rename to data/scripts/script_0800A9D0.inc index d70c742c..3377620d 100644 --- a/data/scripts/gUnk_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A9D0 +SCRIPT_START script_0800A9D0 StartScript _0807EB44 0x0006 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/script_0800A9F4.inc similarity index 91% rename from data/scripts/gUnk_0800A9F4.inc rename to data/scripts/script_0800A9F4.inc index c400bba7..a6864ba4 100644 --- a/data/scripts/gUnk_0800A9F4.inc +++ b/data/scripts/script_0800A9F4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800A9F4 +SCRIPT_START script_0800A9F4 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/script_0800AA48.inc similarity index 84% rename from data/scripts/gUnk_0800AA48.inc rename to data/scripts/script_0800AA48.inc index c4e7fb14..23c9fba2 100644 --- a/data/scripts/gUnk_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AA48 +SCRIPT_START script_0800AA48 StartScript _0807EB44 0x0002 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/script_0800AA6C.inc similarity index 84% rename from data/scripts/gUnk_0800AA6C.inc rename to data/scripts/script_0800AA6C.inc index d9166bb5..99b9ab72 100644 --- a/data/scripts/gUnk_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AA6C +SCRIPT_START script_0800AA6C StartScript _0807EB44 0x0004 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/script_0800AA90.inc similarity index 84% rename from data/scripts/gUnk_0800AA90.inc rename to data/scripts/script_0800AA90.inc index 3f08f7c6..061b6c07 100644 --- a/data/scripts/gUnk_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AA90 +SCRIPT_START script_0800AA90 StartScript _0807EB44 0x0000 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/script_0800AAB4.inc similarity index 84% rename from data/scripts/gUnk_0800AAB4.inc rename to data/scripts/script_0800AAB4.inc index 5af49a63..ea0202f5 100644 --- a/data/scripts/gUnk_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AAB4 +SCRIPT_START script_0800AAB4 StartScript _0807EB44 0x0006 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/script_0800AAD8.inc similarity index 87% rename from data/scripts/gUnk_0800AAD8.inc rename to data/scripts/script_0800AAD8.inc index 38f1dd36..b497ebf8 100644 --- a/data/scripts/gUnk_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AAD8 +SCRIPT_START script_0800AAD8 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/script_0800AB08.inc similarity index 93% rename from data/scripts/gUnk_0800AB08.inc rename to data/scripts/script_0800AB08.inc index 22ec174f..c7bb0b85 100644 --- a/data/scripts/gUnk_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AB08 +SCRIPT_START script_0800AB08 StartScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/script_0800AB6E.inc similarity index 91% rename from data/scripts/gUnk_0800AB6E.inc rename to data/scripts/script_0800AB6E.inc index 3374e09b..6a996a20 100644 --- a/data/scripts/gUnk_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AB6E +SCRIPT_START script_0800AB6E Call sub_0808D2CC _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -15,7 +15,7 @@ _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x000e165f _0807EA94 -StartPlayerScript gUnk_0800ACBC +StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 TextboxNoOverlapFollowPos 0x000e1660 _0807EA94 @@ -29,7 +29,7 @@ WaitForSomething2 0x00000004 SetEntityPosition 0x0000, 0x0020 Call sub_0807F5C0 WaitForSomething2 0x00000010 -StartPlayerScript gUnk_0800ACE0 +StartPlayerScript script_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c TextboxNoOverlapFollowPos 0x000e1662 @@ -42,7 +42,7 @@ _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -StartPlayerScript gUnk_0800AD54 +StartPlayerScript script_0800AD54 WaitForSomething2 0x00000001 Wait 0x003c TextboxNoOverlapFollowPos 0x000e1665 diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/script_0800ACBC.inc similarity index 85% rename from data/scripts/gUnk_0800ACBC.inc rename to data/scripts/script_0800ACBC.inc index 07f8d2d2..1926462e 100644 --- a/data/scripts/gUnk_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800ACBC +SCRIPT_START script_0800ACBC StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/script_0800ACE0.inc similarity index 93% rename from data/scripts/gUnk_0800ACE0.inc rename to data/scripts/script_0800ACE0.inc index 2035165c..af37423e 100644 --- a/data/scripts/gUnk_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800ACE0 +SCRIPT_START script_0800ACE0 StartScript Call sub_08094BE0 CallWithArg sub_0807F238, 0x0000045b diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/script_0800AD54.inc similarity index 97% rename from data/scripts/gUnk_0800AD54.inc rename to data/scripts/script_0800AD54.inc index 129ae24b..1284344a 100644 --- a/data/scripts/gUnk_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AD54 +SCRIPT_START script_0800AD54 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0800AEA4.inc b/data/scripts/script_0800AEA4.inc similarity index 90% rename from data/scripts/gUnk_0800AEA4.inc rename to data/scripts/script_0800AEA4.inc index 0f292006..13a61d5a 100644 --- a/data/scripts/gUnk_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AEA4 +SCRIPT_START script_0800AEA4 StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/script_0800AEDC.inc similarity index 90% rename from data/scripts/gUnk_0800AEDC.inc rename to data/scripts/script_0800AEDC.inc index d8650582..ea9dca91 100644 --- a/data/scripts/gUnk_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AEDC +SCRIPT_START script_0800AEDC StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/script_0800AF18.inc similarity index 87% rename from data/scripts/gUnk_0800AF18.inc rename to data/scripts/script_0800AF18.inc index a786d6d5..f70c8253 100644 --- a/data/scripts/gUnk_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AF18 +SCRIPT_START script_0800AF18 StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/script_0800AF44.inc similarity index 84% rename from data/scripts/gUnk_0800AF44.inc rename to data/scripts/script_0800AF44.inc index ebfa32bc..cdd41a9b 100644 --- a/data/scripts/gUnk_0800AF44.inc +++ b/data/scripts/script_0800AF44.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AF44 +SCRIPT_START script_0800AF44 _0807E864 Call sub_0807DF28 _0807EB28 0x1c01 diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/script_0800AF68.inc similarity index 84% rename from data/scripts/gUnk_0800AF68.inc rename to data/scripts/script_0800AF68.inc index 6739a6fa..ed9ca2e7 100644 --- a/data/scripts/gUnk_0800AF68.inc +++ b/data/scripts/script_0800AF68.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AF68 +SCRIPT_START script_0800AF68 _0807E864 Call sub_0807DF28 _0807EB28 0x1c02 diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/script_0800AF8C.inc similarity index 84% rename from data/scripts/gUnk_0800AF8C.inc rename to data/scripts/script_0800AF8C.inc index 9704c881..3801e06a 100644 --- a/data/scripts/gUnk_0800AF8C.inc +++ b/data/scripts/script_0800AF8C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AF8C +SCRIPT_START script_0800AF8C _0807E864 Call sub_0807DF28 _0807EB28 0x1c03 diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/script_0800AFB0.inc similarity index 90% rename from data/scripts/gUnk_0800AFB0.inc rename to data/scripts/script_0800AFB0.inc index 123fb79d..ff669eb8 100644 --- a/data/scripts/gUnk_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AFB0 +SCRIPT_START script_0800AFB0 _0807E864 StopScript StartScript diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/script_0800AFE8.inc similarity index 84% rename from data/scripts/gUnk_0800AFE8.inc rename to data/scripts/script_0800AFE8.inc index c150d8e0..51206f3e 100644 --- a/data/scripts/gUnk_0800AFE8.inc +++ b/data/scripts/script_0800AFE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800AFE8 +SCRIPT_START script_0800AFE8 _0807E864 Call sub_0807DF28 _0807EB28 0x1c05 diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/script_0800B00C.inc similarity index 96% rename from data/scripts/gUnk_0800B00C.inc rename to data/scripts/script_0800B00C.inc index 8bc5453a..7ff71558 100644 --- a/data/scripts/gUnk_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B00C +SCRIPT_START script_0800B00C StartScript Call sub_0807F934 Call sub_080A2124 diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/script_0800B0AC.inc similarity index 83% rename from data/scripts/gUnk_0800B0AC.inc rename to data/scripts/script_0800B0AC.inc index e1547c6c..e6cc09c3 100644 --- a/data/scripts/gUnk_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B0AC +SCRIPT_START script_0800B0AC StopScript _0807E864 Call sub_0807FA40 diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/script_0800B0D0.inc similarity index 93% rename from data/scripts/gUnk_0800B0D0.inc rename to data/scripts/script_0800B0D0.inc index ec5f10f9..12d9570c 100644 --- a/data/scripts/gUnk_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B0D0 +SCRIPT_START script_0800B0D0 StartScript Call sub_0806BCD4 _0807EF80 0x000a @@ -38,7 +38,7 @@ SetLocalFlag 0x0039 _0807E864 StopScript WaitForPlayerAction0x17 -StartPlayerScript gUnk_0800B1C0 +StartPlayerScript script_0800B1C0 Wait 0x0018 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/script_0800B1C0.inc similarity index 90% rename from data/scripts/gUnk_0800B1C0.inc rename to data/scripts/script_0800B1C0.inc index 3e39444b..442229d5 100644 --- a/data/scripts/gUnk_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B1C0 +SCRIPT_START script_0800B1C0 StartScript _0807EF80 0x0000 StopScript diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/script_0800B200.inc similarity index 93% rename from data/scripts/gUnk_0800B200.inc rename to data/scripts/script_0800B200.inc index 8d16d2c1..f892c31b 100644 --- a/data/scripts/gUnk_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B200 +SCRIPT_START script_0800B200 StartScript _0807E5F8 0x00000000 CheckLocalFlag 0x001d diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/script_0800B254.inc similarity index 96% rename from data/scripts/gUnk_0800B254.inc rename to data/scripts/script_0800B254.inc index 1289c7c0..9aace125 100644 --- a/data/scripts/gUnk_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B254 +SCRIPT_START script_0800B254 StartScript CheckKinstoneFused 0x0006 JumpIf 0x00a6 diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/script_0800B308.inc similarity index 96% rename from data/scripts/gUnk_0800B308.inc rename to data/scripts/script_0800B308.inc index f458ccdd..33df9d9f 100644 --- a/data/scripts/gUnk_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B308 +SCRIPT_START script_0800B308 StartScript CheckLocalFlag 0x001d JumpIf 0x008c diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/script_0800B3A4.inc similarity index 93% rename from data/scripts/gUnk_0800B3A4.inc rename to data/scripts/script_0800B3A4.inc index 41d353f6..ea436ed6 100644 --- a/data/scripts/gUnk_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B3A4 +SCRIPT_START script_0800B3A4 StartScript _0807EF80 0x000a Call sub_0807F158 diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/script_0800B41C.inc similarity index 90% rename from data/scripts/gUnk_0800B41C.inc rename to data/scripts/script_0800B41C.inc index 19baa293..30682a8f 100644 --- a/data/scripts/gUnk_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B41C +SCRIPT_START script_0800B41C StartScript SetEntityNonPlanarMovement 0x00c0 _0807E908 0x0001 @@ -9,7 +9,7 @@ StopScript Wait 0x000a _0807EF80 0x0004 _0807E5F8 0x00000008 -StartPlayerScript gUnk_0800B54C +StartPlayerScript script_0800B54C _0807EDD4 0x0140, 0x0298 _0807EB74 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/script_0800B4AC.inc similarity index 96% rename from data/scripts/gUnk_0800B4AC.inc rename to data/scripts/script_0800B4AC.inc index cf57eb4f..76de2d08 100644 --- a/data/scripts/gUnk_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B4AC +SCRIPT_START script_0800B4AC StartScript _0807EF80 0x000a _0807EF80 0x0001 diff --git a/data/scripts/gUnk_0800B54C.inc b/data/scripts/script_0800B54C.inc similarity index 86% rename from data/scripts/gUnk_0800B54C.inc rename to data/scripts/script_0800B54C.inc index 2df8c531..3b05f7c3 100644 --- a/data/scripts/gUnk_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B54C +SCRIPT_START script_0800B54C StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/script_0800B574.inc similarity index 92% rename from data/scripts/gUnk_0800B574.inc rename to data/scripts/script_0800B574.inc index c63c2a13..30a3e55d 100644 --- a/data/scripts/gUnk_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B574 +SCRIPT_START script_0800B574 StartScript _0807EF80 0x0007 CheckGlobalFlag 0x001d diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/script_0800B5C4.inc similarity index 86% rename from data/scripts/gUnk_0800B5C4.inc rename to data/scripts/script_0800B5C4.inc index e834cb3c..e793ed91 100644 --- a/data/scripts/gUnk_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B5C4 +SCRIPT_START script_0800B5C4 StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/script_0800B5EC.inc similarity index 93% rename from data/scripts/gUnk_0800B5EC.inc rename to data/scripts/script_0800B5EC.inc index 9c5c030b..8f54c1ac 100644 --- a/data/scripts/gUnk_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B5EC +SCRIPT_START script_0800B5EC StartScript _0807EF80 0x000a _0807EF80 0x0001 @@ -20,7 +20,7 @@ JumpIfNot 0xfff6 Call sub_08079184 _0807E864 Call sub_0807F9A4 -StartPlayerScript gUnk_0800B7C4 +StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/script_0800B6C8.inc similarity index 91% rename from data/scripts/gUnk_0800B6C8.inc rename to data/scripts/script_0800B6C8.inc index e097eff5..b2cd2eee 100644 --- a/data/scripts/gUnk_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B6C8 +SCRIPT_START script_0800B6C8 StartScript StopScript HasRupees 0x0001 @@ -8,7 +8,7 @@ JumpIfNot 0xfff6 Call sub_08079184 _0807E864 Call sub_0807F9A4 -StartPlayerScript gUnk_0800B7C4 +StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 @@ -31,7 +31,7 @@ Call sub_08079184 _0807E864 Wait 0x000a Call sub_0807F9A4 -StartPlayerScript gUnk_0800B7C4 +StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/script_0800B7C4.inc similarity index 89% rename from data/scripts/gUnk_0800B7C4.inc rename to data/scripts/script_0800B7C4.inc index 265c2296..d57fd547 100644 --- a/data/scripts/gUnk_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B7C4 +SCRIPT_START script_0800B7C4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/script_0800B7FC.inc similarity index 86% rename from data/scripts/gUnk_0800B7FC.inc rename to data/scripts/script_0800B7FC.inc index ead30119..c8482b71 100644 --- a/data/scripts/gUnk_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B7FC +SCRIPT_START script_0800B7FC CallWithArg sub_0807F4F8, 0x00000090 CallWithArg sub_0807F464, 0x00000078 Jump 0xffdc diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/script_0800B828.inc similarity index 98% rename from data/scripts/gUnk_0800B828.inc rename to data/scripts/script_0800B828.inc index 3ef1e795..1128e712 100644 --- a/data/scripts/gUnk_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B828 +SCRIPT_START script_0800B828 StartScript _0807E9D4 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/script_0800B9B4.inc similarity index 97% rename from data/scripts/gUnk_0800B9B4.inc rename to data/scripts/script_0800B9B4.inc index 524e72eb..3714f88c 100644 --- a/data/scripts/gUnk_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800B9B4 +SCRIPT_START script_0800B9B4 StartScript _0807E9D4 Call sub_080694EC diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/script_0800BACC.inc similarity index 88% rename from data/scripts/gUnk_0800BACC.inc rename to data/scripts/script_0800BACC.inc index 6272a549..3c95fe68 100644 --- a/data/scripts/gUnk_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BACC +SCRIPT_START script_0800BACC StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/script_0800BB00.inc similarity index 87% rename from data/scripts/gUnk_0800BB00.inc rename to data/scripts/script_0800BB00.inc index 46718d40..6032796c 100644 --- a/data/scripts/gUnk_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BB00 +SCRIPT_START script_0800BB00 StartScript StopScript CheckRoomFlag 0x00ff diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/script_0800BB30.inc similarity index 88% rename from data/scripts/gUnk_0800BB30.inc rename to data/scripts/script_0800BB30.inc index 75b33cd3..0bd31198 100644 --- a/data/scripts/gUnk_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BB30 +SCRIPT_START script_0800BB30 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/script_0800BB64.inc similarity index 90% rename from data/scripts/gUnk_0800BB64.inc rename to data/scripts/script_0800BB64.inc index 68c8f716..56fc79fd 100644 --- a/data/scripts/gUnk_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BB64 +SCRIPT_START script_0800BB64 StartScript _0807EB44 0x0006 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/script_0800BBA4.inc similarity index 89% rename from data/scripts/gUnk_0800BBA4.inc rename to data/scripts/script_0800BBA4.inc index b8dbcbc1..6e72f1f0 100644 --- a/data/scripts/gUnk_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BBA4 +SCRIPT_START script_0800BBA4 StartScript _0807EF80 0x0007 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/script_0800BBDC.inc similarity index 87% rename from data/scripts/gUnk_0800BBDC.inc rename to data/scripts/script_0800BBDC.inc index 1ddfba44..3f3ea682 100644 --- a/data/scripts/gUnk_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BBDC +SCRIPT_START script_0800BBDC StartScript _0807E930 0x0000 StopScript diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/script_0800BC08.inc similarity index 91% rename from data/scripts/gUnk_0800BC08.inc rename to data/scripts/script_0800BC08.inc index dd0f2045..181a22c4 100644 --- a/data/scripts/gUnk_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BC08 +SCRIPT_START script_0800BC08 StartScript _0807EF80 0x0007 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/script_0800BC50.inc similarity index 95% rename from data/scripts/gUnk_0800BC50.inc rename to data/scripts/script_0800BC50.inc index cc87ed6a..188a1616 100644 --- a/data/scripts/gUnk_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BC50 +SCRIPT_START script_0800BC50 StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/script_0800BCE8.inc similarity index 95% rename from data/scripts/gUnk_0800BCE8.inc rename to data/scripts/script_0800BCE8.inc index a195d56b..d1e4c324 100644 --- a/data/scripts/gUnk_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BCE8 +SCRIPT_START script_0800BCE8 StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/script_0800BD78.inc similarity index 96% rename from data/scripts/gUnk_0800BD78.inc rename to data/scripts/script_0800BD78.inc index f9512a8b..5c08c0b5 100644 --- a/data/scripts/gUnk_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BD78 +SCRIPT_START script_0800BD78 StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/script_0800BE1C.inc similarity index 96% rename from data/scripts/gUnk_0800BE1C.inc rename to data/scripts/script_0800BE1C.inc index 155950cb..4c4db21b 100644 --- a/data/scripts/gUnk_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BE1C +SCRIPT_START script_0800BE1C StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/script_0800BECC.inc similarity index 94% rename from data/scripts/gUnk_0800BECC.inc rename to data/scripts/script_0800BECC.inc index 5653d2f6..40e3dcd9 100644 --- a/data/scripts/gUnk_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BECC +SCRIPT_START script_0800BECC StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/script_0800BF38.inc similarity index 96% rename from data/scripts/gUnk_0800BF38.inc rename to data/scripts/script_0800BF38.inc index dcb3c012..34693099 100644 --- a/data/scripts/gUnk_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800BF38 +SCRIPT_START script_0800BF38 StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/script_0800C004.inc similarity index 96% rename from data/scripts/gUnk_0800C004.inc rename to data/scripts/script_0800C004.inc index 01cad189..1e63525f 100644 --- a/data/scripts/gUnk_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C004 +SCRIPT_START script_0800C004 StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/script_0800C0B0.inc similarity index 96% rename from data/scripts/gUnk_0800C0B0.inc rename to data/scripts/script_0800C0B0.inc index 166e24ee..2e646766 100644 --- a/data/scripts/gUnk_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C0B0 +SCRIPT_START script_0800C0B0 StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/script_0800C160.inc similarity index 94% rename from data/scripts/gUnk_0800C160.inc rename to data/scripts/script_0800C160.inc index 640e28e1..67ec144b 100644 --- a/data/scripts/gUnk_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C160 +SCRIPT_START script_0800C160 StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/script_0800C1D8.inc similarity index 96% rename from data/scripts/gUnk_0800C1D8.inc rename to data/scripts/script_0800C1D8.inc index 3cfce57e..196042c1 100644 --- a/data/scripts/gUnk_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C1D8 +SCRIPT_START script_0800C1D8 StartScript _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/script_0800C2A4.inc similarity index 96% rename from data/scripts/gUnk_0800C2A4.inc rename to data/scripts/script_0800C2A4.inc index 633ecb99..04f24c22 100644 --- a/data/scripts/gUnk_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C2A4 +SCRIPT_START script_0800C2A4 StartScript _0807EB44 0x0000 _0807E930 0x0000 diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/script_0800C350.inc similarity index 84% rename from data/scripts/gUnk_0800C350.inc rename to data/scripts/script_0800C350.inc index ca845fcd..5f92a5d0 100644 --- a/data/scripts/gUnk_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C350 +SCRIPT_START script_0800C350 StartScript CallWithArg sub_0806D658, 0x00000003 SetEntityNonPlanarMovement 0x0200 diff --git a/data/scripts/gUnk_0800C370.inc b/data/scripts/script_0800C370.inc similarity index 90% rename from data/scripts/gUnk_0800C370.inc rename to data/scripts/script_0800C370.inc index fd5fa9a1..07a55018 100644 --- a/data/scripts/gUnk_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C370 +SCRIPT_START script_0800C370 _0807EEF4 0xfff8, 0x0000 _0807EEF4 0x0010, 0x0000 _0807EEF4 0xfff0, 0x0000 diff --git a/data/scripts/gUnk_0800C3B0.inc b/data/scripts/script_0800C3B0.inc similarity index 81% rename from data/scripts/gUnk_0800C3B0.inc rename to data/scripts/script_0800C3B0.inc index cbcad8ca..dd68e9b7 100644 --- a/data/scripts/gUnk_0800C3B0.inc +++ b/data/scripts/script_0800C3B0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C3B0 +SCRIPT_START script_0800C3B0 SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xff30 _0807F0C8 0x0000, 0x0000 diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/script_0800C3CC.inc similarity index 90% rename from data/scripts/gUnk_0800C3CC.inc rename to data/scripts/script_0800C3CC.inc index 8a08c0f2..407a8d54 100644 --- a/data/scripts/gUnk_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C3CC +SCRIPT_START script_0800C3CC StartScript Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/script_0800C410.inc similarity index 91% rename from data/scripts/gUnk_0800C410.inc rename to data/scripts/script_0800C410.inc index f3ddc136..040b41fc 100644 --- a/data/scripts/gUnk_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C410 +SCRIPT_START script_0800C410 StartScript Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/script_0800C45C.inc similarity index 89% rename from data/scripts/gUnk_0800C45C.inc rename to data/scripts/script_0800C45C.inc index 64c371f7..6fa6a6f0 100644 --- a/data/scripts/gUnk_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C45C +SCRIPT_START script_0800C45C StartScript SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 diff --git a/data/scripts/gUnk_0800C494.inc b/data/scripts/script_0800C494.inc similarity index 90% rename from data/scripts/gUnk_0800C494.inc rename to data/scripts/script_0800C494.inc index e7df7c4a..df3b473b 100644 --- a/data/scripts/gUnk_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C494 +SCRIPT_START script_0800C494 StartScript SetEntityNonPlanarMovement 0x0120 _0807E930 0x0004 diff --git a/data/scripts/gUnk_0800C4D0.inc b/data/scripts/script_0800C4D0.inc similarity index 90% rename from data/scripts/gUnk_0800C4D0.inc rename to data/scripts/script_0800C4D0.inc index e7a1fff9..468dc634 100644 --- a/data/scripts/gUnk_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C4D0 +SCRIPT_START script_0800C4D0 StartScript SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 diff --git a/data/scripts/gUnk_0800C50C.inc b/data/scripts/script_0800C50C.inc similarity index 91% rename from data/scripts/gUnk_0800C50C.inc rename to data/scripts/script_0800C50C.inc index 74c33a3a..583dc207 100644 --- a/data/scripts/gUnk_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C50C +SCRIPT_START script_0800C50C StartScript SetEntityNonPlanarMovement 0x0100 _0807E930 0x0004 diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/script_0800C550.inc similarity index 97% rename from data/scripts/gUnk_0800C550.inc rename to data/scripts/script_0800C550.inc index 0c7ed41f..3bef42e8 100644 --- a/data/scripts/gUnk_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C550 +SCRIPT_START script_0800C550 StartScript Call sub_08060090 _0807EF80 0x000a @@ -84,7 +84,7 @@ JumpIf 0x0022 CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 JumpIfNot 0x0006 _0807EF80 0x000b -StartPlayerScript gUnk_0800C8C8 +StartPlayerScript script_0800C8C8 WaitForSomething2 0x00000001 _0807EF80 0x000a CheckInventory1 0x0040 @@ -157,7 +157,7 @@ StopScript _0807E944 _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_0800C8F0 +StartPlayerScript script_0800C8F0 WaitForSomething2 0x00000001 CheckInventory1 0x0040 JumpIf 0x0088 diff --git a/data/scripts/gUnk_0800C8C8.inc b/data/scripts/script_0800C8C8.inc similarity index 86% rename from data/scripts/gUnk_0800C8C8.inc rename to data/scripts/script_0800C8C8.inc index 5b5a47c8..013c731a 100644 --- a/data/scripts/gUnk_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C8C8 +SCRIPT_START script_0800C8C8 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/script_0800C8F0.inc similarity index 87% rename from data/scripts/gUnk_0800C8F0.inc rename to data/scripts/script_0800C8F0.inc index fb281a40..6f3b500d 100644 --- a/data/scripts/gUnk_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C8F0 +SCRIPT_START script_0800C8F0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/script_0800C91C.inc similarity index 96% rename from data/scripts/gUnk_0800C91C.inc rename to data/scripts/script_0800C91C.inc index ad9c1ae8..d7d4ab75 100644 --- a/data/scripts/gUnk_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800C91C +SCRIPT_START script_0800C91C StartScript _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0300 @@ -8,7 +8,7 @@ JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_0800CA8C +StartPlayerScript script_0800CA8C WaitForSomething2 0x00000002 Wait 0x003c _0807EB28 0x1125 diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/script_0800CA8C.inc similarity index 89% rename from data/scripts/gUnk_0800CA8C.inc rename to data/scripts/script_0800CA8C.inc index 6f440b32..d0fce5fb 100644 --- a/data/scripts/gUnk_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CA8C +SCRIPT_START script_0800CA8C StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/script_0800CABC.inc similarity index 96% rename from data/scripts/gUnk_0800CABC.inc rename to data/scripts/script_0800CABC.inc index 9892c304..a837e4ff 100644 --- a/data/scripts/gUnk_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CABC +SCRIPT_START script_0800CABC StartScript _0807EF80 0x0000 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/script_0800CB54.inc similarity index 95% rename from data/scripts/gUnk_0800CB54.inc rename to data/scripts/script_0800CB54.inc index 4efa72af..6085dce3 100644 --- a/data/scripts/gUnk_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CB54 +SCRIPT_START script_0800CB54 StartScript _0807EF80 0x0000 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/script_0800CBD4.inc similarity index 96% rename from data/scripts/gUnk_0800CBD4.inc rename to data/scripts/script_0800CBD4.inc index 2acff563..0c81901b 100644 --- a/data/scripts/gUnk_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CBD4 +SCRIPT_START script_0800CBD4 StartScript _0807EF80 0x0000 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/script_0800CC6C.inc similarity index 96% rename from data/scripts/gUnk_0800CC6C.inc rename to data/scripts/script_0800CC6C.inc index ebead315..86c9feb5 100644 --- a/data/scripts/gUnk_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CC6C +SCRIPT_START script_0800CC6C StartScript _0807EF80 0x0008 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/script_0800CD04.inc similarity index 95% rename from data/scripts/gUnk_0800CD04.inc rename to data/scripts/script_0800CD04.inc index 638c3e93..7f1351a9 100644 --- a/data/scripts/gUnk_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CD04 +SCRIPT_START script_0800CD04 StartScript _0807EF80 0x0000 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/script_0800CD7C.inc similarity index 95% rename from data/scripts/gUnk_0800CD7C.inc rename to data/scripts/script_0800CD7C.inc index dab50fde..19923a89 100644 --- a/data/scripts/gUnk_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800CD7C +SCRIPT_START script_0800CD7C StartScript CheckInventory1 0x005b JumpIfNot 0xf87a @@ -194,21 +194,21 @@ TextboxNoOverlap 0x1219 Jump 0x014c CheckInventory1 0x0041 JumpIfNot 0x0060 -StartPlayerScript gUnk_0800D190 +StartPlayerScript script_0800D190 WaitForSomething2 0x00000008 _0807EB74 _0807E914 0x00000000 Call sub_0806C028 TextboxNoOverlapFollowPos 0x0002125c _0807EA94 -StartPlayerScript gUnk_0800D1B4 +StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 _0807E914 0x00000000 Call sub_0806C028 Wait 0x000f _0807E5F8 0x00000020 -StartPlayerScript gUnk_0800D1E0 +StartPlayerScript script_0800D1E0 WaitForSomething2 0x00000008 TextboxNoOverlapFollowPos 0x0002125d Jump 0x00e6 @@ -216,7 +216,7 @@ CheckLocalFlag 0x007e JumpIfNot 0x000a TextboxNoOverlapFollow 0x123e Jump 0x00d6 -StartPlayerScript gUnk_0800D190 +StartPlayerScript script_0800D190 WaitForSomething2 0x00000008 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 @@ -227,7 +227,7 @@ _0807E914 0x00000000 Call sub_0806C028 TextboxNoOverlapFollowPos 0x0002123d _0807EA94 -StartPlayerScript gUnk_0800D1B4 +StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 _0807E914 0x00000000 diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/script_0800D190.inc similarity index 85% rename from data/scripts/gUnk_0800D190.inc rename to data/scripts/script_0800D190.inc index e03152f1..0e499a60 100644 --- a/data/scripts/gUnk_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D190 +SCRIPT_START script_0800D190 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/script_0800D1B4.inc similarity index 87% rename from data/scripts/gUnk_0800D1B4.inc rename to data/scripts/script_0800D1B4.inc index e0331c55..04fcc46d 100644 --- a/data/scripts/gUnk_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D1B4 +SCRIPT_START script_0800D1B4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/script_0800D1E0.inc similarity index 88% rename from data/scripts/gUnk_0800D1E0.inc rename to data/scripts/script_0800D1E0.inc index e254626a..94c352f3 100644 --- a/data/scripts/gUnk_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D1E0 +SCRIPT_START script_0800D1E0 _0807F078 0x0002, 0x0001 CallWithArg sub_0807F918, 0x00000002 SoundReq 0x0109 diff --git a/data/scripts/gUnk_0800D218.inc b/data/scripts/script_0800D218.inc similarity index 87% rename from data/scripts/gUnk_0800D218.inc rename to data/scripts/script_0800D218.inc index 2f19e4b4..573f8fc9 100644 --- a/data/scripts/gUnk_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D218 +SCRIPT_START script_0800D218 StartScript CheckInventory1 0x0041 JumpIf 0x002c diff --git a/data/scripts/gUnk_0800D242.inc b/data/scripts/script_0800D242.inc similarity index 60% rename from data/scripts/gUnk_0800D242.inc rename to data/scripts/script_0800D242.inc index 52710175..5cede490 100644 --- a/data/scripts/gUnk_0800D242.inc +++ b/data/scripts/script_0800D242.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D242 +SCRIPT_START script_0800D242 _0807EF80 0x0007 _0807E930 0x0003 SCRIPT_END diff --git a/data/scripts/gUnk_0800D24C.inc b/data/scripts/script_0800D24C.inc similarity index 59% rename from data/scripts/gUnk_0800D24C.inc rename to data/scripts/script_0800D24C.inc index a1c01651..7a7abd8e 100644 --- a/data/scripts/gUnk_0800D24C.inc +++ b/data/scripts/script_0800D24C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D24C +SCRIPT_START script_0800D24C _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D254.inc b/data/scripts/script_0800D254.inc similarity index 85% rename from data/scripts/gUnk_0800D254.inc rename to data/scripts/script_0800D254.inc index 67a6dc70..34b1b5ee 100644 --- a/data/scripts/gUnk_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D254 +SCRIPT_START script_0800D254 StartScript _0807EF80 0x0008 StopScript diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/script_0800D278.inc similarity index 96% rename from data/scripts/gUnk_0800D278.inc rename to data/scripts/script_0800D278.inc index dfc733c1..17624e5e 100644 --- a/data/scripts/gUnk_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D278 +SCRIPT_START script_0800D278 StartScript _0807E9D4 _0807EF80 0x000a @@ -82,7 +82,7 @@ _0807EF80 0x000b SetEntityNonPlanarMovement 0x0100 CheckPlayerInRegion 0x0090, 0x0130, 0x0810 JumpIfNot 0x000e -StartPlayerScript gUnk_0800D3EC +StartPlayerScript script_0800D3EC WaitForSomething2 0x00000001 _0807EB44 0x0002 _0807E930 0x0005 diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/script_0800D3EC.inc similarity index 86% rename from data/scripts/gUnk_0800D3EC.inc rename to data/scripts/script_0800D3EC.inc index d2d514cb..43bde4e8 100644 --- a/data/scripts/gUnk_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D3EC +SCRIPT_START script_0800D3EC StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/script_0800D414.inc similarity index 98% rename from data/scripts/gUnk_0800D414.inc rename to data/scripts/script_0800D414.inc index d6588c40..db5e8a68 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D414 +SCRIPT_START script_0800D414 StartScript SetEntityNonPlanarMovement 0x0100 Call sub_08068104 diff --git a/data/scripts/gUnk_0800D698.inc b/data/scripts/script_0800D698.inc similarity index 80% rename from data/scripts/gUnk_0800D698.inc rename to data/scripts/script_0800D698.inc index 69426176..4164ea12 100644 --- a/data/scripts/gUnk_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D698 +SCRIPT_START script_0800D698 _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/script_0800D6B4.inc similarity index 80% rename from data/scripts/gUnk_0800D6B4.inc rename to data/scripts/script_0800D6B4.inc index 179fbbd5..3752c921 100644 --- a/data/scripts/gUnk_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D6B4 +SCRIPT_START script_0800D6B4 StartScript _0807EF80 0x0007 _0807EF80 0x0011 diff --git a/data/scripts/gUnk_0800D6D0.inc b/data/scripts/script_0800D6D0.inc similarity index 84% rename from data/scripts/gUnk_0800D6D0.inc rename to data/scripts/script_0800D6D0.inc index 0313c541..59addb72 100644 --- a/data/scripts/gUnk_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D6D0 +SCRIPT_START script_0800D6D0 StartScript CheckLocalFlag 0x00f3 JumpIf 0x0010 diff --git a/data/scripts/gUnk_0800D6F0.inc b/data/scripts/script_0800D6F0.inc similarity index 84% rename from data/scripts/gUnk_0800D6F0.inc rename to data/scripts/script_0800D6F0.inc index c3a0aa60..a7d79528 100644 --- a/data/scripts/gUnk_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D6F0 +SCRIPT_START script_0800D6F0 StartScript CheckLocalFlag 0x00f5 JumpIf 0xfff0 diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/script_0800D710.inc similarity index 93% rename from data/scripts/gUnk_0800D710.inc rename to data/scripts/script_0800D710.inc index 815cf2fb..1340fbcc 100644 --- a/data/scripts/gUnk_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D710 +SCRIPT_START script_0800D710 StartScript Call sub_0807F360 SetEntityNonPlanarMovement 0x0700 diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/script_0800D76C.inc similarity index 97% rename from data/scripts/gUnk_0800D76C.inc rename to data/scripts/script_0800D76C.inc index 23fb2160..d4bb04a7 100644 --- a/data/scripts/gUnk_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D76C +SCRIPT_START script_0800D76C StartScript Call sub_0807F360 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800D84C.inc b/data/scripts/script_0800D84C.inc similarity index 85% rename from data/scripts/gUnk_0800D84C.inc rename to data/scripts/script_0800D84C.inc index 8788dae9..bb06e896 100644 --- a/data/scripts/gUnk_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D84C +SCRIPT_START script_0800D84C StartScript StopScript CheckRoomFlag 0x0000 diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/script_0800D874.inc similarity index 92% rename from data/scripts/gUnk_0800D874.inc rename to data/scripts/script_0800D874.inc index c9361960..e569da45 100644 --- a/data/scripts/gUnk_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D874 +SCRIPT_START script_0800D874 StartScript Call sub_0807F934 _0807EF80 0x0008 @@ -11,7 +11,7 @@ _0807E864 Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf 0x000e -StartPlayerScript gUnk_0800D92C +StartPlayerScript script_0800D92C WaitForSomething2 0x00000001 _0807E8E4_0 TextboxNoOverlap 0x1324 diff --git a/data/scripts/gUnk_0800D92C.inc b/data/scripts/script_0800D92C.inc similarity index 86% rename from data/scripts/gUnk_0800D92C.inc rename to data/scripts/script_0800D92C.inc index 2cab83b5..a806a09f 100644 --- a/data/scripts/gUnk_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D92C +SCRIPT_START script_0800D92C StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/script_0800D954.inc similarity index 91% rename from data/scripts/gUnk_0800D954.inc rename to data/scripts/script_0800D954.inc index 1b9aedd3..a77a8092 100644 --- a/data/scripts/gUnk_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800D954 +SCRIPT_START script_0800D954 StartScript _0807EF80 0x0008 Call sub_0807F180 @@ -8,7 +8,7 @@ JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_0800DA00 +StartPlayerScript script_0800DA00 WaitForSomething2 0x00000001 Wait 0x003c _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800DA00.inc b/data/scripts/script_0800DA00.inc similarity index 86% rename from data/scripts/gUnk_0800DA00.inc rename to data/scripts/script_0800DA00.inc index 28b606d6..564c1eb7 100644 --- a/data/scripts/gUnk_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DA00 +SCRIPT_START script_0800DA00 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0800DA28.inc b/data/scripts/script_0800DA28.inc similarity index 89% rename from data/scripts/gUnk_0800DA28.inc rename to data/scripts/script_0800DA28.inc index 9ef7f502..8fdc555e 100644 --- a/data/scripts/gUnk_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DA28 +SCRIPT_START script_0800DA28 StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/script_0800DA60.inc similarity index 96% rename from data/scripts/gUnk_0800DA60.inc rename to data/scripts/script_0800DA60.inc index 9f531b1d..9fc90d46 100644 --- a/data/scripts/gUnk_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DA60 +SCRIPT_START script_0800DA60 StartScript StopScript CheckPlayerInRegion 0x0078, 0x0148, 0x4040 diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/script_0800DB18.inc similarity index 71% rename from data/scripts/gUnk_0800DB18.inc rename to data/scripts/script_0800DB18.inc index 9017228d..db878083 100644 --- a/data/scripts/gUnk_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DB18 +SCRIPT_START script_0800DB18 StartScript _0807EF80 0x000a Call sub_08066E38 diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/script_0800DB28.inc similarity index 92% rename from data/scripts/gUnk_0800DB28.inc rename to data/scripts/script_0800DB28.inc index 03568bd2..f26054bc 100644 --- a/data/scripts/gUnk_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DB28 +SCRIPT_START script_0800DB28 StartScript _0807EF80 0x0007 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/script_0800DB78.inc similarity index 89% rename from data/scripts/gUnk_0800DB78.inc rename to data/scripts/script_0800DB78.inc index 58bdf86f..64ddbba6 100644 --- a/data/scripts/gUnk_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DB78 +SCRIPT_START script_0800DB78 StartScript StopScript CallWithArg sub_0807F6B4, 0x000000a0 @@ -25,12 +25,12 @@ Call sub_0807DF28 Call sub_0804D810 Call sub_0807F3F8 Wait 0x003c -StartPlayerScript gUnk_0800DDD0 +StartPlayerScript script_0800DDD0 WaitForSomething2 0x00000004 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807E5F8 0x00000001 -StartPlayerScript gUnk_0800DE00 +StartPlayerScript script_0800DE00 WaitForSomething2 0x00000006 TextboxNoOverlapFollowPos 0x00021643 _0807EA94 diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/script_0800DC4C.inc similarity index 78% rename from data/scripts/gUnk_0800DC4C.inc rename to data/scripts/script_0800DC4C.inc index 4b03e8d4..6f24dffd 100644 --- a/data/scripts/gUnk_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -1,12 +1,12 @@ -SCRIPT_START gUnk_0800DC4C +SCRIPT_START script_0800DC4C Wait 0x003c SoundReq2 0x0031 -StartPlayerScript gUnk_0800DE50 +StartPlayerScript script_0800DE50 WaitForSomething2 0x00000006 _0807EB28 0x1646 _0807EA94 _0807E5F8 0x00000001 -StartPlayerScript gUnk_0800DE2C +StartPlayerScript script_0800DE2C CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/script_0800DCAC.inc similarity index 97% rename from data/scripts/gUnk_0800DCAC.inc rename to data/scripts/script_0800DCAC.inc index 9d75a955..720d8db0 100644 --- a/data/scripts/gUnk_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DCAC +SCRIPT_START script_0800DCAC StartScript _0807EF80 0x000a Call sub_08066E38 diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/script_0800DDD0.inc similarity index 88% rename from data/scripts/gUnk_0800DDD0.inc rename to data/scripts/script_0800DDD0.inc index 77bff632..e3b9e05e 100644 --- a/data/scripts/gUnk_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DDD0 +SCRIPT_START script_0800DDD0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/script_0800DE00.inc similarity index 87% rename from data/scripts/gUnk_0800DE00.inc rename to data/scripts/script_0800DE00.inc index 024a0887..14fe1a9a 100644 --- a/data/scripts/gUnk_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DE00 +SCRIPT_START script_0800DE00 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800DE2C.inc b/data/scripts/script_0800DE2C.inc similarity index 85% rename from data/scripts/gUnk_0800DE2C.inc rename to data/scripts/script_0800DE2C.inc index 5e360b27..eb637dbb 100644 --- a/data/scripts/gUnk_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DE2C +SCRIPT_START script_0800DE2C StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/script_0800DE50.inc similarity index 83% rename from data/scripts/gUnk_0800DE50.inc rename to data/scripts/script_0800DE50.inc index e53145c8..0c1bf300 100644 --- a/data/scripts/gUnk_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DE50 +SCRIPT_START script_0800DE50 StopScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/script_0800DE78.inc similarity index 76% rename from data/scripts/gUnk_0800DE78.inc rename to data/scripts/script_0800DE78.inc index 25d1219d..48175b61 100644 --- a/data/scripts/gUnk_0800DE78.inc +++ b/data/scripts/script_0800DE78.inc @@ -1,8 +1,8 @@ -SCRIPT_START gUnk_0800DE78 +SCRIPT_START script_0800DE78 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_0800DEB0 +StartPlayerScript script_0800DEB0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000002 _0807EB28 0x1647 diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/script_0800DEB0.inc similarity index 85% rename from data/scripts/gUnk_0800DEB0.inc rename to data/scripts/script_0800DEB0.inc index 9f9cb7d8..a1dd6d33 100644 --- a/data/scripts/gUnk_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DEB0 +SCRIPT_START script_0800DEB0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/script_0800DED4.inc similarity index 92% rename from data/scripts/gUnk_0800DED4.inc rename to data/scripts/script_0800DED4.inc index 09e1a3d8..f4bcd9eb 100644 --- a/data/scripts/gUnk_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DED4 +SCRIPT_START script_0800DED4 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/script_0800DF24.inc similarity index 95% rename from data/scripts/gUnk_0800DF24.inc rename to data/scripts/script_0800DF24.inc index 133bb63f..fefbdbc5 100644 --- a/data/scripts/gUnk_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DF24 +SCRIPT_START script_0800DF24 StartScript _0807EF80 0x0008 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/script_0800DFB4.inc similarity index 87% rename from data/scripts/gUnk_0800DFB4.inc rename to data/scripts/script_0800DFB4.inc index df19f791..9544ee48 100644 --- a/data/scripts/gUnk_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DFB4 +SCRIPT_START script_0800DFB4 StopScript CheckRoomFlag 0x0001 JumpIfNot 0xfffa diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/script_0800DFE4.inc similarity index 94% rename from data/scripts/gUnk_0800DFE4.inc rename to data/scripts/script_0800DFE4.inc index d0363b58..0f349407 100644 --- a/data/scripts/gUnk_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800DFE4 +SCRIPT_START script_0800DFE4 StartScript Call sub_0807DF28 _0807E864 diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/script_0800E050.inc similarity index 81% rename from data/scripts/gUnk_0800E050.inc rename to data/scripts/script_0800E050.inc index 848c9da0..fde5b354 100644 --- a/data/scripts/gUnk_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E050 +SCRIPT_START script_0800E050 StartScript Call sub_0807DF28 _0807E864 @@ -11,7 +11,7 @@ _0807EA94 SetRoomFlag 0x0000 Wait 0x001e _0807E5F8 0x00000001 -StartPlayerScript gUnk_0800E094 +StartPlayerScript script_0800E094 WaitForSomething2 0x00000002 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_0800E094.inc b/data/scripts/script_0800E094.inc similarity index 86% rename from data/scripts/gUnk_0800E094.inc rename to data/scripts/script_0800E094.inc index 91828c3e..d6e24d18 100644 --- a/data/scripts/gUnk_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E094 +SCRIPT_START script_0800E094 StartScript SetEntityNonPlanarMovement 0x00c0 StopScript diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/script_0800E0BC.inc similarity index 99% rename from data/scripts/gUnk_0800E0BC.inc rename to data/scripts/script_0800E0BC.inc index b28961b6..6ee5d073 100644 --- a/data/scripts/gUnk_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E0BC +SCRIPT_START script_0800E0BC StartScript _0807EB44 0x0004 _0807EF80 0x000a diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/script_0800E504.inc similarity index 90% rename from data/scripts/gUnk_0800E504.inc rename to data/scripts/script_0800E504.inc index 9dac7cfa..9d141143 100644 --- a/data/scripts/gUnk_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E504 +SCRIPT_START script_0800E504 StartScript StopScript CheckLocalFlag 0x007d diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/script_0800E544.inc similarity index 91% rename from data/scripts/gUnk_0800E544.inc rename to data/scripts/script_0800E544.inc index 3b997d96..8c7adb02 100644 --- a/data/scripts/gUnk_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E544 +SCRIPT_START script_0800E544 StartScript StopScript CheckLocalFlag 0x007e diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/script_0800E58C.inc similarity index 88% rename from data/scripts/gUnk_0800E58C.inc rename to data/scripts/script_0800E58C.inc index db10f91a..836c03c6 100644 --- a/data/scripts/gUnk_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E58C +SCRIPT_START script_0800E58C StartScript _0807EF80 0x0007 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0800E5C4.inc b/data/scripts/script_0800E5C4.inc similarity index 76% rename from data/scripts/gUnk_0800E5C4.inc rename to data/scripts/script_0800E5C4.inc index aa2c3204..75392878 100644 --- a/data/scripts/gUnk_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E5C4 +SCRIPT_START script_0800E5C4 StartScript CheckLocalFlag 0x0086 JumpIfNot 0x000a diff --git a/data/scripts/gUnk_0800E5D6.inc b/data/scripts/script_0800E5D6.inc similarity index 86% rename from data/scripts/gUnk_0800E5D6.inc rename to data/scripts/script_0800E5D6.inc index 27ed4a61..e09df4d0 100644 --- a/data/scripts/gUnk_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E5D6 +SCRIPT_START script_0800E5D6 StopScript CheckLocalFlag 0x0086 JumpIfNot 0xfffa diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/script_0800E600.inc similarity index 88% rename from data/scripts/gUnk_0800E600.inc rename to data/scripts/script_0800E600.inc index fa047d0e..7a7d199a 100644 --- a/data/scripts/gUnk_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E600 +SCRIPT_START script_0800E600 StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0000 diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/script_0800E62C.inc similarity index 88% rename from data/scripts/gUnk_0800E62C.inc rename to data/scripts/script_0800E62C.inc index b2267bf5..2c383dd8 100644 --- a/data/scripts/gUnk_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E62C +SCRIPT_START script_0800E62C StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0008 diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/script_0800E658.inc similarity index 88% rename from data/scripts/gUnk_0800E658.inc rename to data/scripts/script_0800E658.inc index f51cd3cf..618409df 100644 --- a/data/scripts/gUnk_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E658 +SCRIPT_START script_0800E658 StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0010 diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/script_0800E684.inc similarity index 88% rename from data/scripts/gUnk_0800E684.inc rename to data/scripts/script_0800E684.inc index d59676bc..f89e6a52 100644 --- a/data/scripts/gUnk_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E684 +SCRIPT_START script_0800E684 StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0018 diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/script_0800E6B0.inc similarity index 98% rename from data/scripts/gUnk_0800E6B0.inc rename to data/scripts/script_0800E6B0.inc index c8156250..8dfc9375 100644 --- a/data/scripts/gUnk_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E6B0 +SCRIPT_START script_0800E6B0 StartScript Call sub_08060090 _0807EF80 0x000a diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/script_0800E8A4.inc similarity index 89% rename from data/scripts/gUnk_0800E8A4.inc rename to data/scripts/script_0800E8A4.inc index d78226ec..eae4041a 100644 --- a/data/scripts/gUnk_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E8A4 +SCRIPT_START script_0800E8A4 StartScript TextboxNoOverlapFollow 0x4504 CallWithArg sub_0807F854, 0x000100c8 diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/script_0800E8D6.inc similarity index 89% rename from data/scripts/gUnk_0800E8D6.inc rename to data/scripts/script_0800E8D6.inc index 1861c260..1c9221a8 100644 --- a/data/scripts/gUnk_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E8D6 +SCRIPT_START script_0800E8D6 StartScript TextboxNoOverlapFollow 0x4503 CallWithArg sub_0807F854, 0x00010032 diff --git a/data/scripts/gUnk_0800E908.inc b/data/scripts/script_0800E908.inc similarity index 91% rename from data/scripts/gUnk_0800E908.inc rename to data/scripts/script_0800E908.inc index 026b595b..f1bc6922 100644 --- a/data/scripts/gUnk_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E908 +SCRIPT_START script_0800E908 TextboxNoOverlapFollow 0x4507 Jump 0x0006 TextboxNoOverlapFollow 0x4509 @@ -40,7 +40,7 @@ Call sub_0806B260 JumpIfNot 0x0052 _0807EA94 _0807EF80 0x000b -StartPlayerScript gUnk_0800E9F4 +StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 _0807EF80 0x000a TextboxNoOverlapFollow 0x4a24 @@ -50,7 +50,7 @@ Wait 0x0014 TextboxNoOverlapFollow 0x4a25 _0807EA94 _0807E930 0x0000 -StartPlayerScript gUnk_0800EA1C +StartPlayerScript script_0800EA1C WaitForSomething2 0x00000001 SetLocalFlag 0x0074 SoundReq 0x0072 diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/script_0800E9F4.inc similarity index 86% rename from data/scripts/gUnk_0800E9F4.inc rename to data/scripts/script_0800E9F4.inc index 029ea843..4886ddca 100644 --- a/data/scripts/gUnk_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800E9F4 +SCRIPT_START script_0800E9F4 StartScript _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/script_0800EA1C.inc similarity index 88% rename from data/scripts/gUnk_0800EA1C.inc rename to data/scripts/script_0800EA1C.inc index 49a32db0..90231e22 100644 --- a/data/scripts/gUnk_0800EA1C.inc +++ b/data/scripts/script_0800EA1C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800EA1C +SCRIPT_START script_0800EA1C _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x0014 diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/script_0800EA54.inc similarity index 99% rename from data/scripts/gUnk_0800EA54.inc rename to data/scripts/script_0800EA54.inc index 4abce151..aa15a6e9 100644 --- a/data/scripts/gUnk_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800EA54 +SCRIPT_START script_0800EA54 StartScript Call sub_0806CE5C _0807EF80 0x000a diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/script_0800EF40.inc similarity index 86% rename from data/scripts/gUnk_0800EF40.inc rename to data/scripts/script_0800EF40.inc index 6cc675ef..88068427 100644 --- a/data/scripts/gUnk_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800EF40 +SCRIPT_START script_0800EF40 StartScript _0807EF80 0x0007 CheckGlobalFlag 0x001f @@ -11,7 +11,7 @@ CheckLocalFlagByOffset 0x0200, 0x006d JumpIf 0x001e TextboxNoOverlapFollow 0x4d01 _0807EA94 -StartPlayerScript gUnk_0800EF9C +StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 Wait 0x000f _0807E878 diff --git a/data/scripts/gUnk_0800EF9C.inc b/data/scripts/script_0800EF9C.inc similarity index 85% rename from data/scripts/gUnk_0800EF9C.inc rename to data/scripts/script_0800EF9C.inc index 4dbc08f6..f595e913 100644 --- a/data/scripts/gUnk_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800EF9C +SCRIPT_START script_0800EF9C StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/script_0800EFC0.inc similarity index 96% rename from data/scripts/gUnk_0800EFC0.inc rename to data/scripts/script_0800EFC0.inc index 4dbd2466..b9f57673 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800EFC0 +SCRIPT_START script_0800EFC0 StartScript SetEntityNonPlanarMovement 0x0080 _0807E9D4 @@ -50,7 +50,7 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC -StartPlayerScript gUnk_0800F14C +StartPlayerScript script_0800F14C WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/script_0800F14C.inc similarity index 89% rename from data/scripts/gUnk_0800F14C.inc rename to data/scripts/script_0800F14C.inc index d0f0517e..ef9c6782 100644 --- a/data/scripts/gUnk_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F14C +SCRIPT_START script_0800F14C StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/script_0800F184.inc similarity index 91% rename from data/scripts/gUnk_0800F184.inc rename to data/scripts/script_0800F184.inc index f60a8a51..d7085d14 100644 --- a/data/scripts/gUnk_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F184 +SCRIPT_START script_0800F184 StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0008 @@ -33,7 +33,7 @@ _0807EF80 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 -StartPlayerScript gUnk_0800F33C +StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 _0807E878 Jump 0xffbe @@ -48,7 +48,7 @@ _0807EF80 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 -StartPlayerScript gUnk_0800F354 +StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 _0807E878 Jump 0xff7e @@ -63,7 +63,7 @@ _0807EF80 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 -StartPlayerScript gUnk_0800F36C +StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 _0807E878 Jump 0xff3e @@ -78,7 +78,7 @@ _0807EF80 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 -StartPlayerScript gUnk_0800F384 +StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 _0807E878 Jump 0xfefe diff --git a/data/scripts/gUnk_0800F33C.inc b/data/scripts/script_0800F33C.inc similarity index 79% rename from data/scripts/gUnk_0800F33C.inc rename to data/scripts/script_0800F33C.inc index 620fc09f..dc1f6082 100644 --- a/data/scripts/gUnk_0800F33C.inc +++ b/data/scripts/script_0800F33C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F33C +SCRIPT_START script_0800F33C SetEntityNonPlanarMovement 0x0100 _0807EC94 0x0008 _0807E5F8 0x00000400 diff --git a/data/scripts/gUnk_0800F354.inc b/data/scripts/script_0800F354.inc similarity index 79% rename from data/scripts/gUnk_0800F354.inc rename to data/scripts/script_0800F354.inc index c4513f21..5c1f73fc 100644 --- a/data/scripts/gUnk_0800F354.inc +++ b/data/scripts/script_0800F354.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F354 +SCRIPT_START script_0800F354 SetEntityNonPlanarMovement 0x0100 _0807ECF4 0x0008 _0807E5F8 0x00000400 diff --git a/data/scripts/gUnk_0800F36C.inc b/data/scripts/script_0800F36C.inc similarity index 79% rename from data/scripts/gUnk_0800F36C.inc rename to data/scripts/script_0800F36C.inc index 0b05d5ae..bbcf2d2d 100644 --- a/data/scripts/gUnk_0800F36C.inc +++ b/data/scripts/script_0800F36C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F36C +SCRIPT_START script_0800F36C SetEntityNonPlanarMovement 0x0100 _0807ECC4 0x0008 _0807E5F8 0x00000400 diff --git a/data/scripts/gUnk_0800F384.inc b/data/scripts/script_0800F384.inc similarity index 79% rename from data/scripts/gUnk_0800F384.inc rename to data/scripts/script_0800F384.inc index a71b75bf..73715ca6 100644 --- a/data/scripts/gUnk_0800F384.inc +++ b/data/scripts/script_0800F384.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F384 +SCRIPT_START script_0800F384 SetEntityNonPlanarMovement 0x0100 _0807EC64 0x0008 _0807E5F8 0x00000400 diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/script_0800F39C.inc similarity index 96% rename from data/scripts/gUnk_0800F39C.inc rename to data/scripts/script_0800F39C.inc index ad33e0ef..c1b6971f 100644 --- a/data/scripts/gUnk_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F39C +SCRIPT_START script_0800F39C StartScript _0807E9D4 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/script_0800F430.inc similarity index 96% rename from data/scripts/gUnk_0800F430.inc rename to data/scripts/script_0800F430.inc index 94e2ad26..224af45b 100644 --- a/data/scripts/gUnk_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F430 +SCRIPT_START script_0800F430 StartScript _0807E9D4 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/script_0800F4C4.inc similarity index 95% rename from data/scripts/gUnk_0800F4C4.inc rename to data/scripts/script_0800F4C4.inc index d9cf6d3f..b8d07b80 100644 --- a/data/scripts/gUnk_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F4C4 +SCRIPT_START script_0800F4C4 StartScript _0807E9D4 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/script_0800F554.inc similarity index 98% rename from data/scripts/gUnk_0800F554.inc rename to data/scripts/script_0800F554.inc index d256298a..3a838c38 100644 --- a/data/scripts/gUnk_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F554 +SCRIPT_START script_0800F554 StartScript Call sub_08061FE4 _0807E9D4 diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/script_0800F724.inc similarity index 94% rename from data/scripts/gUnk_0800F724.inc rename to data/scripts/script_0800F724.inc index 311f46f9..45a3d14b 100644 --- a/data/scripts/gUnk_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800F724 +SCRIPT_START script_0800F724 StartScript _0807EF80 0x0008 StopScript @@ -15,7 +15,7 @@ Call sub_0807F844 _0807E778 0x0002 DoFade6 WaitFor_2 -StartPlayerScript gUnk_0800FA54 +StartPlayerScript script_0800FA54 _0807E5F8 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x021800c8 @@ -38,7 +38,7 @@ _0807E5F8 0x00000010 WaitForSomething2 0x00000004 _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_0800FA78 +StartPlayerScript script_0800FA78 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -51,7 +51,7 @@ _0807E878 WaitForSomething2 0x00000004 _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_0800FA9C +StartPlayerScript script_0800FA9C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -64,7 +64,7 @@ _0807E878 WaitForSomething2 0x00000004 _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_0800FAC0 +StartPlayerScript script_0800FAC0 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -85,7 +85,7 @@ Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollowPos 0x000e1021 _0807EA94 -StartPlayerScript gUnk_0800FAE4 +StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x025800f0 _0807F0B4 0x0001 CameraTargetEntity diff --git a/data/scripts/gUnk_0800FA54.inc b/data/scripts/script_0800FA54.inc similarity index 86% rename from data/scripts/gUnk_0800FA54.inc rename to data/scripts/script_0800FA54.inc index bf484da1..f6eb72af 100644 --- a/data/scripts/gUnk_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FA54 +SCRIPT_START script_0800FA54 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/script_0800FA78.inc similarity index 85% rename from data/scripts/gUnk_0800FA78.inc rename to data/scripts/script_0800FA78.inc index fa328ab6..51fbf2e9 100644 --- a/data/scripts/gUnk_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FA78 +SCRIPT_START script_0800FA78 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800FA9C.inc b/data/scripts/script_0800FA9C.inc similarity index 85% rename from data/scripts/gUnk_0800FA9C.inc rename to data/scripts/script_0800FA9C.inc index a2e8fc7b..3e15877a 100644 --- a/data/scripts/gUnk_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FA9C +SCRIPT_START script_0800FA9C StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/script_0800FAC0.inc similarity index 85% rename from data/scripts/gUnk_0800FAC0.inc rename to data/scripts/script_0800FAC0.inc index 202b3a20..639b8be9 100644 --- a/data/scripts/gUnk_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FAC0 +SCRIPT_START script_0800FAC0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/script_0800FAE4.inc similarity index 91% rename from data/scripts/gUnk_0800FAE4.inc rename to data/scripts/script_0800FAE4.inc index d0d38459..cd171e2e 100644 --- a/data/scripts/gUnk_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FAE4 +SCRIPT_START script_0800FAE4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_0800FB2C.inc b/data/scripts/script_0800FB2C.inc similarity index 77% rename from data/scripts/gUnk_0800FB2C.inc rename to data/scripts/script_0800FB2C.inc index 28fbe705..469f4278 100644 --- a/data/scripts/gUnk_0800FB2C.inc +++ b/data/scripts/script_0800FB2C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FB2C +SCRIPT_START script_0800FB2C _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/script_0800FB44.inc similarity index 98% rename from data/scripts/gUnk_0800FB44.inc rename to data/scripts/script_0800FB44.inc index a3733e33..829881ce 100644 --- a/data/scripts/gUnk_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FB44 +SCRIPT_START script_0800FB44 StartScript _0807EF80 0x0008 _0807EF80 0x000b diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/script_0800FD0C.inc similarity index 83% rename from data/scripts/gUnk_0800FD0C.inc rename to data/scripts/script_0800FD0C.inc index 76ba4b49..301295b4 100644 --- a/data/scripts/gUnk_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FD0C +SCRIPT_START script_0800FD0C CheckLocalFlag 0x00cd JumpIf 0x003e WaitForSomething2 0x00000010 @@ -10,7 +10,7 @@ _0807E864 Call sub_0807F9A4 TextboxNoOverlapFollowPos 0x00002506 _0807EA94 -StartPlayerScript gUnk_0800FD80 +StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 _0807E878 Jump 0xffcc @@ -20,7 +20,7 @@ _0807E864 Call sub_0807F9A4 TextboxNoOverlapFollowPos 0x0000106c _0807EA94 -StartPlayerScript gUnk_0800FD80 +StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 _0807E878 Jump 0xffd4 diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/script_0800FD80.inc similarity index 83% rename from data/scripts/gUnk_0800FD80.inc rename to data/scripts/script_0800FD80.inc index b01200e6..d78afb7c 100644 --- a/data/scripts/gUnk_0800FD80.inc +++ b/data/scripts/script_0800FD80.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FD80 +SCRIPT_START script_0800FD80 SetEntityNonPlanarMovement 0x0080 _0807EC64 0x0020 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/script_0800FDA0.inc similarity index 98% rename from data/scripts/gUnk_0800FDA0.inc rename to data/scripts/script_0800FDA0.inc index e4a5332f..29f45131 100644 --- a/data/scripts/gUnk_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FDA0 +SCRIPT_START script_0800FDA0 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/script_0800FF18.inc similarity index 93% rename from data/scripts/gUnk_0800FF18.inc rename to data/scripts/script_0800FF18.inc index f7700c6c..eb89f772 100644 --- a/data/scripts/gUnk_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FF18 +SCRIPT_START script_0800FF18 StartScript CheckInventory1 0x0012 JumpIf 0x004a diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/script_0800FF74.inc similarity index 98% rename from data/scripts/gUnk_0800FF74.inc rename to data/scripts/script_0800FF74.inc index e1cff739..f48107eb 100644 --- a/data/scripts/gUnk_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0800FF74 +SCRIPT_START script_0800FF74 StartScript _0807EB44 0x0002 _0807E9D4 diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/script_080100C8.inc similarity index 98% rename from data/scripts/gUnk_080100C8.inc rename to data/scripts/script_080100C8.inc index ac5aba5f..ee3ed7d3 100644 --- a/data/scripts/gUnk_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080100C8 +SCRIPT_START script_080100C8 StartScript Call sub_08061FE4 Call sub_08061E70 diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/script_08010264.inc similarity index 98% rename from data/scripts/gUnk_08010264.inc rename to data/scripts/script_08010264.inc index fdcfa114..2410a1ba 100644 --- a/data/scripts/gUnk_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010264 +SCRIPT_START script_08010264 StartScript _0807EF80 0x0007 _0807E9D4 @@ -446,7 +446,7 @@ JumpIfNot 0xfffa _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_080109F0 +StartPlayerScript script_080109F0 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 @@ -469,7 +469,7 @@ CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b62 _0807EA94 -StartPlayerScript gUnk_080109F0 +StartPlayerScript script_080109F0 WaitForSomething2 0x00000001 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/script_08010964.inc similarity index 85% rename from data/scripts/gUnk_08010964.inc rename to data/scripts/script_08010964.inc index 68c6f138..f0b44321 100644 --- a/data/scripts/gUnk_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_08010964 +SCRIPT_START script_08010964 CheckPlayerInRegion2 0x0808 JumpIfNot 0xfffa _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08010A38 +StartPlayerScript script_08010A38 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 @@ -23,7 +23,7 @@ StopScript _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08010A38 +StartPlayerScript script_08010A38 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/script_080109F0.inc similarity index 85% rename from data/scripts/gUnk_080109F0.inc rename to data/scripts/script_080109F0.inc index 335eaf5a..160b1c86 100644 --- a/data/scripts/gUnk_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080109F0 +SCRIPT_START script_080109F0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/script_08010A14.inc similarity index 85% rename from data/scripts/gUnk_08010A14.inc rename to data/scripts/script_08010A14.inc index 196aa06f..b07950eb 100644 --- a/data/scripts/gUnk_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010A14 +SCRIPT_START script_08010A14 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/script_08010A38.inc similarity index 85% rename from data/scripts/gUnk_08010A38.inc rename to data/scripts/script_08010A38.inc index 9687579a..b40dce05 100644 --- a/data/scripts/gUnk_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010A38 +SCRIPT_START script_08010A38 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/script_08010A5C.inc similarity index 89% rename from data/scripts/gUnk_08010A5C.inc rename to data/scripts/script_08010A5C.inc index 298feea6..66ef1bff 100644 --- a/data/scripts/gUnk_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010A5C +SCRIPT_START script_08010A5C StartScript Call sub_0807DF28 _0807E864 diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/script_08010A98.inc similarity index 96% rename from data/scripts/gUnk_08010A98.inc rename to data/scripts/script_08010A98.inc index 00775f4e..f647c1fe 100644 --- a/data/scripts/gUnk_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010A98 +SCRIPT_START script_08010A98 StartScript _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/script_08010B68.inc similarity index 92% rename from data/scripts/gUnk_08010B68.inc rename to data/scripts/script_08010B68.inc index 36afe5e4..65f424ae 100644 --- a/data/scripts/gUnk_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010B68 +SCRIPT_START script_08010B68 StartScript _0807E564 JumpIfNot 0x003e diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/script_08010BB4.inc similarity index 96% rename from data/scripts/gUnk_08010BB4.inc rename to data/scripts/script_08010BB4.inc index c0fb63d9..7f9f1b99 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010BB4 +SCRIPT_START script_08010BB4 StartScript _0807EF80 0x000a _0807EB44 0x0004 @@ -19,7 +19,7 @@ Jump 0xffe2 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08011074 +StartPlayerScript script_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 TextboxNoOverlapFollowPos 0x000c1036 @@ -47,7 +47,7 @@ Call sub_08064180 LoadRoomEntityList gUnk_080F06E0 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -StartPlayerScript gUnk_08011098 +StartPlayerScript script_08011098 WaitForSomething2 0x00000400 SetEntityPositionRelative 0x005001f8 _0807F0B4 0x0007 diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/script_08010E5A.inc similarity index 97% rename from data/scripts/gUnk_08010E5A.inc rename to data/scripts/script_08010E5A.inc index 49c34af6..2e6e3b36 100644 --- a/data/scripts/gUnk_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08010E5A +SCRIPT_START script_08010E5A Wait 0x001e SoundReq 0x0125 CallWithArg sub_0807FB28, 0x00000003 diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/script_08010F84.inc similarity index 93% rename from data/scripts/gUnk_08010F84.inc rename to data/scripts/script_08010F84.inc index 83aaab92..35b90c64 100644 --- a/data/scripts/gUnk_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -1,8 +1,8 @@ -SCRIPT_START gUnk_08010F84 +SCRIPT_START script_08010F84 Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -StartPlayerScript gUnk_080110BC +StartPlayerScript script_080110BC WaitForSomething2 0x00000400 TextboxNoOverlapFollowPos 0x00001047 _0807EA94 diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/script_08011074.inc similarity index 85% rename from data/scripts/gUnk_08011074.inc rename to data/scripts/script_08011074.inc index e190a719..195c75f3 100644 --- a/data/scripts/gUnk_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011074 +SCRIPT_START script_08011074 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_08011098.inc b/data/scripts/script_08011098.inc similarity index 84% rename from data/scripts/gUnk_08011098.inc rename to data/scripts/script_08011098.inc index 48db15b4..00f37a96 100644 --- a/data/scripts/gUnk_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011098 +SCRIPT_START script_08011098 SetEntityPositionRelative 0x005801a8 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_080110BC.inc b/data/scripts/script_080110BC.inc similarity index 88% rename from data/scripts/gUnk_080110BC.inc rename to data/scripts/script_080110BC.inc index e37f55c2..e2e590ef 100644 --- a/data/scripts/gUnk_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080110BC +SCRIPT_START script_080110BC StartScript SetEntityNonPlanarMovement 0x0040 StopScript diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/script_080110E8.inc similarity index 90% rename from data/scripts/gUnk_080110E8.inc rename to data/scripts/script_080110E8.inc index 888fb7cd..5ecc77d8 100644 --- a/data/scripts/gUnk_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080110E8 +SCRIPT_START script_080110E8 SoundReq 0x007a _0807EB44 0x0004 _0807EF80 0x000d diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/script_08011128.inc similarity index 96% rename from data/scripts/gUnk_08011128.inc rename to data/scripts/script_08011128.inc index 6dd62f48..f79ade44 100644 --- a/data/scripts/gUnk_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011128 +SCRIPT_START script_08011128 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/script_080111CC.inc similarity index 97% rename from data/scripts/gUnk_080111CC.inc rename to data/scripts/script_080111CC.inc index 003e82a1..ccfee28b 100644 --- a/data/scripts/gUnk_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080111CC +SCRIPT_START script_080111CC StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/script_080112C4.inc similarity index 97% rename from data/scripts/gUnk_080112C4.inc rename to data/scripts/script_080112C4.inc index 6f7084ff..d6ef7fb1 100644 --- a/data/scripts/gUnk_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080112C4 +SCRIPT_START script_080112C4 StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/gUnk_080113AA.inc b/data/scripts/script_080113AA.inc similarity index 95% rename from data/scripts/gUnk_080113AA.inc rename to data/scripts/script_080113AA.inc index cfa9e768..0c831ff8 100644 --- a/data/scripts/gUnk_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080113AA +SCRIPT_START script_080113AA _0807E610 0x00002000 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 diff --git a/data/scripts/gUnk_08011442.inc b/data/scripts/script_08011442.inc similarity index 96% rename from data/scripts/gUnk_08011442.inc rename to data/scripts/script_08011442.inc index 1518a698..01bbc757 100644 --- a/data/scripts/gUnk_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011442 +SCRIPT_START script_08011442 _0807E610 0x00008000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 diff --git a/data/scripts/gUnk_08011508.inc b/data/scripts/script_08011508.inc similarity index 96% rename from data/scripts/gUnk_08011508.inc rename to data/scripts/script_08011508.inc index 0a58e4b7..cffe3462 100644 --- a/data/scripts/gUnk_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011508 +SCRIPT_START script_08011508 _0807E610 0x00020000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 diff --git a/data/scripts/gUnk_080115D0.inc b/data/scripts/script_080115D0.inc similarity index 90% rename from data/scripts/gUnk_080115D0.inc rename to data/scripts/script_080115D0.inc index b17ba750..6b01020c 100644 --- a/data/scripts/gUnk_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080115D0 +SCRIPT_START script_080115D0 StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_08011608.inc b/data/scripts/script_08011608.inc similarity index 90% rename from data/scripts/gUnk_08011608.inc rename to data/scripts/script_08011608.inc index 3ba60683..f3e4d1bf 100644 --- a/data/scripts/gUnk_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011608 +SCRIPT_START script_08011608 StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0006 diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/script_08011640.inc similarity index 94% rename from data/scripts/gUnk_08011640.inc rename to data/scripts/script_08011640.inc index a78e490d..d2917c75 100644 --- a/data/scripts/gUnk_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011640 +SCRIPT_START script_08011640 StartScript _0807EF80 0x0008 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/script_080116A8.inc similarity index 98% rename from data/scripts/gUnk_080116A8.inc rename to data/scripts/script_080116A8.inc index 0b7419aa..d5f85594 100644 --- a/data/scripts/gUnk_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080116A8 +SCRIPT_START script_080116A8 StartScript _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/script_0801183C.inc similarity index 92% rename from data/scripts/gUnk_0801183C.inc rename to data/scripts/script_0801183C.inc index 7de5a2a9..55af706a 100644 --- a/data/scripts/gUnk_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801183C +SCRIPT_START script_0801183C StartScript Call sub_08095330 StopScript diff --git a/data/scripts/gUnk_08011890.inc b/data/scripts/script_08011890.inc similarity index 90% rename from data/scripts/gUnk_08011890.inc rename to data/scripts/script_08011890.inc index 6f5e8b98..11144e47 100644 --- a/data/scripts/gUnk_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011890 +SCRIPT_START script_08011890 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/script_080118D4.inc similarity index 85% rename from data/scripts/gUnk_080118D4.inc rename to data/scripts/script_080118D4.inc index b5ea3bbc..dcd95a7b 100644 --- a/data/scripts/gUnk_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080118D4 +SCRIPT_START script_080118D4 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 @@ -8,7 +8,7 @@ StopScript WaitForSomething2 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 -StartPlayerScript gUnk_080110E8 +StartPlayerScript script_080110E8 _0807EDD4 0x01d8, 0x0058 Call sub_08094B80 SoundReq 0x009a diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/script_08011930.inc similarity index 71% rename from data/scripts/gUnk_08011930.inc rename to data/scripts/script_08011930.inc index 586cc75a..14e12821 100644 --- a/data/scripts/gUnk_08011930.inc +++ b/data/scripts/script_08011930.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011930 +SCRIPT_START script_08011930 WaitForSomething 0x20000000 Call sub_0809567C SCRIPT_END diff --git a/data/scripts/gUnk_08011940.inc b/data/scripts/script_08011940.inc similarity index 65% rename from data/scripts/gUnk_08011940.inc rename to data/scripts/script_08011940.inc index 5670f098..3c327214 100644 --- a/data/scripts/gUnk_08011940.inc +++ b/data/scripts/script_08011940.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011940 +SCRIPT_START script_08011940 WaitForSomething 0x40000000 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/script_0801194C.inc similarity index 98% rename from data/scripts/gUnk_0801194C.inc rename to data/scripts/script_0801194C.inc index 40a6ed1f..6931c790 100644 --- a/data/scripts/gUnk_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801194C +SCRIPT_START script_0801194C StartScript _0807EB44 0x0002 Jump 0x0016 diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/script_08011B20.inc similarity index 83% rename from data/scripts/gUnk_08011B20.inc rename to data/scripts/script_08011B20.inc index b202d00e..26e034fa 100644 --- a/data/scripts/gUnk_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011B20 +SCRIPT_START script_08011B20 _0807E864 Call sub_0807DF28 TextboxNoOverlapFollowPos 0x000c1320 diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/script_08011B40.inc similarity index 97% rename from data/scripts/gUnk_08011B40.inc rename to data/scripts/script_08011B40.inc index c3171095..ed37af0a 100644 --- a/data/scripts/gUnk_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011B40 +SCRIPT_START script_08011B40 StartScript _0807E9D4 _0807EF80 0x000a diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/script_08011C50.inc similarity index 86% rename from data/scripts/gUnk_08011C50.inc rename to data/scripts/script_08011C50.inc index 3ef468d6..9bce285e 100644 --- a/data/scripts/gUnk_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011C50 +SCRIPT_START script_08011C50 StartScript _0807E864 StopScript diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/script_08011C7C.inc similarity index 99% rename from data/scripts/gUnk_08011C7C.inc rename to data/scripts/script_08011C7C.inc index 2ea6c740..270d8857 100644 --- a/data/scripts/gUnk_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08011C7C +SCRIPT_START script_08011C7C StartScript Call sub_08064828 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/script_0801232C.inc similarity index 94% rename from data/scripts/gUnk_0801232C.inc rename to data/scripts/script_0801232C.inc index 98468103..5e8aa941 100644 --- a/data/scripts/gUnk_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801232C +SCRIPT_START script_0801232C StartScript _0807EB74 _0807E9D4 @@ -42,7 +42,7 @@ SoundReq 0x01ce SetEntity0x20 0xffff8000 Wait 0x003c _0807E8E4_0 -StartPlayerScript gUnk_08012410 +StartPlayerScript script_08012410 WaitForSomething2 0x00000001 TextboxNoOverlap 0x1402 _0807EA94 diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/script_08012410.inc similarity index 83% rename from data/scripts/gUnk_08012410.inc rename to data/scripts/script_08012410.inc index 39c087b1..ee6be58f 100644 --- a/data/scripts/gUnk_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012410 +SCRIPT_START script_08012410 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/script_08012430.inc similarity index 95% rename from data/scripts/gUnk_08012430.inc rename to data/scripts/script_08012430.inc index ddb03a27..f3bcc8f2 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012430 +SCRIPT_START script_08012430 StartScript _0807EF80 0x000a _0807EB44 0x0004 @@ -31,7 +31,7 @@ SoundReq0x80100000 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08012AB0 +StartPlayerScript script_08012AB0 TextboxNoOverlapFollowPos 0x00071101 _0807EA94 CameraTargetPlayer @@ -79,7 +79,7 @@ Call sub_0807F9A4 Call sub_0807DF28 Call sub_0806DC7C SoundReq0x80100000 -StartPlayerScript gUnk_08012AC8 +StartPlayerScript script_08012AC8 WaitForSomething2 0x00000001 SetEntityPositionRelative 0x01680388 _0807F0B4 0x0001 @@ -114,7 +114,7 @@ SoundReq 0x0072 SoundReq0x80100000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -StartPlayerScript gUnk_08012AF0 +StartPlayerScript script_08012AF0 WaitForSomething2 0x00000001 _0807E8E4_0 SoundReq2 0x000e diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/script_080126FC.inc similarity index 98% rename from data/scripts/gUnk_080126FC.inc rename to data/scripts/script_080126FC.inc index 0cd25565..06b388b0 100644 --- a/data/scripts/gUnk_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080126FC +SCRIPT_START script_080126FC StartScript SetEntityNonPlanarMovement 0x0040 _0807EF80 0x0007 @@ -216,7 +216,7 @@ _0807EE30 JumpIfNot 0xfffc _0807E930 0x001f _0807EA94 -StartPlayerScript gUnk_08012B18 +StartPlayerScript script_08012B18 Call sub_0806D9A4 _0807EF80 0x0008 Wait 0x0078 diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/script_08012AB0.inc similarity index 76% rename from data/scripts/gUnk_08012AB0.inc rename to data/scripts/script_08012AB0.inc index e8df3a1e..b5829c97 100644 --- a/data/scripts/gUnk_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012AB0 +SCRIPT_START script_08012AB0 StopScript _0807EB44 0x0002 Wait 0x000a diff --git a/data/scripts/gUnk_08012AC8.inc b/data/scripts/script_08012AC8.inc similarity index 86% rename from data/scripts/gUnk_08012AC8.inc rename to data/scripts/script_08012AC8.inc index 013e0433..b3d05417 100644 --- a/data/scripts/gUnk_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012AC8 +SCRIPT_START script_08012AC8 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_08012AF0.inc b/data/scripts/script_08012AF0.inc similarity index 86% rename from data/scripts/gUnk_08012AF0.inc rename to data/scripts/script_08012AF0.inc index c3cf3c94..e1ad6a1c 100644 --- a/data/scripts/gUnk_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012AF0 +SCRIPT_START script_08012AF0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08012B18.inc b/data/scripts/script_08012B18.inc similarity index 61% rename from data/scripts/gUnk_08012B18.inc rename to data/scripts/script_08012B18.inc index 22d140c9..f353c587 100644 --- a/data/scripts/gUnk_08012B18.inc +++ b/data/scripts/script_08012B18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012B18 +SCRIPT_START script_08012B18 _0807EF80 0x0015 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/script_08012B24.inc similarity index 87% rename from data/scripts/gUnk_08012B24.inc rename to data/scripts/script_08012B24.inc index 2288d819..fbdacf64 100644 --- a/data/scripts/gUnk_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012B24 +SCRIPT_START script_08012B24 StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/script_08012B50.inc similarity index 87% rename from data/scripts/gUnk_08012B50.inc rename to data/scripts/script_08012B50.inc index 9f72bb79..d4f1c6ac 100644 --- a/data/scripts/gUnk_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012B50 +SCRIPT_START script_08012B50 StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/script_08012B7C.inc similarity index 87% rename from data/scripts/gUnk_08012B7C.inc rename to data/scripts/script_08012B7C.inc index 7a39ce95..1c5aaea2 100644 --- a/data/scripts/gUnk_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012B7C +SCRIPT_START script_08012B7C StartScript SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_08012BA8.inc b/data/scripts/script_08012BA8.inc similarity index 92% rename from data/scripts/gUnk_08012BA8.inc rename to data/scripts/script_08012BA8.inc index 6c22916a..56aeb8f1 100644 --- a/data/scripts/gUnk_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012BA8 +SCRIPT_START script_08012BA8 StartScript _0807EB44 0x0002 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_08012BF8.inc b/data/scripts/script_08012BF8.inc similarity index 92% rename from data/scripts/gUnk_08012BF8.inc rename to data/scripts/script_08012BF8.inc index 9905cc29..a85c95bf 100644 --- a/data/scripts/gUnk_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012BF8 +SCRIPT_START script_08012BF8 StartScript _0807EB44 0x0006 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_08012C48.inc b/data/scripts/script_08012C48.inc similarity index 84% rename from data/scripts/gUnk_08012C48.inc rename to data/scripts/script_08012C48.inc index 2b1bcffb..ae59b6df 100644 --- a/data/scripts/gUnk_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012C48 +SCRIPT_START script_08012C48 StartScript _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0280 diff --git a/data/scripts/gUnk_08012C68.inc b/data/scripts/script_08012C68.inc similarity index 94% rename from data/scripts/gUnk_08012C68.inc rename to data/scripts/script_08012C68.inc index 359e1040..302e1196 100644 --- a/data/scripts/gUnk_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012C68 +SCRIPT_START script_08012C68 StartScript _0807E9D4 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/script_08012CD8.inc similarity index 91% rename from data/scripts/gUnk_08012CD8.inc rename to data/scripts/script_08012CD8.inc index 6f29b3b4..e335e8a5 100644 --- a/data/scripts/gUnk_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012CD8 +SCRIPT_START script_08012CD8 StopScript StartScript _0807E564 diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/script_08012D18.inc similarity index 85% rename from data/scripts/gUnk_08012D18.inc rename to data/scripts/script_08012D18.inc index 26bf871e..78dc4d0f 100644 --- a/data/scripts/gUnk_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012D18 +SCRIPT_START script_08012D18 StopScript StartScript CheckGlobalFlag 0x0014 @@ -13,7 +13,7 @@ Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x111a _0807EA94 -StartPlayerScript gUnk_08010A38 +StartPlayerScript script_08010A38 WaitForSomething2 0x00000001 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/script_08012D70.inc similarity index 80% rename from data/scripts/gUnk_08012D70.inc rename to data/scripts/script_08012D70.inc index 0de8891d..9e9593b6 100644 --- a/data/scripts/gUnk_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_08012D70 +SCRIPT_START script_08012D70 CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_08012DB0 +StartPlayerScript script_08012DB0 WaitForSomething2 0x00000001 _0807EB28 0x132d _0807EA94 diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/script_08012DB0.inc similarity index 86% rename from data/scripts/gUnk_08012DB0.inc rename to data/scripts/script_08012DB0.inc index 0a4d5b99..9f8eb1fa 100644 --- a/data/scripts/gUnk_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012DB0 +SCRIPT_START script_08012DB0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/script_08012DD8.inc similarity index 67% rename from data/scripts/gUnk_08012DD8.inc rename to data/scripts/script_08012DD8.inc index d4f24f4c..4fdc4053 100644 --- a/data/scripts/gUnk_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_08012DD8 +SCRIPT_START script_08012DD8 StartScript StopScript _0807E888 Wait 0x0018 _0807E864 -StartPlayerScript gUnk_08012DF8 +StartPlayerScript script_08012DF8 WaitForSomething2 0x00000001 _0807E908 0x0002 SCRIPT_END diff --git a/data/scripts/gUnk_08012DF8.inc b/data/scripts/script_08012DF8.inc similarity index 86% rename from data/scripts/gUnk_08012DF8.inc rename to data/scripts/script_08012DF8.inc index 1e8c8cd7..05b001aa 100644 --- a/data/scripts/gUnk_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012DF8 +SCRIPT_START script_08012DF8 StartScript _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0140 diff --git a/data/scripts/gUnk_08012E20.inc b/data/scripts/script_08012E20.inc similarity index 68% rename from data/scripts/gUnk_08012E20.inc rename to data/scripts/script_08012E20.inc index 4842fb51..667813e0 100644 --- a/data/scripts/gUnk_08012E20.inc +++ b/data/scripts/script_08012E20.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_08012E20 +SCRIPT_START script_08012E20 StartScript _0807E864 StopScript Wait 0x0078 _0807E908 0x0004 -StartPlayerScript gUnk_08012E44 +StartPlayerScript script_08012E44 WaitForSomething2 0x00000002 Wait 0x000c _0807E908 0x0005 diff --git a/data/scripts/gUnk_08012E44.inc b/data/scripts/script_08012E44.inc similarity index 90% rename from data/scripts/gUnk_08012E44.inc rename to data/scripts/script_08012E44.inc index 39ef9c05..a2efd4be 100644 --- a/data/scripts/gUnk_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012E44 +SCRIPT_START script_08012E44 StartScript SetEntityNonPlanarMovement 0x0140 StopScript diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/script_08012E88.inc similarity index 95% rename from data/scripts/gUnk_08012E88.inc rename to data/scripts/script_08012E88.inc index f58b1f06..30d0c1c0 100644 --- a/data/scripts/gUnk_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012E88 +SCRIPT_START script_08012E88 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/script_08012F0C.inc similarity index 94% rename from data/scripts/gUnk_08012F0C.inc rename to data/scripts/script_08012F0C.inc index 8b37b976..a3a5c863 100644 --- a/data/scripts/gUnk_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08012F0C +SCRIPT_START script_08012F0C StartScript CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/script_08012F86.inc similarity index 95% rename from data/scripts/gUnk_08012F86.inc rename to data/scripts/script_08012F86.inc index bfac0bf0..820f8c53 100644 --- a/data/scripts/gUnk_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_08012F86 +SCRIPT_START script_08012F86 StartScript CheckLocalFlag 0x0060 JumpIf 0x0044 _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_080130E4 +StartPlayerScript script_080130E4 SetLocalFlag 0x0060 ClearLocalFlag 0x0061 StopScript diff --git a/data/scripts/gUnk_080130E4.inc b/data/scripts/script_080130E4.inc similarity index 88% rename from data/scripts/gUnk_080130E4.inc rename to data/scripts/script_080130E4.inc index 9335c187..929de154 100644 --- a/data/scripts/gUnk_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080130E4 +SCRIPT_START script_080130E4 StartScript _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0140 diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/script_08013114.inc similarity index 95% rename from data/scripts/gUnk_08013114.inc rename to data/scripts/script_08013114.inc index e1ddddb9..e7d6aa53 100644 --- a/data/scripts/gUnk_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013114 +SCRIPT_START script_08013114 StartScript _0807E9D4 _0807EF80 0x000a diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/script_0801319A.inc similarity index 87% rename from data/scripts/gUnk_0801319A.inc rename to data/scripts/script_0801319A.inc index befc408e..7a9e15a2 100644 --- a/data/scripts/gUnk_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801319A +SCRIPT_START script_0801319A StopScript StartScript CameraTargetEntity @@ -10,17 +10,17 @@ JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -StartPlayerScript gUnk_080132E4 +StartPlayerScript script_080132E4 WaitForSomething2 0x00000002 _0807EB28 0x1601 _0807EA94 -StartPlayerScript gUnk_0801330C +StartPlayerScript script_0801330C WaitForSomething2 0x00000002 _0807E778 0x0004 DoFade5 WaitFor_2 LoadRoomEntityList gUnk_080F5680 -StartPlayerScript gUnk_08013330 +StartPlayerScript script_08013330 WaitForSomething2 0x00000002 MoveEntityToPlayer SetEntityPosition 0x0000, 0xfff0 @@ -37,11 +37,11 @@ WaitForSomething2 0x00000010 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 SoundReq2 0x000d -StartPlayerScript gUnk_0801334C +StartPlayerScript script_0801334C WaitForSomething2 0x00000002 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 -StartPlayerScript gUnk_08013378 +StartPlayerScript script_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 TextboxNoOverlapFollowPos 0x000c1603 diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/script_080132E4.inc similarity index 86% rename from data/scripts/gUnk_080132E4.inc rename to data/scripts/script_080132E4.inc index 199fb75e..40720dac 100644 --- a/data/scripts/gUnk_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080132E4 +SCRIPT_START script_080132E4 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_0801330C.inc b/data/scripts/script_0801330C.inc similarity index 85% rename from data/scripts/gUnk_0801330C.inc rename to data/scripts/script_0801330C.inc index fc20a94b..1254ccec 100644 --- a/data/scripts/gUnk_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801330C +SCRIPT_START script_0801330C StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/script_08013330.inc similarity index 81% rename from data/scripts/gUnk_08013330.inc rename to data/scripts/script_08013330.inc index 91ed7499..9f51b8c4 100644 --- a/data/scripts/gUnk_08013330.inc +++ b/data/scripts/script_08013330.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013330 +SCRIPT_START script_08013330 StartScript _0807EB44 0x0000 SetEntityPositionRelative 0x00700098 diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/script_0801334C.inc similarity index 87% rename from data/scripts/gUnk_0801334C.inc rename to data/scripts/script_0801334C.inc index 2782c624..e17fc35c 100644 --- a/data/scripts/gUnk_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801334C +SCRIPT_START script_0801334C StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000d diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/script_08013378.inc similarity index 90% rename from data/scripts/gUnk_08013378.inc rename to data/scripts/script_08013378.inc index 5c3179ad..5a767647 100644 --- a/data/scripts/gUnk_08013378.inc +++ b/data/scripts/script_08013378.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013378 +SCRIPT_START script_08013378 Call sub_0807F1C4 Call sub_0807F2D4 Call sub_0807F1E8 diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/script_080133C4.inc similarity index 88% rename from data/scripts/gUnk_080133C4.inc rename to data/scripts/script_080133C4.inc index a753fd84..223e3a5c 100644 --- a/data/scripts/gUnk_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080133C4 +SCRIPT_START script_080133C4 StartScript _0807EB44 0x0004 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/script_080133F8.inc similarity index 95% rename from data/scripts/gUnk_080133F8.inc rename to data/scripts/script_080133F8.inc index b6dc0fa5..a9730804 100644 --- a/data/scripts/gUnk_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080133F8 +SCRIPT_START script_080133F8 StartScript _0807EB44 0x0004 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08013494.inc b/data/scripts/script_08013494.inc similarity index 90% rename from data/scripts/gUnk_08013494.inc rename to data/scripts/script_08013494.inc index c0ce7fd8..037082ba 100644 --- a/data/scripts/gUnk_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013494 +SCRIPT_START script_08013494 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/script_080134DC.inc similarity index 93% rename from data/scripts/gUnk_080134DC.inc rename to data/scripts/script_080134DC.inc index 41aaa6db..af492fa6 100644 --- a/data/scripts/gUnk_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080134DC +SCRIPT_START script_080134DC StartScript _0807EF80 0x0008 StopScript @@ -10,7 +10,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_080136D8 +StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, 0x08013f04 SoundReq 0x01cd @@ -48,7 +48,7 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript gUnk_08013B70 +StartPlayerScript script_08013B70 _0807E5F8 0x00000080 _0807F078 0x0003, 0x0001 Call sub_0806DC3C diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/script_08013650.inc similarity index 86% rename from data/scripts/gUnk_08013650.inc rename to data/scripts/script_08013650.inc index 6f8fb40d..d5ea9a8b 100644 --- a/data/scripts/gUnk_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013650 +SCRIPT_START script_08013650 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0007 @@ -9,7 +9,7 @@ _0807E5F8 0x00000004 Wait 0x0078 CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 -StartPlayerScript gUnk_080136B4 +StartPlayerScript script_080136B4 WaitForSomething2 0x00000002 _0807EB28 0x1501 _0807EA94 diff --git a/data/scripts/gUnk_080136B4.inc b/data/scripts/script_080136B4.inc similarity index 85% rename from data/scripts/gUnk_080136B4.inc rename to data/scripts/script_080136B4.inc index fc0471cc..7fcd5496 100644 --- a/data/scripts/gUnk_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080136B4 +SCRIPT_START script_080136B4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/script_080136D8.inc similarity index 91% rename from data/scripts/gUnk_080136D8.inc rename to data/scripts/script_080136D8.inc index 8a73634a..47b9ea21 100644 --- a/data/scripts/gUnk_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080136D8 +SCRIPT_START script_080136D8 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/script_08013720.inc similarity index 94% rename from data/scripts/gUnk_08013720.inc rename to data/scripts/script_08013720.inc index 4437f1c7..c9e78093 100644 --- a/data/scripts/gUnk_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013720 +SCRIPT_START script_08013720 StartScript _0807EF80 0x0008 StopScript @@ -10,7 +10,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_080136D8 +StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, 0x08013f34 SoundReq 0x01cd @@ -51,7 +51,7 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript gUnk_08013B70 +StartPlayerScript script_08013B70 _0807E5F8 0x00000080 _0807F078 0x0004, 0x0001 Call sub_0806DC3C diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/script_080138B4.inc similarity index 95% rename from data/scripts/gUnk_080138B4.inc rename to data/scripts/script_080138B4.inc index 4dadb7dd..c59dfcdd 100644 --- a/data/scripts/gUnk_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080138B4 +SCRIPT_START script_080138B4 StartScript _0807EF80 0x0008 StopScript @@ -10,7 +10,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 Call sub_0807DF28 -StartPlayerScript gUnk_080136D8 +StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, 0x08013f64 SoundReq 0x01cd @@ -55,7 +55,7 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript gUnk_08013BA8 +StartPlayerScript script_08013BA8 _0807E5F8 0x00000080 _0807F078 0x0006, 0x0001 Call sub_0807AEE4 diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/script_08013AA6.inc similarity index 94% rename from data/scripts/gUnk_08013AA6.inc rename to data/scripts/script_08013AA6.inc index 476a3965..5857c5ee 100644 --- a/data/scripts/gUnk_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013AA6 +SCRIPT_START script_08013AA6 Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000008 diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/script_08013B18.inc similarity index 84% rename from data/scripts/gUnk_08013B18.inc rename to data/scripts/script_08013B18.inc index 32780a24..72a7ca19 100644 --- a/data/scripts/gUnk_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013B18 +SCRIPT_START script_08013B18 StartScript _0807EF80 0x0008 StopScript @@ -15,7 +15,7 @@ Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x1507 _0807EA94 -StartPlayerScript gUnk_08010A14 +StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/script_08013B70.inc similarity index 87% rename from data/scripts/gUnk_08013B70.inc rename to data/scripts/script_08013B70.inc index 8f2b17b3..aae726f9 100644 --- a/data/scripts/gUnk_08013B70.inc +++ b/data/scripts/script_08013B70.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013B70 +SCRIPT_START script_08013B70 SoundReq 0x01d3 CallWithArg sub_0807F238, 0x000008bf Call sub_08096028 diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/script_08013BA8.inc similarity index 88% rename from data/scripts/gUnk_08013BA8.inc rename to data/scripts/script_08013BA8.inc index a2337d5a..97c11730 100644 --- a/data/scripts/gUnk_08013BA8.inc +++ b/data/scripts/script_08013BA8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013BA8 +SCRIPT_START script_08013BA8 CallWithArg sub_08095E7C, 0x08014248 SoundReq 0x01d3 CallWithArg sub_0807F238, 0x000008e3 diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/script_08013BE8.inc similarity index 96% rename from data/scripts/gUnk_08013BE8.inc rename to data/scripts/script_08013BE8.inc index 34d54f72..64b87f5c 100644 --- a/data/scripts/gUnk_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013BE8 +SCRIPT_START script_08013BE8 StartScript CheckLocalFlag 0x007a JumpIf 0x003a diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/script_08013CA4.inc similarity index 93% rename from data/scripts/gUnk_08013CA4.inc rename to data/scripts/script_08013CA4.inc index 2a507c25..d0a809ef 100644 --- a/data/scripts/gUnk_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013CA4 +SCRIPT_START script_08013CA4 StopScript CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot 0xfff6 diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/script_08013D04.inc similarity index 90% rename from data/scripts/gUnk_08013D04.inc rename to data/scripts/script_08013D04.inc index 7c2d6ade..15b53482 100644 --- a/data/scripts/gUnk_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013D04 +SCRIPT_START script_08013D04 StartScript Call sub_0807F92C _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/script_08013D44.inc similarity index 90% rename from data/scripts/gUnk_08013D44.inc rename to data/scripts/script_08013D44.inc index 1783ada4..ab9c3b08 100644 --- a/data/scripts/gUnk_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013D44 +SCRIPT_START script_08013D44 StartScript Call sub_0807F92C _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/script_08013D84.inc similarity index 90% rename from data/scripts/gUnk_08013D84.inc rename to data/scripts/script_08013D84.inc index cedc11ce..019222fc 100644 --- a/data/scripts/gUnk_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013D84 +SCRIPT_START script_08013D84 StartScript Call sub_0807F92C _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/script_08013DC4.inc similarity index 90% rename from data/scripts/gUnk_08013DC4.inc rename to data/scripts/script_08013DC4.inc index ddae770a..cf903dce 100644 --- a/data/scripts/gUnk_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013DC4 +SCRIPT_START script_08013DC4 StartScript Call sub_0807F92C _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08013E04.inc b/data/scripts/script_08013E04.inc similarity index 86% rename from data/scripts/gUnk_08013E04.inc rename to data/scripts/script_08013E04.inc index 0ef31ed0..8f2da729 100644 --- a/data/scripts/gUnk_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013E04 +SCRIPT_START script_08013E04 StartScript _0807EF80 0x0007 _0807E930 0x0000 diff --git a/data/scripts/gUnk_08013E28.inc b/data/scripts/script_08013E28.inc similarity index 86% rename from data/scripts/gUnk_08013E28.inc rename to data/scripts/script_08013E28.inc index 11c89886..1f105f4e 100644 --- a/data/scripts/gUnk_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013E28 +SCRIPT_START script_08013E28 StartScript _0807EF80 0x0007 _0807E930 0x0002 diff --git a/data/scripts/gUnk_08013E4C.inc b/data/scripts/script_08013E4C.inc similarity index 86% rename from data/scripts/gUnk_08013E4C.inc rename to data/scripts/script_08013E4C.inc index 0268ad68..2c14b1a5 100644 --- a/data/scripts/gUnk_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013E4C +SCRIPT_START script_08013E4C StartScript _0807EF80 0x0007 _0807E930 0x0004 diff --git a/data/scripts/gUnk_08013E70.inc b/data/scripts/script_08013E70.inc similarity index 86% rename from data/scripts/gUnk_08013E70.inc rename to data/scripts/script_08013E70.inc index 4f01de5e..1d9e6247 100644 --- a/data/scripts/gUnk_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013E70 +SCRIPT_START script_08013E70 StartScript _0807EF80 0x0007 _0807E930 0x0006 diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/script_08013E94.inc similarity index 82% rename from data/scripts/gUnk_08013E94.inc rename to data/scripts/script_08013E94.inc index a70e41b9..f943d80e 100644 --- a/data/scripts/gUnk_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013E94 +SCRIPT_START script_08013E94 StartScript _0807EF80 0x0007 Call sub_0807F180 diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/script_08013EB0.inc similarity index 82% rename from data/scripts/gUnk_08013EB0.inc rename to data/scripts/script_08013EB0.inc index 3a4b3b44..b39b667d 100644 --- a/data/scripts/gUnk_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013EB0 +SCRIPT_START script_08013EB0 StartScript _0807EF80 0x0007 Call sub_0807F180 diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/script_08013ECC.inc similarity index 82% rename from data/scripts/gUnk_08013ECC.inc rename to data/scripts/script_08013ECC.inc index 65f7af88..eb7de967 100644 --- a/data/scripts/gUnk_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013ECC +SCRIPT_START script_08013ECC StartScript _0807EF80 0x0007 Call sub_0807F180 diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/script_08013EE8.inc similarity index 82% rename from data/scripts/gUnk_08013EE8.inc rename to data/scripts/script_08013EE8.inc index 6d498b41..2981798d 100644 --- a/data/scripts/gUnk_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013EE8 +SCRIPT_START script_08013EE8 StartScript _0807EF80 0x0007 Call sub_0807F180 diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/script_08013F04.inc similarity index 88% rename from data/scripts/gUnk_08013F04.inc rename to data/scripts/script_08013F04.inc index e6b22c50..01af27f0 100644 --- a/data/scripts/gUnk_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013F04 +SCRIPT_START script_08013F04 StartScript _0807EF80 0x0007 _0807E930 0x0008 diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/script_08013F34.inc similarity index 88% rename from data/scripts/gUnk_08013F34.inc rename to data/scripts/script_08013F34.inc index 804fb892..18709dd7 100644 --- a/data/scripts/gUnk_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013F34 +SCRIPT_START script_08013F34 StartScript _0807EF80 0x0007 _0807E930 0x0009 diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/script_08013F64.inc similarity index 88% rename from data/scripts/gUnk_08013F64.inc rename to data/scripts/script_08013F64.inc index 64131a9a..13e54873 100644 --- a/data/scripts/gUnk_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013F64 +SCRIPT_START script_08013F64 StartScript _0807EF80 0x0007 _0807E930 0x000a diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/script_08013F94.inc similarity index 92% rename from data/scripts/gUnk_08013F94.inc rename to data/scripts/script_08013F94.inc index edfefdb8..2d9ef7ca 100644 --- a/data/scripts/gUnk_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013F94 +SCRIPT_START script_08013F94 StartScript _0807EF80 0x0008 StopScript diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/script_08013FE8.inc similarity index 87% rename from data/scripts/gUnk_08013FE8.inc rename to data/scripts/script_08013FE8.inc index 6611152b..55c53873 100644 --- a/data/scripts/gUnk_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08013FE8 +SCRIPT_START script_08013FE8 StartScript _0807EF80 0x0008 StopScript @@ -20,7 +20,7 @@ Call sub_0807DF28 StopScript _0807EB28 0x1508 _0807EA94 -StartPlayerScript gUnk_08010A14 +StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/script_08014054.inc similarity index 83% rename from data/scripts/gUnk_08014054.inc rename to data/scripts/script_08014054.inc index 134e969b..e6234ea6 100644 --- a/data/scripts/gUnk_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014054 +SCRIPT_START script_08014054 StartScript _0807EF80 0x0007 _0807E930 0x0000 diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/script_08014074.inc similarity index 83% rename from data/scripts/gUnk_08014074.inc rename to data/scripts/script_08014074.inc index a7b8f9ff..c9a3a40e 100644 --- a/data/scripts/gUnk_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014074 +SCRIPT_START script_08014074 StartScript _0807EF80 0x0007 _0807E930 0x0001 diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/script_08014094.inc similarity index 85% rename from data/scripts/gUnk_08014094.inc rename to data/scripts/script_08014094.inc index 8f7f7fe5..68a9d64b 100644 --- a/data/scripts/gUnk_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014094 +SCRIPT_START script_08014094 StartScript _0807EF80 0x0007 _0807E930 0x0002 diff --git a/data/scripts/gUnk_080140B8.inc b/data/scripts/script_080140B8.inc similarity index 85% rename from data/scripts/gUnk_080140B8.inc rename to data/scripts/script_080140B8.inc index da2487e1..a43f3347 100644 --- a/data/scripts/gUnk_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080140B8 +SCRIPT_START script_080140B8 StartScript _0807EF80 0x0007 _0807E930 0x0003 diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/script_080140DC.inc similarity index 89% rename from data/scripts/gUnk_080140DC.inc rename to data/scripts/script_080140DC.inc index f258679f..5f3efa8f 100644 --- a/data/scripts/gUnk_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080140DC +SCRIPT_START script_080140DC StartScript _0807EF80 0x0007 _0807E930 0x0004 diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/script_08014118.inc similarity index 89% rename from data/scripts/gUnk_08014118.inc rename to data/scripts/script_08014118.inc index 5891b34f..72bb7d44 100644 --- a/data/scripts/gUnk_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014118 +SCRIPT_START script_08014118 StartScript _0807EF80 0x0007 _0807E930 0x0005 diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/script_08014154.inc similarity index 91% rename from data/scripts/gUnk_08014154.inc rename to data/scripts/script_08014154.inc index 5844b2da..b5cda454 100644 --- a/data/scripts/gUnk_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014154 +SCRIPT_START script_08014154 StartScript _0807EF80 0x0007 _0807E930 0x0006 diff --git a/data/scripts/gUnk_08014198.inc b/data/scripts/script_08014198.inc similarity index 91% rename from data/scripts/gUnk_08014198.inc rename to data/scripts/script_08014198.inc index 599a6ecc..210eb704 100644 --- a/data/scripts/gUnk_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014198 +SCRIPT_START script_08014198 StartScript _0807EF80 0x0007 _0807E930 0x0007 diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/script_080141DC.inc similarity index 88% rename from data/scripts/gUnk_080141DC.inc rename to data/scripts/script_080141DC.inc index cc06dc39..169fe792 100644 --- a/data/scripts/gUnk_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080141DC +SCRIPT_START script_080141DC StartScript _0807EF80 0x0007 _0807E930 0x0014 diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/script_08014210.inc similarity index 88% rename from data/scripts/gUnk_08014210.inc rename to data/scripts/script_08014210.inc index 1ed61b20..c1f211b5 100644 --- a/data/scripts/gUnk_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014210 +SCRIPT_START script_08014210 StartScript _0807EF80 0x0007 _0807E930 0x0015 diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/script_08014248.inc similarity index 94% rename from data/scripts/gUnk_08014248.inc rename to data/scripts/script_08014248.inc index 8e75f5d1..9517e0be 100644 --- a/data/scripts/gUnk_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014248 +SCRIPT_START script_08014248 TestBit 0x00020000 JumpIf 0x0014 Wait 0x0008 diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/script_080142B0.inc similarity index 96% rename from data/scripts/gUnk_080142B0.inc rename to data/scripts/script_080142B0.inc index 934901e7..c6eaee65 100644 --- a/data/scripts/gUnk_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080142B0 +SCRIPT_START script_080142B0 StartScript CheckLocalFlag 0x0054 JumpIf 0x00ca diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/script_08014384.inc similarity index 90% rename from data/scripts/gUnk_08014384.inc rename to data/scripts/script_08014384.inc index 731675ae..aef41a86 100644 --- a/data/scripts/gUnk_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014384 +SCRIPT_START script_08014384 StopScript _0807E864 _0807EA94 diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/script_080143C0.inc similarity index 95% rename from data/scripts/gUnk_080143C0.inc rename to data/scripts/script_080143C0.inc index aa3ae6c0..1029c85a 100644 --- a/data/scripts/gUnk_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080143C0 +SCRIPT_START script_080143C0 StopScript _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/script_08014450.inc similarity index 96% rename from data/scripts/gUnk_08014450.inc rename to data/scripts/script_08014450.inc index a19df24a..c0284446 100644 --- a/data/scripts/gUnk_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014450 +SCRIPT_START script_08014450 StartScript _0807E9D4 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/script_0801450C.inc similarity index 89% rename from data/scripts/gUnk_0801450C.inc rename to data/scripts/script_0801450C.inc index 4e8ca601..8c771a51 100644 --- a/data/scripts/gUnk_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801450C +SCRIPT_START script_0801450C StartScript _0807E9D4 _0807EB44 0x0000 @@ -24,7 +24,7 @@ JumpIfNot 0xffee _0807E864 _0807EB28 0x4217 _0807EA94 -StartPlayerScript gUnk_08014588 +StartPlayerScript script_08014588 Wait 0x0010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_08014588.inc b/data/scripts/script_08014588.inc similarity index 86% rename from data/scripts/gUnk_08014588.inc rename to data/scripts/script_08014588.inc index a1b00da4..bba76a7e 100644 --- a/data/scripts/gUnk_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014588 +SCRIPT_START script_08014588 StopScript WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x00e0 diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/script_080145B0.inc similarity index 90% rename from data/scripts/gUnk_080145B0.inc rename to data/scripts/script_080145B0.inc index 9cd637f6..aa014d27 100644 --- a/data/scripts/gUnk_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080145B0 +SCRIPT_START script_080145B0 StartScript SetEntityPositionRelative 0x00e001f8 CheckLocalFlag 0x005e diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/script_080145E8.inc similarity index 97% rename from data/scripts/gUnk_080145E8.inc rename to data/scripts/script_080145E8.inc index 355e87e5..c8d49369 100644 --- a/data/scripts/gUnk_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080145E8 +SCRIPT_START script_080145E8 StartScript _0807EF80 0x0008 _0807EB44 0x0004 @@ -40,7 +40,7 @@ JumpIfNot 0xffc0 _0807E864 _0807EB28 0x431f _0807EA94 -StartPlayerScript gUnk_080147DC +StartPlayerScript script_080147DC Wait 0x0010 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 diff --git a/data/scripts/gUnk_080147DC.inc b/data/scripts/script_080147DC.inc similarity index 86% rename from data/scripts/gUnk_080147DC.inc rename to data/scripts/script_080147DC.inc index 0db5a666..5bec229e 100644 --- a/data/scripts/gUnk_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080147DC +SCRIPT_START script_080147DC StopScript WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x00e0 diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/script_08014804.inc similarity index 97% rename from data/scripts/gUnk_08014804.inc rename to data/scripts/script_08014804.inc index bece2dfd..38ffe052 100644 --- a/data/scripts/gUnk_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014804 +SCRIPT_START script_08014804 StartScript _0807E9D4 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/script_08014958.inc similarity index 94% rename from data/scripts/gUnk_08014958.inc rename to data/scripts/script_08014958.inc index cee8f3f6..78024f4e 100644 --- a/data/scripts/gUnk_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014958 +SCRIPT_START script_08014958 StartScript Call sub_0806C870 _0807EF80 0x000a diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/script_080149CC.inc similarity index 96% rename from data/scripts/gUnk_080149CC.inc rename to data/scripts/script_080149CC.inc index 79537164..cbab30aa 100644 --- a/data/scripts/gUnk_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080149CC +SCRIPT_START script_080149CC StartScript SetEntityNonPlanarMovement 0x0080 Call sub_0806C870 diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/script_08014A80.inc similarity index 91% rename from data/scripts/gUnk_08014A80.inc rename to data/scripts/script_08014A80.inc index 5c8538cb..90ff005f 100644 --- a/data/scripts/gUnk_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014A80 +SCRIPT_START script_08014A80 StartScript _0807EF80 0x000a StopScript @@ -27,7 +27,7 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -StartPlayerScript gUnk_08014B10 +StartPlayerScript script_08014B10 WaitForSomething2 0x00000001 _0807EB74 CheckLocalFlag 0x0064 diff --git a/data/scripts/gUnk_08014B10.inc b/data/scripts/script_08014B10.inc similarity index 85% rename from data/scripts/gUnk_08014B10.inc rename to data/scripts/script_08014B10.inc index 2f777e41..efa971bf 100644 --- a/data/scripts/gUnk_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014B10 +SCRIPT_START script_08014B10 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/script_08014B34.inc similarity index 98% rename from data/scripts/gUnk_08014B34.inc rename to data/scripts/script_08014B34.inc index 386c67e3..8d7354c8 100644 --- a/data/scripts/gUnk_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014B34 +SCRIPT_START script_08014B34 StartScript _0807EF80 0x000a _0807E930 0x0000 diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/script_08014CDC.inc similarity index 97% rename from data/scripts/gUnk_08014CDC.inc rename to data/scripts/script_08014CDC.inc index d16b16fa..dd6d926f 100644 --- a/data/scripts/gUnk_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014CDC +SCRIPT_START script_08014CDC StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x000a diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/script_08014DCC.inc similarity index 91% rename from data/scripts/gUnk_08014DCC.inc rename to data/scripts/script_08014DCC.inc index 48f3362c..7bdebcf1 100644 --- a/data/scripts/gUnk_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014DCC +SCRIPT_START script_08014DCC StartScript SetEntityPositionRelative 0x01a80238 Call sub_0807F844 diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/script_08014E14.inc similarity index 95% rename from data/scripts/gUnk_08014E14.inc rename to data/scripts/script_08014E14.inc index abe606e1..4371d2c2 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08014E14 +SCRIPT_START script_08014E14 StartScript _0807EB44 0x0004 _0807E9D4 @@ -129,7 +129,7 @@ Call sub_0807DF28 SoundReq0x80100000 _0807F0B4 0x0001 CameraTargetEntity -StartPlayerScript gUnk_080152B4 +StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 TextboxNoOverlapFollowPos 0x00021301 _0807EA94 @@ -153,7 +153,7 @@ WaitForSomething2 0x00000004 _0807EB28 0x1306 _0807EA94 SoundReq0x80100000 -StartPlayerScript gUnk_080152DC +StartPlayerScript script_080152DC CameraTargetEntity _0807F0B4 0x0003 SetEntityPositionRelative 0x014801f8 @@ -162,7 +162,7 @@ Call sub_0804F6A8 Wait 0x0004 Call sub_0804F808 SoundReq 0x010b -StartPlayerScript gUnk_08015304 +StartPlayerScript script_08015304 Call sub_0804F6C8 Wait 0x0004 Call sub_0804F830 @@ -194,7 +194,7 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 SoundReq0x80100000 -StartPlayerScript gUnk_08015338 +StartPlayerScript script_08015338 WaitForSomething2 0x00000001 Wait 0x003c Call sub_0804F6A8 @@ -239,7 +239,7 @@ _0807E778 0x0100 DoFade4 _0807E80C 0x00000000 StopScript -StartPlayerScript gUnk_08015360 +StartPlayerScript script_08015360 WaitForSomething2 0x00000001 LoadRoomEntityList gUnk_080F7CB0 _0807E778 0x0004 diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/script_08015234.inc similarity index 94% rename from data/scripts/gUnk_08015234.inc rename to data/scripts/script_08015234.inc index 55a848f6..7f1a7109 100644 --- a/data/scripts/gUnk_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015234 +SCRIPT_START script_08015234 StartScript _0807EF80 0x0008 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/script_080152B4.inc similarity index 86% rename from data/scripts/gUnk_080152B4.inc rename to data/scripts/script_080152B4.inc index 034313cd..9cff9737 100644 --- a/data/scripts/gUnk_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080152B4 +SCRIPT_START script_080152B4 StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_080152DC.inc b/data/scripts/script_080152DC.inc similarity index 86% rename from data/scripts/gUnk_080152DC.inc rename to data/scripts/script_080152DC.inc index 7875ca7a..f675a24c 100644 --- a/data/scripts/gUnk_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080152DC +SCRIPT_START script_080152DC StartScript SetEntityNonPlanarMovement 0x0200 StopScript diff --git a/data/scripts/gUnk_08015304.inc b/data/scripts/script_08015304.inc similarity index 87% rename from data/scripts/gUnk_08015304.inc rename to data/scripts/script_08015304.inc index c0125a09..a5e22bf5 100644 --- a/data/scripts/gUnk_08015304.inc +++ b/data/scripts/script_08015304.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015304 +SCRIPT_START script_08015304 _0807EB44 0x0002 Wait 0x000a _0807EB44 0x0006 diff --git a/data/scripts/gUnk_08015338.inc b/data/scripts/script_08015338.inc similarity index 86% rename from data/scripts/gUnk_08015338.inc rename to data/scripts/script_08015338.inc index 2f546efa..a6f16509 100644 --- a/data/scripts/gUnk_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015338 +SCRIPT_START script_08015338 StartScript SetEntityNonPlanarMovement 0x0100 StopScript diff --git a/data/scripts/gUnk_08015360.inc b/data/scripts/script_08015360.inc similarity index 86% rename from data/scripts/gUnk_08015360.inc rename to data/scripts/script_08015360.inc index e686adc4..f3e9bb38 100644 --- a/data/scripts/gUnk_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015360 +SCRIPT_START script_08015360 StartScript SetEntityNonPlanarMovement 0x0100 SetEntityPositionRelative 0x01480208 diff --git a/data/scripts/gUnk_08015384.inc b/data/scripts/script_08015384.inc similarity index 61% rename from data/scripts/gUnk_08015384.inc rename to data/scripts/script_08015384.inc index e33a0bbc..6d9b5581 100644 --- a/data/scripts/gUnk_08015384.inc +++ b/data/scripts/script_08015384.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015384 +SCRIPT_START script_08015384 _0807EF80 0x0015 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/script_08015390.inc similarity index 85% rename from data/scripts/gUnk_08015390.inc rename to data/scripts/script_08015390.inc index ec27aae4..f5e53115 100644 --- a/data/scripts/gUnk_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015390 +SCRIPT_START script_08015390 StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 @@ -14,7 +14,7 @@ Call sub_0806D8A0 _0807EE30 JumpIfNot 0xfffc _0807E930 0x001f -StartPlayerScript gUnk_08015384 +StartPlayerScript script_08015384 Call sub_0806D9A4 _0807EF80 0x0008 Wait 0x0078 diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/script_080153EC.inc similarity index 96% rename from data/scripts/gUnk_080153EC.inc rename to data/scripts/script_080153EC.inc index d3c28c86..dfd7dfc5 100644 --- a/data/scripts/gUnk_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080153EC +SCRIPT_START script_080153EC StartScript _0807F0B4 0x0007 SetEntityPositionRelative 0x00680078 diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/script_0801548E.inc similarity index 95% rename from data/scripts/gUnk_0801548E.inc rename to data/scripts/script_0801548E.inc index fc9f8372..6d325462 100644 --- a/data/scripts/gUnk_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801548E +SCRIPT_START script_0801548E _0807E5F8 0x00000800 WaitForSomething2 0x00001000 SoundReq 0x0125 diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/script_0801550C.inc similarity index 96% rename from data/scripts/gUnk_0801550C.inc rename to data/scripts/script_0801550C.inc index f2635e78..c2bf4230 100644 --- a/data/scripts/gUnk_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801550C +SCRIPT_START script_0801550C StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_080155F4.inc b/data/scripts/script_080155F4.inc similarity index 84% rename from data/scripts/gUnk_080155F4.inc rename to data/scripts/script_080155F4.inc index 2e04b951..727f25de 100644 --- a/data/scripts/gUnk_080155F4.inc +++ b/data/scripts/script_080155F4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080155F4 +SCRIPT_START script_080155F4 WaitForSomething2 0x00000020 _0807E930 0x0000 Wait 0x0014 diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/script_08015618.inc similarity index 93% rename from data/scripts/gUnk_08015618.inc rename to data/scripts/script_08015618.inc index fa0553ff..cc3d5d59 100644 --- a/data/scripts/gUnk_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015618 +SCRIPT_START script_08015618 StartScript _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0040 diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/script_08015684.inc similarity index 96% rename from data/scripts/gUnk_08015684.inc rename to data/scripts/script_08015684.inc index 13a7042e..f56d6035 100644 --- a/data/scripts/gUnk_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015684 +SCRIPT_START script_08015684 StartScript _0807EF80 0x0007 _0807EF80 0x000b diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/script_08015754.inc similarity index 93% rename from data/scripts/gUnk_08015754.inc rename to data/scripts/script_08015754.inc index 8ec9bfa5..caa94f3d 100644 --- a/data/scripts/gUnk_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015754 +SCRIPT_START script_08015754 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/script_080157AC.inc similarity index 91% rename from data/scripts/gUnk_080157AC.inc rename to data/scripts/script_080157AC.inc index aaa816ed..43f48112 100644 --- a/data/scripts/gUnk_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080157AC +SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot 0xfff6 _0807E864 @@ -17,7 +17,7 @@ Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -StartPlayerScript gUnk_080158F8 +StartPlayerScript script_080158F8 _0807F0B4 0x0001 SetEntityPositionRelative 0x02180248 CameraTargetEntity @@ -27,7 +27,7 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000020 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -StartPlayerScript gUnk_08015918 +StartPlayerScript script_08015918 WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -49,7 +49,7 @@ Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x02080248 CameraTargetEntity -StartPlayerScript gUnk_08015938 +StartPlayerScript script_08015938 WaitForSomething2 0x00000010 TextboxNoOverlapFollowPos 0x000c106a _0807EA94 diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/script_080158F8.inc similarity index 83% rename from data/scripts/gUnk_080158F8.inc rename to data/scripts/script_080158F8.inc index 8c1025b2..24219a34 100644 --- a/data/scripts/gUnk_080158F8.inc +++ b/data/scripts/script_080158F8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080158F8 +SCRIPT_START script_080158F8 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_08015918.inc b/data/scripts/script_08015918.inc similarity index 83% rename from data/scripts/gUnk_08015918.inc rename to data/scripts/script_08015918.inc index 010c2646..a038ba06 100644 --- a/data/scripts/gUnk_08015918.inc +++ b/data/scripts/script_08015918.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015918 +SCRIPT_START script_08015918 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/script_08015938.inc similarity index 83% rename from data/scripts/gUnk_08015938.inc rename to data/scripts/script_08015938.inc index e2045e39..ef7c6df3 100644 --- a/data/scripts/gUnk_08015938.inc +++ b/data/scripts/script_08015938.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015938 +SCRIPT_START script_08015938 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/script_08015958.inc similarity index 97% rename from data/scripts/gUnk_08015958.inc rename to data/scripts/script_08015958.inc index a8c6eebf..c02f9c7b 100644 --- a/data/scripts/gUnk_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015958 +SCRIPT_START script_08015958 StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08015A7C.inc b/data/scripts/script_08015A7C.inc similarity index 85% rename from data/scripts/gUnk_08015A7C.inc rename to data/scripts/script_08015A7C.inc index 6345c5f5..f475a610 100644 --- a/data/scripts/gUnk_08015A7C.inc +++ b/data/scripts/script_08015A7C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015A7C +SCRIPT_START script_08015A7C SetEntityNonPlanarMovement 0x0100 _0807EF80 0x0001 _0807EC64 0x0010 diff --git a/data/scripts/gUnk_08015AA0.inc b/data/scripts/script_08015AA0.inc similarity index 85% rename from data/scripts/gUnk_08015AA0.inc rename to data/scripts/script_08015AA0.inc index 72a3a9ee..b69294ae 100644 --- a/data/scripts/gUnk_08015AA0.inc +++ b/data/scripts/script_08015AA0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015AA0 +SCRIPT_START script_08015AA0 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x0001 _0807EC94 0x0010 diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/script_08015AC4.inc similarity index 92% rename from data/scripts/gUnk_08015AC4.inc rename to data/scripts/script_08015AC4.inc index 754b2b65..8577a203 100644 --- a/data/scripts/gUnk_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015AC4 +SCRIPT_START script_08015AC4 StartScript _0807EF80 0x0007 _0807EF80 0x000a diff --git a/data/scripts/gUnk_08015B14.inc b/data/scripts/script_08015B14.inc similarity index 84% rename from data/scripts/gUnk_08015B14.inc rename to data/scripts/script_08015B14.inc index 822f52f1..cbf55e0a 100644 --- a/data/scripts/gUnk_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015B14 +SCRIPT_START script_08015B14 StartScript _0807E930 0x0018 SetEntityNonPlanarMovement 0x0300 diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/script_08015B34.inc similarity index 83% rename from data/scripts/gUnk_08015B34.inc rename to data/scripts/script_08015B34.inc index 26bd551f..43be14a7 100644 --- a/data/scripts/gUnk_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015B34 +SCRIPT_START script_08015B34 StopScript StartScript CheckLocalFlag 0x008b @@ -11,7 +11,7 @@ Call sub_0807F9A4 Call sub_0807DF28 TextboxNoOverlapFollowPos 0x00022506 _0807EA94 -StartPlayerScript gUnk_08015B84 +StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/script_08015B84.inc similarity index 85% rename from data/scripts/gUnk_08015B84.inc rename to data/scripts/script_08015B84.inc index 7893541f..5dd4496b 100644 --- a/data/scripts/gUnk_08015B84.inc +++ b/data/scripts/script_08015B84.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015B84 +SCRIPT_START script_08015B84 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x0001 _0807EC64 0x0010 diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/script_08015BA8.inc similarity index 91% rename from data/scripts/gUnk_08015BA8.inc rename to data/scripts/script_08015BA8.inc index 7ee39edb..adfad7ff 100644 --- a/data/scripts/gUnk_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015BA8 +SCRIPT_START script_08015BA8 StartScript SetLocalFlag 0x008e _0807E864 diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/script_08015BE8.inc similarity index 91% rename from data/scripts/gUnk_08015BE8.inc rename to data/scripts/script_08015BE8.inc index b513bb6f..9f40c115 100644 --- a/data/scripts/gUnk_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015BE8 +SCRIPT_START script_08015BE8 StartScript SetEntityNonPlanarMovement 0x0080 StopScript @@ -8,7 +8,7 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807FBC4 -StartPlayerScript gUnk_08015C7C +StartPlayerScript script_08015C7C WaitForSomething2 0x00000100 CameraTargetPlayer _0807E778 0x0004 diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/script_08015C7C.inc similarity index 92% rename from data/scripts/gUnk_08015C7C.inc rename to data/scripts/script_08015C7C.inc index 6c311115..69c8ec77 100644 --- a/data/scripts/gUnk_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015C7C +SCRIPT_START script_08015C7C StartScript SetEntityNonPlanarMovement 0x0080 StopScript diff --git a/data/scripts/gUnk_08015CD4.inc b/data/scripts/script_08015CD4.inc similarity index 97% rename from data/scripts/gUnk_08015CD4.inc rename to data/scripts/script_08015CD4.inc index 093fb138..109adf0a 100644 --- a/data/scripts/gUnk_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015CD4 +SCRIPT_START script_08015CD4 StartScript _0807F0B4 0x0007 SetEntityPositionRelative 0x00680088 diff --git a/data/scripts/gUnk_08015DF0.inc b/data/scripts/script_08015DF0.inc similarity index 94% rename from data/scripts/gUnk_08015DF0.inc rename to data/scripts/script_08015DF0.inc index 44523b73..71973282 100644 --- a/data/scripts/gUnk_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015DF0 +SCRIPT_START script_08015DF0 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/script_08015E58.inc similarity index 96% rename from data/scripts/gUnk_08015E58.inc rename to data/scripts/script_08015E58.inc index 99d6da07..fefb8c78 100644 --- a/data/scripts/gUnk_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015E58 +SCRIPT_START script_08015E58 StartScript _0807EF80 0x0008 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_08015F08.inc b/data/scripts/script_08015F08.inc similarity index 89% rename from data/scripts/gUnk_08015F08.inc rename to data/scripts/script_08015F08.inc index 41099f65..5a61abc2 100644 --- a/data/scripts/gUnk_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015F08 +SCRIPT_START script_08015F08 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08015F3C.inc b/data/scripts/script_08015F3C.inc similarity index 91% rename from data/scripts/gUnk_08015F3C.inc rename to data/scripts/script_08015F3C.inc index 1088fc63..6c5969c1 100644 --- a/data/scripts/gUnk_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015F3C +SCRIPT_START script_08015F3C StartScript SetEntityNonPlanarMovement 0x0080 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_08015F80.inc b/data/scripts/script_08015F80.inc similarity index 85% rename from data/scripts/gUnk_08015F80.inc rename to data/scripts/script_08015F80.inc index 9c648777..d204d00e 100644 --- a/data/scripts/gUnk_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015F80 +SCRIPT_START script_08015F80 StartScript _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/script_08015FA4.inc similarity index 81% rename from data/scripts/gUnk_08015FA4.inc rename to data/scripts/script_08015FA4.inc index 83e92568..ce99508c 100644 --- a/data/scripts/gUnk_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015FA4 +SCRIPT_START script_08015FA4 StartScript _0807EF80 0x000a Call sub_08066E38 diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/script_08015FC0.inc similarity index 90% rename from data/scripts/gUnk_08015FC0.inc rename to data/scripts/script_08015FC0.inc index 53484fd1..0052b733 100644 --- a/data/scripts/gUnk_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08015FC0 +SCRIPT_START script_08015FC0 StartScript Call sub_0806DB84 CheckKinstoneFused 0x0009 diff --git a/data/scripts/gUnk_08016004.inc b/data/scripts/script_08016004.inc similarity index 86% rename from data/scripts/gUnk_08016004.inc rename to data/scripts/script_08016004.inc index 0136d07a..a1552d3b 100644 --- a/data/scripts/gUnk_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08016004 +SCRIPT_START script_08016004 _0807E5F8 0x00000003 WaitForSomething2 0x0000000c _0807F0C8 0x0000, 0x0000 diff --git a/data/scripts/gUnk_08016030.inc b/data/scripts/script_08016030.inc similarity index 89% rename from data/scripts/gUnk_08016030.inc rename to data/scripts/script_08016030.inc index 057c45e2..7d5ebc10 100644 --- a/data/scripts/gUnk_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08016030 +SCRIPT_START script_08016030 StartScript CheckKinstoneFused 0x0009 JumpIf 0x002a diff --git a/data/scripts/gUnk_08016062.inc b/data/scripts/script_08016062.inc similarity index 66% rename from data/scripts/gUnk_08016062.inc rename to data/scripts/script_08016062.inc index 1dc40c78..05bedd70 100644 --- a/data/scripts/gUnk_08016062.inc +++ b/data/scripts/script_08016062.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08016062 +SCRIPT_START script_08016062 SetEntityPosition 0xfff0, 0x0000 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0801606C.inc b/data/scripts/script_0801606C.inc similarity index 89% rename from data/scripts/gUnk_0801606C.inc rename to data/scripts/script_0801606C.inc index d194b9dc..38573c40 100644 --- a/data/scripts/gUnk_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801606C +SCRIPT_START script_0801606C StartScript CheckKinstoneFused 0x0009 JumpIf 0x002a diff --git a/data/scripts/gUnk_0801609E.inc b/data/scripts/script_0801609E.inc similarity index 66% rename from data/scripts/gUnk_0801609E.inc rename to data/scripts/script_0801609E.inc index 381e9ecb..24376252 100644 --- a/data/scripts/gUnk_0801609E.inc +++ b/data/scripts/script_0801609E.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801609E +SCRIPT_START script_0801609E SetEntityPosition 0x0010, 0x0000 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/script_080160A8.inc similarity index 97% rename from data/scripts/gUnk_080160A8.inc rename to data/scripts/script_080160A8.inc index 3595816a..1bab6404 100644 --- a/data/scripts/gUnk_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080160A8 +SCRIPT_START script_080160A8 StartScript _0807E9D4 _0807E930 0x0008 @@ -112,7 +112,7 @@ Call sub_08068DD0 _0807EA94 _0807E3E8 JumpIfNot 0x010a -StartPlayerScript gUnk_0801635C +StartPlayerScript script_0801635C WaitForSomething2 0x00000001 _0807EB74 Call sub_08068C8C diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/script_0801635C.inc similarity index 83% rename from data/scripts/gUnk_0801635C.inc rename to data/scripts/script_0801635C.inc index 1698dde2..ae7cba03 100644 --- a/data/scripts/gUnk_0801635C.inc +++ b/data/scripts/script_0801635C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801635C +SCRIPT_START script_0801635C SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/script_0801637C.inc similarity index 65% rename from data/scripts/gUnk_0801637C.inc rename to data/scripts/script_0801637C.inc index 72529ceb..4f3d7a3b 100644 --- a/data/scripts/gUnk_0801637C.inc +++ b/data/scripts/script_0801637C.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_0801637C +SCRIPT_START script_0801637C .short 0xb500 .short 0xf08c .short 0xfb1d diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/script_08016384.inc similarity index 79% rename from data/scripts/gUnk_08016384.inc rename to data/scripts/script_08016384.inc index d1cfa60c..91df7477 100644 --- a/data/scripts/gUnk_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,17 +1,17 @@ -SCRIPT_START gUnk_08016384 +SCRIPT_START script_08016384 StartScript StopScript Jump 0xfffa JumpIf 0xfff6 JumpIfNot 0xfff2 _0807E078 0xffee, 0xffec -JumpAbsolute gUnk_08016384 -JumpAbsoluteIf gUnk_08016384 -JumpAbsoluteIfNot gUnk_08016384 -_0807E0E0 gUnk_08016384, gUnk_08016384 -Call 0x08016384 -CallWithArg 0x08016384, 0x12345678 -LoadRoomEntityList gUnk_08016384 +JumpAbsolute script_08016384 +JumpAbsoluteIf script_08016384 +JumpAbsoluteIfNot script_08016384 +_0807E0E0 script_08016384, script_08016384 +Call script_08016384 +CallWithArg script_08016384, 0x12345678 +LoadRoomEntityList script_08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/script_08016482.inc similarity index 95% rename from data/scripts/gUnk_08016482.inc rename to data/scripts/script_08016482.inc index 98339999..6469cbd2 100644 --- a/data/scripts/gUnk_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_08016482 +SCRIPT_START script_08016482 _0807E79C ScriptCommandNop2 0x0080 DoFade4 @@ -12,7 +12,7 @@ _0807E864 _0807E878 _0807E888 SetPlayerAction 0x00005408 -StartPlayerScript gUnk_08016384 +StartPlayerScript script_08016384 _0807E8D4 0x03a0 _0807E8E4_0 _0807E8E4_1 diff --git a/data/scripts/gUnk_080165A4.inc b/data/scripts/script_080165A4.inc similarity index 80% rename from data/scripts/gUnk_080165A4.inc rename to data/scripts/script_080165A4.inc index ed0ad838..510a3c75 100644 --- a/data/scripts/gUnk_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,4 +1,4 @@ -SCRIPT_START gUnk_080165A4 +SCRIPT_START script_080165A4 StartScript _0807EF80 0x000a _0807EB44 0x0004 @@ -11,6 +11,6 @@ Wait 0x001e CheckPlayerInRegion2 0x2020 JumpIfNot 0xfff6 _0807EF80 0x0003 -Call 0x0801637D +Call script_0801637C+1 Jump 0xffe8 .short 0x0000 diff --git a/data/scripts/gUnk_080165D8.inc b/data/scripts/script_080165D8.inc similarity index 97% rename from data/scripts/gUnk_080165D8.inc rename to data/scripts/script_080165D8.inc index 3834a417..6e52616b 100644 --- a/data/scripts/gUnk_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -1,10 +1,10 @@ -SCRIPT_START gUnk_080165D8 +SCRIPT_START script_080165D8 Wait 0x001e CheckPlayerInRegion2 0x2020 -JumpAbsoluteIfNot gUnk_080165D8 +JumpAbsoluteIfNot script_080165D8 _0807EF80 0x0003 -Call 0x0801637D -JumpAbsolute gUnk_080165D8 +Call script_0801637C+1 +JumpAbsolute script_080165D8 .short 0x0000 StartScript _0807E9D4 diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c index 532be89c..ae684276 100644 --- a/src/npc/ezloCap.c +++ b/src/npc/ezloCap.c @@ -6,8 +6,8 @@ #include "script.h" extern Hitbox gUnk_080FD170; -extern void gUnk_08016030; // Cutscene data type? -extern void gUnk_0801606C; // Cutscene data type? +extern void script_08016030; // Cutscene data type? +extern void script_0801606C; // Cutscene data type? extern void sub_0809623C(Entity*); extern void sub_08096260(Entity*); @@ -219,12 +219,12 @@ void sub_0806DB84(Entity* this, u8 unused) { ent = CreateObject(0x3e, 4, 0); if (ent != NULL) { PositionRelative(this, ent, -0x80000, 0); - *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_08016030); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030); } ent = CreateObject(0x3e, 5, 0); if (ent != NULL) { PositionRelative(this, ent, 0x80000, 0); - *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_0801606C); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C); } } diff --git a/src/npc/rem.c b/src/npc/rem.c index a0b87267..c0be96f9 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -10,7 +10,7 @@ extern void sub_0806A8C8(Entity*); extern void (*gUnk_08112260[])(Entity*); extern void (*gUnk_08112278[])(Entity*); -extern void gUnk_08012F0C; +extern void script_08012F0C; void Rem(Entity* this) { gUnk_08112260[this->type](this); @@ -44,7 +44,7 @@ void sub_0806A3D8(Entity* this) { this->actionDelay = 0xb4; sub_0805E3A0(this, 2); sub_0806A8C8(this); - uVar1 = StartCutscene(this, &gUnk_08012F0C); + uVar1 = StartCutscene(this, &script_08012F0C); *(ScriptExecutionContext**)&this->cutsceneBeh = uVar1; sub_0807DD94(this, NULL); } diff --git a/src/npc/talon.c b/src/npc/talon.c index 24380fc9..45278133 100644 --- a/src/npc/talon.c +++ b/src/npc/talon.c @@ -8,7 +8,7 @@ extern void (*gUnk_0810FEC4[])(Entity* this); extern void (*gUnk_0810FEBC[])(Entity* this); extern SpriteLoadData gUnk_0810FEB0; -extern u8 gUnk_0800B41C; +extern u8 script_0800B41C; extern u8 gUnk_0810FED8[]; void sub_0806574C(Entity* this); @@ -107,7 +107,7 @@ void sub_080656D4(Entity* this) { } else { if (this->interactType != 0) { if (GetInventoryValue(0x37) != 0) { // keyLonLon - StartCutscene(this, (u16*)&gUnk_0800B41C); + StartCutscene(this, (u16*)&script_0800B41C); goto label2; } else { this->field_0x68.HALF.HI = this->action; diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index 9429ccd6..09a9b2cb 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -24,7 +24,7 @@ extern void (*const gUnk_08113A7C[])(Entity*); extern void (*const gUnk_08113A8C[])(Entity*, Entity*); extern SpriteLoadData gUnk_08113A1C[]; -extern u32 gUnk_08014A80; +extern u32 script_08014A80; extern Dialog gUnk_08113ABC[]; extern u16 gUnk_08113B0C[]; @@ -57,7 +57,7 @@ void sub_0806C7D4(Entity* this) { sub_0807DD94(this, NULL); if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && (CheckRoomFlag(0))) { this->type2 = 7; - sub_0807DD80(this, &gUnk_08014A80); + sub_0807DD80(this, &script_08014A80); } } } diff --git a/src/room.c b/src/room.c index f400ce7f..dd7e34f5 100644 --- a/src/room.c +++ b/src/room.c @@ -386,7 +386,7 @@ u32 sub_0804B7A8(void) { return 1; } -extern void* gUnk_08010A5C[]; +extern void* script_08010A5C[]; void sub_0804B7E8(void) { if (CheckLocalFlag(0x91)) { @@ -394,7 +394,7 @@ void sub_0804B7E8(void) { DoFade(5, 0x100); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &gUnk_08010A5C); + sub_080751E8(1, 2, &script_08010A5C); } } @@ -420,7 +420,7 @@ void sub_0804B86C(void) { DoFade(5, 0x100); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &gUnk_08010A5C); + sub_080751E8(1, 2, &script_08010A5C); } } @@ -440,7 +440,7 @@ u32 sub_0804B8B0(void) { return 1; } -extern void* gUnk_08010A5C[]; +extern void* script_08010A5C[]; void sub_0804B8F0(void) { if (CheckLocalFlag(0x91)) { @@ -448,7 +448,7 @@ void sub_0804B8F0(void) { DoFade(5, 0x100); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &gUnk_08010A5C); + sub_080751E8(1, 2, &script_08010A5C); } } @@ -648,14 +648,14 @@ u32 sub_0804BC50(void) { return 1; } -extern u32 gUnk_08009E88; +extern u32 script_08009E88; void sub_0804BC70(void) { if (!CheckLocalFlag(0x9f)) { DoFade(5, 0x100); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40; - sub_080751E8(0, 6, &gUnk_08009E88); + sub_080751E8(0, 6, &script_08009E88); } if (!CheckGlobalFlag(TABIDACHI)) { sub_08052878(); @@ -4774,7 +4774,7 @@ u32 sub_0804E7D8() { extern EntityData gUnk_080F31D8; extern u8 gUnk_02000070; -extern u32 gUnk_08009B30; +extern u32 script_08009B30; void sub_0804E7DC(void) { @@ -4782,7 +4782,7 @@ void sub_0804E7DC(void) { sub_080A71C4(5, 1, 4, 4); gUnk_02000070 = 0; DoFade(5, 0x100); - sub_080751E8(0, 6, &gUnk_08009B30); + sub_080751E8(0, 6, &script_08009B30); } if (!CheckGlobalFlag(OUTDOOR)) { gArea.musicIndex = gArea.pMusicIndex; @@ -4793,12 +4793,12 @@ void sub_0804E7DC(void) { } } -extern u32 gUnk_08009E58; +extern u32 script_08009E58; void sub_0804E864(void) { gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 6, &gUnk_08009E58); + sub_080751E8(1, 6, &script_08009E58); ModHealth(0xa0); } @@ -5274,14 +5274,14 @@ u32 sub_0804EFDC(void) { } extern EntityData gUnk_080F5DD0; -extern u32 gUnk_08011C50; +extern u32 script_08011C50; void sub_0804EFF8(void) { if (gSave.unk8 > 7) { LoadRoomEntityList(&gUnk_080F5DD0); } if (CheckGlobalFlag(MAROYA_WAKEUP)) { - sub_080751E8(1, 2, &gUnk_08011C50); + sub_080751E8(1, 2, &script_08011C50); } } diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py index d8cbbf45..0416892e 100644 --- a/tools/script_disassembler/incbin_parser.py +++ b/tools/script_disassembler/incbin_parser.py @@ -23,7 +23,7 @@ def read_baserom(): return bytearray(baserom.read()) def get_label(addr): - return hex(addr).upper().replace('0X', 'gUnk_0') + return hex(addr).upper().replace('0X', 'script_0') def main(): baserom_data = read_baserom() diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index b161301f..2cf3524d 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -34,8 +34,8 @@ POINTER_MAP = { 'sub_08095458': 'nullsub_527', 'sub_0805EBCC': 'DeleteAllEnemies', 'sub_0806C23C': 'Simon_CreateChest', - 'sub_0801637C': '0x0801637D', # TODO disassembly assembly code between scripts - 'sub_08016383': '0x08016384', # TODO points to the end of the previous function? + 'sub_0801637C': 'script_0801637C+1', + 'sub_08016383': 'script_08016384', 'sub_0806C598': 'FUN_0806c598', 'sub_080A2138': 'Windcrest_Unlock', 'sub_080A29BC': 'CreateDust' @@ -48,22 +48,34 @@ def get_pointer(barray): return POINTER_MAP[pointer] return pointer +# Data pointers that actually point to a script location +DATA_MAP = { + 'gUnk_08016384': 'script_08016384' +} def get_data_pointer(barray): integers = struct.unpack('I', barray) - return 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper() + pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper() + if pointer in DATA_MAP: + return DATA_MAP[pointer] + return pointer + +def get_script_pointer(barray): + integers = struct.unpack('I', barray) + return 'script_' + (struct.pack('>I', integers[0]).hex()).upper() + commands = [ - {'fun': 'ScriptCommandNop', 'params': 'v'}, # TODO one version with length 33??? + {'fun': 'ScriptCommandNop', 'params': ''}, {'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': ['ss', 'sss', 'ssss', 'sssssss', 'sssssssss']}, - {'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_JumpAbsolute', 'params': 'x','name': 'abs jump' }, + {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'}, + {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'}, + {'fun': 'ScriptCommand_0807E0E0', 'params': 'xx'}, {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call}, {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']}, {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'}, @@ -124,7 +136,7 @@ commands = [ {'fun': 'ScriptCommand_0807E878', 'params': ''}, {'fun': 'ScriptCommand_0807E888', 'params': ''}, {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'}, - {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'd'}, + {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'}, {'fun': 'ScriptCommand_0807E8D4', 'params': 's'}, {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate @@ -194,8 +206,6 @@ commands = [ {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'} ] -# TODO replace variable parameters with parameter variants that explicitely define macros for all possibilities - # definitions for parameters parameters = { '': { @@ -264,30 +274,38 @@ parameters = { 'expr': ' .word \w', 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) }, - 'pv': { - 'length': -2, + 'x': { # Script pointer + 'length': 2, 'param': 'w', 'expr': ' .word \w', - 'read': lambda ctx: '' + 'read': lambda ctx: get_script_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+14])[0] }, - 'dd': { + 'xx': { '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]) + 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10]) }, - 'v': { # variable parameter count (TODO why?) - 'length': -1, - 'param': '', - 'expr': '', - 'read': lambda ctx: '' - } + # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations + # 'v': { + # 'length': -1, + # 'param': '', + # 'expr': '', + # 'read': lambda ctx: '' + # }, + # 'pv': { + # 'length': -2, + # 'param': 'w', + # 'expr': ' .word \w', + # 'read': lambda ctx: '' + # }, } # Remove the ScriptCommand_ prefix for the asm macros