From 5e2af32bb11f35dee966343959d955147c660204 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 9 Mar 2021 01:28:13 +0100 Subject: [PATCH] named some stuff --- asm/bigGoron.s | 8 +- asm/brocco.s | 4 +- asm/code_080526F8.s | 6 +- asm/code_080732D0.s | 4 +- asm/code_0807F0D8.s | 6 +- asm/drLeft.s | 4 +- asm/farmers.s | 4 +- asm/festari.s | 2 +- asm/gregal.s | 8 +- asm/librarians.s | 4 +- asm/macros/scripts.inc | 363 +++++++++++------------ asm/mama.s | 4 +- asm/manager16.s | 2 +- asm/mazaalMacro.s | 4 +- asm/minishEzlo.s | 4 +- asm/mountainMinish.s | 4 +- asm/object3E.s | 8 +- asm/object5B.s | 2 +- asm/object6.s | 6 +- asm/object6A.s | 70 ++--- asm/object89.s | 2 +- asm/object97.s | 4 +- asm/objectB3.s | 4 +- asm/phonograph.s | 4 +- asm/pina.s | 4 +- asm/sittingPerson.s | 4 +- asm/stockwell.s | 10 +- asm/vaati.s | 2 +- asm/whirlwind.s | 4 +- data/scripts/script_08008B5C.inc | 12 +- data/scripts/script_08008D50.inc | 2 +- data/scripts/script_08008D8C.inc | 6 +- data/scripts/script_08008F74.inc | 8 +- data/scripts/script_08008FFC.inc | 4 +- data/scripts/script_0800903C.inc | 66 ++--- data/scripts/script_08009464.inc | 2 +- data/scripts/script_080094CC.inc | 2 +- data/scripts/script_080094FC.inc | 26 +- data/scripts/script_080095F2.inc | 22 +- data/scripts/script_08009704.inc | 8 +- data/scripts/script_08009740.inc | 10 +- data/scripts/script_080097F0.inc | 4 +- data/scripts/script_08009838.inc | 4 +- data/scripts/script_0800987C.inc | 2 +- data/scripts/script_080098D4.inc | 2 +- data/scripts/script_08009950.inc | 8 +- data/scripts/script_080099DC.inc | 10 +- data/scripts/script_08009A84.inc | 6 +- data/scripts/script_08009AF8.inc | 4 +- data/scripts/script_08009B30.inc | 2 +- data/scripts/script_08009B78.inc | 22 +- data/scripts/script_08009C68.inc | 10 +- data/scripts/script_08009CFC.inc | 8 +- data/scripts/script_08009D6C.inc | 4 +- data/scripts/script_08009DB0.inc | 4 +- data/scripts/script_08009E4E.inc | 2 +- data/scripts/script_08009E58.inc | 2 +- data/scripts/script_08009E88.inc | 2 +- data/scripts/script_08009ECC.inc | 4 +- data/scripts/script_08009EF0.inc | 4 +- data/scripts/script_08009F14.inc | 6 +- data/scripts/script_0800A088.inc | 2 +- data/scripts/script_0800A0B4.inc | 2 +- data/scripts/script_0800A0FC.inc | 2 +- data/scripts/script_0800A160.inc | 4 +- data/scripts/script_0800A1B4.inc | 6 +- data/scripts/script_0800A1D8.inc | 2 +- data/scripts/script_0800A310.inc | 8 +- data/scripts/script_0800A3D8.inc | 18 +- data/scripts/script_0800A500.inc | 6 +- data/scripts/script_0800A590.inc | 10 +- data/scripts/script_0800A638.inc | 6 +- data/scripts/script_0800A65C.inc | 6 +- data/scripts/script_0800A680.inc | 6 +- data/scripts/script_0800A6A4.inc | 2 +- data/scripts/script_0800A6D4.inc | 2 +- data/scripts/script_0800A704.inc | 2 +- data/scripts/script_0800A734.inc | 2 +- data/scripts/script_0800A764.inc | 2 +- data/scripts/script_0800A7E4.inc | 26 +- data/scripts/script_0800A964.inc | 4 +- data/scripts/script_0800A988.inc | 4 +- data/scripts/script_0800A9AC.inc | 4 +- data/scripts/script_0800A9D0.inc | 4 +- data/scripts/script_0800A9F4.inc | 2 +- data/scripts/script_0800AA48.inc | 4 +- data/scripts/script_0800AA6C.inc | 4 +- data/scripts/script_0800AA90.inc | 4 +- data/scripts/script_0800AAB4.inc | 4 +- data/scripts/script_0800AAD8.inc | 2 +- data/scripts/script_0800AB6E.inc | 2 +- data/scripts/script_0800ACBC.inc | 2 +- data/scripts/script_0800ACE0.inc | 6 +- data/scripts/script_0800AD54.inc | 10 +- data/scripts/script_0800AEA4.inc | 10 +- data/scripts/script_0800AEDC.inc | 8 +- data/scripts/script_0800AF18.inc | 6 +- data/scripts/script_0800AF44.inc | 2 +- data/scripts/script_0800AF68.inc | 2 +- data/scripts/script_0800AF8C.inc | 2 +- data/scripts/script_0800AFB0.inc | 2 +- data/scripts/script_0800AFE8.inc | 2 +- data/scripts/script_0800B00C.inc | 12 +- data/scripts/script_0800B0AC.inc | 2 +- data/scripts/script_0800B0D0.inc | 2 +- data/scripts/script_0800B1C0.inc | 6 +- data/scripts/script_0800B254.inc | 4 +- data/scripts/script_0800B308.inc | 4 +- data/scripts/script_0800B3A4.inc | 2 +- data/scripts/script_0800B41C.inc | 8 +- data/scripts/script_0800B4AC.inc | 14 +- data/scripts/script_0800B54C.inc | 2 +- data/scripts/script_0800B574.inc | 10 +- data/scripts/script_0800B5EC.inc | 4 +- data/scripts/script_0800B7C4.inc | 2 +- data/scripts/script_0800B7FC.inc | 2 +- data/scripts/script_0800B828.inc | 28 +- data/scripts/script_0800B9B4.inc | 10 +- data/scripts/script_0800BACC.inc | 4 +- data/scripts/script_0800BB00.inc | 4 +- data/scripts/script_0800BB30.inc | 4 +- data/scripts/script_0800BB64.inc | 2 +- data/scripts/script_0800BBA4.inc | 6 +- data/scripts/script_0800BBDC.inc | 2 +- data/scripts/script_0800BC08.inc | 6 +- data/scripts/script_0800BC50.inc | 10 +- data/scripts/script_0800BCE8.inc | 4 +- data/scripts/script_0800BD78.inc | 6 +- data/scripts/script_0800BE1C.inc | 4 +- data/scripts/script_0800BECC.inc | 6 +- data/scripts/script_0800BF38.inc | 4 +- data/scripts/script_0800C004.inc | 6 +- data/scripts/script_0800C0B0.inc | 4 +- data/scripts/script_0800C160.inc | 6 +- data/scripts/script_0800C1D8.inc | 4 +- data/scripts/script_0800C2A4.inc | 6 +- data/scripts/script_0800C45C.inc | 2 +- data/scripts/script_0800C494.inc | 2 +- data/scripts/script_0800C4D0.inc | 2 +- data/scripts/script_0800C50C.inc | 4 +- data/scripts/script_0800C550.inc | 54 ++-- data/scripts/script_0800C8C8.inc | 2 +- data/scripts/script_0800C8F0.inc | 2 +- data/scripts/script_0800C91C.inc | 2 +- data/scripts/script_0800CA8C.inc | 4 +- data/scripts/script_0800CABC.inc | 18 +- data/scripts/script_0800CB54.inc | 20 +- data/scripts/script_0800CBD4.inc | 18 +- data/scripts/script_0800CC6C.inc | 18 +- data/scripts/script_0800CD04.inc | 18 +- data/scripts/script_0800CD7C.inc | 8 +- data/scripts/script_0800D190.inc | 2 +- data/scripts/script_0800D1B4.inc | 2 +- data/scripts/script_0800D218.inc | 4 +- data/scripts/script_0800D242.inc | 2 +- data/scripts/script_0800D24C.inc | 2 +- data/scripts/script_0800D254.inc | 8 +- data/scripts/script_0800D278.inc | 10 +- data/scripts/script_0800D3EC.inc | 4 +- data/scripts/script_0800D414.inc | 16 +- data/scripts/script_0800D698.inc | 2 +- data/scripts/script_0800D6B4.inc | 4 +- data/scripts/script_0800D6D0.inc | 4 +- data/scripts/script_0800D6F0.inc | 4 +- data/scripts/script_0800D710.inc | 2 +- data/scripts/script_0800D76C.inc | 16 +- data/scripts/script_0800D84C.inc | 2 +- data/scripts/script_0800D874.inc | 6 +- data/scripts/script_0800D92C.inc | 4 +- data/scripts/script_0800D954.inc | 8 +- data/scripts/script_0800DA00.inc | 4 +- data/scripts/script_0800DA28.inc | 6 +- data/scripts/script_0800DA60.inc | 2 +- data/scripts/script_0800DB18.inc | 2 +- data/scripts/script_0800DB28.inc | 12 +- data/scripts/script_0800DC4C.inc | 2 +- data/scripts/script_0800DCAC.inc | 22 +- data/scripts/script_0800DDD0.inc | 2 +- data/scripts/script_0800DE00.inc | 6 +- data/scripts/script_0800DE2C.inc | 2 +- data/scripts/script_0800DE50.inc | 2 +- data/scripts/script_0800DE78.inc | 2 +- data/scripts/script_0800DEB0.inc | 2 +- data/scripts/script_0800DED4.inc | 10 +- data/scripts/script_0800DF24.inc | 12 +- data/scripts/script_0800DFB4.inc | 2 +- data/scripts/script_0800DFE4.inc | 2 +- data/scripts/script_0800E050.inc | 2 +- data/scripts/script_0800E094.inc | 2 +- data/scripts/script_0800E0BC.inc | 52 ++-- data/scripts/script_0800E504.inc | 2 +- data/scripts/script_0800E544.inc | 2 +- data/scripts/script_0800E58C.inc | 4 +- data/scripts/script_0800E5C4.inc | 2 +- data/scripts/script_0800E600.inc | 2 +- data/scripts/script_0800E62C.inc | 2 +- data/scripts/script_0800E658.inc | 2 +- data/scripts/script_0800E684.inc | 2 +- data/scripts/script_0800E6B0.inc | 14 +- data/scripts/script_0800E908.inc | 8 +- data/scripts/script_0800E9F4.inc | 4 +- data/scripts/script_0800EA1C.inc | 8 +- data/scripts/script_0800EA54.inc | 32 +- data/scripts/script_0800EF40.inc | 2 +- data/scripts/script_0800EF9C.inc | 2 +- data/scripts/script_0800EFC0.inc | 8 +- data/scripts/script_0800F14C.inc | 8 +- data/scripts/script_0800F184.inc | 16 +- data/scripts/script_0800F39C.inc | 16 +- data/scripts/script_0800F430.inc | 16 +- data/scripts/script_0800F4C4.inc | 16 +- data/scripts/script_0800F554.inc | 34 +-- data/scripts/script_0800F724.inc | 6 +- data/scripts/script_0800FA54.inc | 2 +- data/scripts/script_0800FA78.inc | 2 +- data/scripts/script_0800FA9C.inc | 2 +- data/scripts/script_0800FAC0.inc | 2 +- data/scripts/script_0800FAE4.inc | 2 +- data/scripts/script_0800FB2C.inc | 2 +- data/scripts/script_0800FB44.inc | 52 ++-- data/scripts/script_0800FD80.inc | 2 +- data/scripts/script_0800FDA0.inc | 34 +-- data/scripts/script_0800FF18.inc | 6 +- data/scripts/script_0800FF74.inc | 8 +- data/scripts/script_080100C8.inc | 16 +- data/scripts/script_08010264.inc | 76 ++--- data/scripts/script_08010964.inc | 2 +- data/scripts/script_080109F0.inc | 2 +- data/scripts/script_08010A14.inc | 2 +- data/scripts/script_08010A38.inc | 2 +- data/scripts/script_08010A5C.inc | 2 +- data/scripts/script_08010A98.inc | 12 +- data/scripts/script_08010B68.inc | 8 +- data/scripts/script_08010BB4.inc | 4 +- data/scripts/script_08010F84.inc | 2 +- data/scripts/script_08011074.inc | 2 +- data/scripts/script_08011098.inc | 2 +- data/scripts/script_080110BC.inc | 4 +- data/scripts/script_080110E8.inc | 4 +- data/scripts/script_08011128.inc | 14 +- data/scripts/script_080111CC.inc | 28 +- data/scripts/script_080112C4.inc | 12 +- data/scripts/script_080113AA.inc | 8 +- data/scripts/script_08011442.inc | 8 +- data/scripts/script_08011508.inc | 8 +- data/scripts/script_080115D0.inc | 2 +- data/scripts/script_08011608.inc | 2 +- data/scripts/script_08011640.inc | 14 +- data/scripts/script_080116A8.inc | 46 +-- data/scripts/script_0801183C.inc | 2 +- data/scripts/script_08011890.inc | 2 +- data/scripts/script_080118D4.inc | 2 +- data/scripts/script_08011940.inc | 2 +- data/scripts/script_0801194C.inc | 14 +- data/scripts/script_08011B20.inc | 2 +- data/scripts/script_08011B40.inc | 8 +- data/scripts/script_08011C50.inc | 2 +- data/scripts/script_08011C7C.inc | 140 ++++----- data/scripts/script_0801232C.inc | 10 +- data/scripts/script_08012410.inc | 2 +- data/scripts/script_08012430.inc | 4 +- data/scripts/script_080126FC.inc | 20 +- data/scripts/script_08012AC8.inc | 4 +- data/scripts/script_08012AF0.inc | 4 +- data/scripts/script_08012B18.inc | 2 +- data/scripts/script_08012B24.inc | 2 +- data/scripts/script_08012B50.inc | 2 +- data/scripts/script_08012B7C.inc | 2 +- data/scripts/script_08012BA8.inc | 4 +- data/scripts/script_08012BF8.inc | 4 +- data/scripts/script_08012C48.inc | 4 +- data/scripts/script_08012C68.inc | 4 +- data/scripts/script_08012CD8.inc | 2 +- data/scripts/script_08012D18.inc | 2 +- data/scripts/script_08012D70.inc | 2 +- data/scripts/script_08012DB0.inc | 2 +- data/scripts/script_08012DF8.inc | 2 +- data/scripts/script_08012E88.inc | 10 +- data/scripts/script_08012F86.inc | 4 +- data/scripts/script_080130E4.inc | 4 +- data/scripts/script_08013114.inc | 6 +- data/scripts/script_0801319A.inc | 2 +- data/scripts/script_080132E4.inc | 4 +- data/scripts/script_0801330C.inc | 4 +- data/scripts/script_0801334C.inc | 8 +- data/scripts/script_08013378.inc | 2 +- data/scripts/script_080133C4.inc | 6 +- data/scripts/script_080133F8.inc | 16 +- data/scripts/script_08013494.inc | 2 +- data/scripts/script_080134DC.inc | 2 +- data/scripts/script_08013650.inc | 2 +- data/scripts/script_080136B4.inc | 2 +- data/scripts/script_080136D8.inc | 2 +- data/scripts/script_08013720.inc | 4 +- data/scripts/script_080138B4.inc | 2 +- data/scripts/script_08013AA6.inc | 2 +- data/scripts/script_08013B18.inc | 2 +- data/scripts/script_08013BE8.inc | 10 +- data/scripts/script_08013CA4.inc | 2 +- data/scripts/script_08013D04.inc | 4 +- data/scripts/script_08013D44.inc | 4 +- data/scripts/script_08013D84.inc | 4 +- data/scripts/script_08013DC4.inc | 4 +- data/scripts/script_08013E04.inc | 2 +- data/scripts/script_08013E28.inc | 2 +- data/scripts/script_08013E4C.inc | 2 +- data/scripts/script_08013E70.inc | 2 +- data/scripts/script_08013E94.inc | 2 +- data/scripts/script_08013EB0.inc | 2 +- data/scripts/script_08013ECC.inc | 2 +- data/scripts/script_08013EE8.inc | 2 +- data/scripts/script_08013F04.inc | 4 +- data/scripts/script_08013F34.inc | 4 +- data/scripts/script_08013F64.inc | 4 +- data/scripts/script_08013F94.inc | 4 +- data/scripts/script_08013FE8.inc | 4 +- data/scripts/script_08014054.inc | 4 +- data/scripts/script_08014074.inc | 4 +- data/scripts/script_08014094.inc | 4 +- data/scripts/script_080140B8.inc | 4 +- data/scripts/script_080140DC.inc | 4 +- data/scripts/script_08014118.inc | 4 +- data/scripts/script_08014154.inc | 4 +- data/scripts/script_08014198.inc | 4 +- data/scripts/script_080141DC.inc | 4 +- data/scripts/script_08014210.inc | 4 +- data/scripts/script_08014248.inc | 2 +- data/scripts/script_08014450.inc | 6 +- data/scripts/script_0801450C.inc | 2 +- data/scripts/script_08014588.inc | 2 +- data/scripts/script_080145E8.inc | 6 +- data/scripts/script_080147DC.inc | 2 +- data/scripts/script_08014804.inc | 2 +- data/scripts/script_08014958.inc | 6 +- data/scripts/script_080149CC.inc | 14 +- data/scripts/script_08014A80.inc | 6 +- data/scripts/script_08014B10.inc | 2 +- data/scripts/script_08014B34.inc | 12 +- data/scripts/script_08014CDC.inc | 8 +- data/scripts/script_08014DCC.inc | 2 +- data/scripts/script_08014E14.inc | 28 +- data/scripts/script_08015234.inc | 20 +- data/scripts/script_080152B4.inc | 4 +- data/scripts/script_080152DC.inc | 4 +- data/scripts/script_08015338.inc | 4 +- data/scripts/script_08015360.inc | 2 +- data/scripts/script_08015384.inc | 2 +- data/scripts/script_08015390.inc | 6 +- data/scripts/script_0801548E.inc | 2 +- data/scripts/script_0801550C.inc | 12 +- data/scripts/script_080155F4.inc | 2 +- data/scripts/script_08015618.inc | 4 +- data/scripts/script_08015684.inc | 28 +- data/scripts/script_08015754.inc | 2 +- data/scripts/script_080157AC.inc | 2 +- data/scripts/script_080158F8.inc | 2 +- data/scripts/script_08015918.inc | 2 +- data/scripts/script_08015938.inc | 2 +- data/scripts/script_08015958.inc | 26 +- data/scripts/script_08015A7C.inc | 4 +- data/scripts/script_08015AA0.inc | 4 +- data/scripts/script_08015AC4.inc | 10 +- data/scripts/script_08015B14.inc | 2 +- data/scripts/script_08015B34.inc | 2 +- data/scripts/script_08015B84.inc | 4 +- data/scripts/script_08015BA8.inc | 2 +- data/scripts/script_08015BE8.inc | 2 +- data/scripts/script_08015C7C.inc | 6 +- data/scripts/script_08015CD4.inc | 2 +- data/scripts/script_08015DF0.inc | 6 +- data/scripts/script_08015E58.inc | 24 +- data/scripts/script_08015F08.inc | 6 +- data/scripts/script_08015F3C.inc | 4 +- data/scripts/script_08015F80.inc | 6 +- data/scripts/script_08015FA4.inc | 4 +- data/scripts/script_08015FC0.inc | 2 +- data/scripts/script_08016004.inc | 2 +- data/scripts/script_08016030.inc | 4 +- data/scripts/script_0801606C.inc | 4 +- data/scripts/script_080160A8.inc | 8 +- data/scripts/script_0801635C.inc | 2 +- data/scripts/script_08016482.inc | 10 +- data/scripts/script_080165A4.inc | 4 +- data/scripts/script_080165D8.inc | 34 +-- include/functions.h | 6 +- include/manager.h | 2 +- include/script.h | 23 +- src/enemy/beetle.c | 2 +- src/entity.c | 2 +- src/npc/anju.c | 3 +- src/npc/beedle.c | 4 +- src/npc/bigGoron.c | 6 +- src/npc/carlov.c | 3 +- src/npc/carpenter.c | 6 +- src/npc/dampe.c | 1 - src/npc/emma.c | 3 +- src/npc/ezloCap.c | 10 +- src/npc/festari.c | 3 +- src/npc/forestMinish.c | 6 +- src/npc/gentari.c | 3 +- src/npc/guard.c | 6 +- src/npc/librari.c | 4 +- src/npc/mayorHagen.c | 6 +- src/npc/melari.c | 6 +- src/npc/moblinLady.c | 3 +- src/npc/mutoh.c | 1 - src/npc/postman.c | 1 - src/npc/rem.c | 5 +- src/npc/smith.c | 6 +- src/npc/stamp.c | 6 +- src/npc/syrup.c | 3 +- src/npc/teachers.c | 1 - src/npc/townMinish.c | 4 +- src/npc/townsperson.c | 6 +- src/npc/wheaton.c | 3 +- src/npc/windTribespeople.c | 4 +- src/npc/zelda.c | 1 - src/object/houseDoorExterior.c | 4 +- src/object/windcrest.c | 7 +- src/script.c | 268 ++++++++--------- tools/script_disassembler/definitions.py | 4 +- 421 files changed, 1734 insertions(+), 1789 deletions(-) diff --git a/asm/bigGoron.s b/asm/bigGoron.s index a83c056b..439e2cd7 100644 --- a/asm/bigGoron.s +++ b/asm/bigGoron.s @@ -517,9 +517,9 @@ _0806D3F4: strh r0, [r4, #0x2e] adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions _0806D408: pop {r4, pc} .align 2, 0 @@ -566,9 +566,9 @@ sub_0806D41C: @ 0x0806D41C _0806D45E: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions _0806D46C: ldr r0, _0806D4A8 @ =gScreenTransition ldr r0, [r0] diff --git a/asm/brocco.s b/asm/brocco.s index a8893593..80ac6909 100644 --- a/asm/brocco.s +++ b/asm/brocco.s @@ -208,9 +208,9 @@ _080636A0: .4byte gPlayerEntity _080636A4: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame b _080636D4 diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 9f1662ed..2b0f3061 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -1013,7 +1013,7 @@ sub_08052EA0: @ 0x08052EA0 ldrb r0, [r0, #1] strb r0, [r2, #1] bl sub_08049D30 - bl sub_0807DA70 + bl InitScriptData bl sub_08054524 bl sub_080186D4 bl sub_0806F364 @@ -3187,8 +3187,8 @@ GetSaleItemConfirmMessageID: @ 0x08053FD0 .align 2, 0 _08053FDC: .4byte gUnk_080FD964 - thumb_func_start sub_08053FE0 -sub_08053FE0: @ 0x08053FE0 + thumb_func_start GetItemPrice +GetItemPrice: @ 0x08053FE0 lsls r0, r0, #3 ldr r1, _08053FEC @ =gUnk_080FD964 adds r0, r0, r1 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 04b6dfbc..45299238 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -3501,7 +3501,7 @@ sub_08074CF8: @ 0x08074CF8 adds r4, r5, #0 adds r4, #0x84 ldr r1, [r4] - bl ExecuteScriptCommandSet + bl ExecuteScript ldr r1, [r4] adds r0, r5, #0 bl sub_08074D34 @@ -3818,7 +3818,7 @@ sub_08074F2C: @ 0x08074F2C adds r5, r4, #0 adds r5, #0x84 ldr r1, [r5] - bl ExecuteScriptCommandSet + bl ExecuteScript ldr r1, [r5] adds r0, r4, #0 bl sub_08074D34 diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s index 265f7010..e525b5a6 100644 --- a/asm/code_0807F0D8.s +++ b/asm/code_0807F0D8.s @@ -984,7 +984,7 @@ _0807F79A: bl GetSaleItemConfirmMessageID adds r4, r0, #0 adds r0, r5, #0 - bl sub_08053FE0 + bl GetItemPrice adds r5, r0, #0 adds r0, r4, #0 adds r1, r6, #0 @@ -1008,7 +1008,7 @@ sub_0807F7C4: @ 0x0807F7C4 ldr r0, _0807F7F4 @ =gRoomVars ldrb r0, [r0, #6] _0807F7D2: - bl sub_08053FE0 + bl GetItemPrice movs r2, #0 ldr r1, _0807F7F8 @ =gSave adds r1, #0xc0 @@ -1039,7 +1039,7 @@ sub_0807F800: @ 0x0807F800 ldrb r4, [r0, #6] _0807F80C: adds r0, r4, #0 - bl sub_08053FE0 + bl GetItemPrice rsbs r0, r0, #0 bl ModRupees adds r0, r4, #0 diff --git a/asm/drLeft.s b/asm/drLeft.s index 6027b73f..b575c71b 100644 --- a/asm/drLeft.s +++ b/asm/drLeft.s @@ -26,9 +26,9 @@ DrLeft: @ 0x0806BF80 _0806BFA2: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame adds r0, r4, #0 diff --git a/asm/farmers.s b/asm/farmers.s index f8c4e133..485c065c 100644 --- a/asm/farmers.s +++ b/asm/farmers.s @@ -57,9 +57,9 @@ _0806BC2E: _0806BC40: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame _0806BC54: diff --git a/asm/festari.s b/asm/festari.s index d0677807..ea917d79 100644 --- a/asm/festari.s +++ b/asm/festari.s @@ -71,7 +71,7 @@ _0805FF90: _0805FF94: adds r0, r4, #0 adds r1, r5, #0 - bl sub_0807DB98 + bl HandlePostScriptActions pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/gregal.s b/asm/gregal.s index 9bd9bd63..65a0271b 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -74,9 +74,9 @@ _0806CB4E: _0806CB66: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r5, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r5, #0 bl GetNextFrame pop {r4, r5, pc} @@ -219,9 +219,9 @@ _0806CC7C: .4byte gPlayerEntity _0806CC80: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame b _0806CCB0 diff --git a/asm/librarians.s b/asm/librarians.s index 0545aeac..f80ef358 100644 --- a/asm/librarians.s +++ b/asm/librarians.s @@ -31,9 +31,9 @@ Librarians: @ 0x0806B9F0 _0806BA18: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame pop {r4, pc} diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index a4b52da0..3363f3df 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -1,15 +1,40 @@ @ All the macro functions for scripts @ Generated by disassemble_script.py + +@ helper macros + +.macro RecursiveOpcodeN count:req, opcode:req, size:req, arg:req, args:vararg + .ifnb \args + RecursiveOpcodeN \count + 1 \opcode \size \args + .else + .2byte 0x400 * (((\count) * \size) + 1) + \opcode + .endif +.endm + +.macro RecursiveOpcode opcode:req, size:req, args:vararg + RecursiveOpcodeN 1 \opcode \size \args +.endm + +.macro RecursiveArgs size:req, arg:req, args:vararg + \size \arg + .ifnb \args + RecursiveArgs \size \args + .endif +.endm + +@ script macros + .macro SCRIPT_START name .globl \name .section .text \name: .endm + .macro SCRIPT_END .2byte 0xffff .endm -.macro ScriptCommandNop +.macro Nop .2byte 0x0400 .endm @@ -21,34 +46,22 @@ .2byte 0x0402 .endm -.macro Jump s +.macro Jump label:req .2byte 0x0803 -1: .2byte \s - 1b +1: .2byte \label - 1b .endm -.macro JumpIf s +.macro JumpIf label:req .2byte 0x0804 -1: .2byte \s - 1b +1: .2byte \label - 1b .endm -.macro JumpIfNot s +.macro JumpIfNot label:req .2byte 0x0805 -1: .2byte \s - 1b +1: .2byte \label - 1b .endm -.macro JumpTableOpN n label labels:vararg - .ifnb \labels - JumpTableOpN \n + 1 \labels - .else - .2byte 0x400 * (\n) + 0x6 - .endif -.endm - -.macro JumpTableOp labels:vararg - JumpTableOpN 2 \labels -.endm - -.macro JumpTableLabel temp label labels:vararg +.macro JumpTableLabel temp:req, label:req, labels:vararg .2byte \label - \temp .ifnb \labels JumpTableLabel \temp - 2 \labels @@ -56,82 +69,64 @@ .endm .macro JumpTable labels:vararg - JumpTableOp \labels + RecursiveOpcode 0x6 1 \labels 1: JumpTableLabel 1b \labels .endm -.macro JumpAbsolute w +.macro JumpAbsolute label:req .2byte 0x0c07 - .4byte \w + .4byte \label .endm -.macro JumpAbsoluteIf w +.macro JumpAbsoluteIf label:req .2byte 0x0c08 - .4byte \w + .4byte \label .endm -.macro JumpAbsoluteIfNot w +.macro JumpAbsoluteIfNot label:req .2byte 0x0c09 - .4byte \w -.endm - -.macro JumpAbsoluteTableOpN n label labels:vararg - .ifnb \labels - JumpAbsoluteTableOpN \n + 2 \labels - .else - .2byte 0x400 * (\n) + 0xa - .endif -.endm - -.macro JumpAbsoluteTableOp labels:vararg - JumpAbsoluteTableOpN 3 \labels -.endm - -.macro JumpAbsoluteTableLabel label labels:vararg - .4byte \label - .ifnb \labels - JumpAbsoluteTableLabel \labels - .endif + .4byte \label .endm .macro JumpAbsoluteTable labels:vararg - JumpAbsoluteTableOp \labels - JumpAbsoluteTableLabel \labels + RecursiveOpcode 0xa 2 \labels + RecursiveArgs .4byte \labels .endm -.macro Call w +.macro Call function:req .2byte 0x0c0b - .4byte \w + .4byte \function .endm -.macro CallWithArg a,b +@this shouldn't be use without an argument +.macro CallWithArg function:req, argument + .ifnb \argument .2byte 0x140c - .4byte \a - .4byte \b -.endm - -.macro CallWithArg_2 w + .4byte \function + .4byte \argument + .else .2byte 0x0c0c - .4byte \w + .4byte \function + .endif .endm -.macro LoadRoomEntityList w +.macro LoadRoomEntityList entityDataList:req .2byte 0x0c0d - .4byte \w + .4byte \entityDataList .endm -.macro TestBit w +.macro TestBit bitmask:req .2byte 0x0c0e - .4byte \w + .4byte \bitmask .endm -.macro CheckInventory1 s +.macro CheckInventory1 s:req .2byte 0x080f .2byte \s .endm -.macro CheckInventory2 s +.macro CheckInventory2 s:req .2byte 0x0810 .2byte \s .endm @@ -140,37 +135,37 @@ .2byte 0x0411 .endm -.macro CheckLocalFlag s +.macro CheckLocalFlag s:req .2byte 0x0812 .2byte \s .endm -.macro CheckLocalFlagByOffset a,b +.macro CheckLocalFlagByOffset a:req, b:req .2byte 0x0c13 .2byte \a .2byte \b .endm -.macro CheckGlobalFlag s +.macro CheckGlobalFlag s:req .2byte 0x0814 .2byte \s .endm -.macro CheckRoomFlag s +.macro CheckRoomFlag s:req .2byte 0x0815 .2byte \s .endm -.macro CheckPlayerInRegion a,b,c +.macro CheckPlayerInRegion x:req, y:req, dimension:req .2byte 0x1016 - .2byte \a - .2byte \b - .2byte \c + .2byte \x + .2byte \y + .2byte \dimension .endm -.macro CheckPlayerInRegion2 s +.macro CheckPlayerInRegion2 dimension:req .2byte 0x0817 - .2byte \s + .2byte \dimension .endm .macro CheckEntityInteractType @@ -181,12 +176,12 @@ .2byte 0x0419 .endm -.macro HasRupees s +.macro HasRupees amount:req .2byte 0x081a - .2byte \s + .2byte \amount .endm -.macro _0807E3BC s +.macro _0807E3BC s:req .2byte 0x081b .2byte \s .endm @@ -195,38 +190,42 @@ .2byte 0x041c .endm -.macro CheckKinstoneFused s +.macro CheckKinstoneFused s:req .2byte 0x081d .2byte \s .endm -.macro BuyItem a,b +.macro BuyItem item, b .2byte 0x0c1e - .2byte \a + .ifnb \item + .2byte \item .2byte \b + .else + .4byte 0 + .endif .endm -.macro _0807E48C s +.macro _0807E48C s:req .2byte 0x081f .2byte \s .endm -.macro _0807E4CC w +.macro _0807E4CC w:req .2byte 0x0c20 .4byte \w .endm -.macro _0807E4EC w +.macro _0807E4EC w:req .2byte 0x0c21 .4byte \w .endm -.macro _0807E514 w +.macro _0807E514 w:req .2byte 0x0c22 .4byte \w .endm -.macro CheckPlayerFlags w +.macro CheckPlayerFlags w:req .2byte 0x0c23 .4byte \w .endm @@ -239,78 +238,78 @@ .2byte 0x0425 .endm -.macro ComparePlayerAction s +.macro ComparePlayerAction s:req .2byte 0x0826 .2byte \s .endm -.macro ComparePlayerAnimationState s +.macro ComparePlayerAnimationState s:req .2byte 0x0827 .2byte \s .endm -.macro _0807E5F8 w +.macro _0807E5F8 w:req .2byte 0x0c28 .4byte \w .endm -.macro _0807E610 w +.macro _0807E610 w:req .2byte 0x0c29 .4byte \w .endm -.macro SetLocalFlag s +.macro SetLocalFlag s:req .2byte 0x082a .2byte \s .endm -.macro SetLocalFlagByOffset a,b +.macro SetLocalFlagByOffset a:req, b:req .2byte 0x0c2b .2byte \a .2byte \b .endm -.macro ClearLocalFlag s +.macro ClearLocalFlag s:req .2byte 0x082c .2byte \s .endm -.macro SetGlobalFlag s +.macro SetGlobalFlag s:req .2byte 0x082d .2byte \s .endm -.macro ClearGlobalFlag s +.macro ClearGlobalFlag s:req .2byte 0x082e .2byte \s .endm -.macro SetRoomFlag s +.macro SetRoomFlag s:req .2byte 0x082f .2byte \s .endm -.macro ClearRoomFlag s +.macro ClearRoomFlag s:req .2byte 0x0830 .2byte \s .endm -.macro Wait s +.macro Wait frames:req .2byte 0x0831 - .2byte \s + .2byte \frames .endm -.macro WaitForSomething w +.macro WaitForSomething w:req .2byte 0x0c32 .4byte \w .endm -.macro WaitForSomething2 w +.macro WaitForSomething2 w:req .2byte 0x0c33 .4byte \w .endm -.macro WaitPlayerAction8 +.macro WaitPlayerAction8 .2byte 0x0434 .endm @@ -326,12 +325,12 @@ .2byte 0x0437 .endm -.macro _0807E778 s +.macro _0807E778 s:req .2byte 0x0838 .2byte \s .endm -.macro _0807E788 w +.macro _0807E788 w:req .2byte 0x0c39 .4byte \w .endm @@ -340,7 +339,7 @@ .2byte 0x043a .endm -.macro ScriptCommandNop2 s +.macro Nop2 s:req .2byte 0x083b .2byte \s .endm @@ -361,22 +360,22 @@ .2byte 0x043f .endm -.macro _0807E800 w +.macro _0807E800 w:req .2byte 0x0c40 .4byte \w .endm -.macro _0807E80C w +.macro _0807E80C w:req .2byte 0x0c41 .4byte \w .endm -.macro _0807E858 s +.macro _0807E858 s:req .2byte 0x0842 .2byte \s .endm -.macro _0807E858_0 +.macro _0807E858_0 .2byte 0x0442 .endm @@ -392,17 +391,17 @@ .2byte 0x0445 .endm -.macro SetPlayerAction w +.macro SetPlayerAction w:req .2byte 0x0c46 .4byte \w .endm -.macro StartPlayerScript w +.macro StartPlayerScript script:req .2byte 0x0c47 - .4byte \w + .4byte \script .endm -.macro _0807E8D4 s +.macro _0807E8D4 s:req .2byte 0x0848 .2byte \s .endm @@ -423,21 +422,21 @@ .2byte 0x044c .endm -.macro _0807E908 s +.macro _0807E908 s:req .2byte 0x084d .2byte \s .endm -.macro SetIntVariable w +.macro SetIntVariable value:req .2byte 0x0c4e - .4byte \w + .4byte \value .endm .macro _0807E924 .2byte 0x044f .endm -.macro _0807E930 s +.macro _0807E930 s:req .2byte 0x0850 .2byte \s .endm @@ -446,7 +445,7 @@ .2byte 0x0451 .endm -.macro _0807E974 s +.macro _0807E974 s:req .2byte 0x0852 .2byte \s .endm @@ -459,7 +458,7 @@ .2byte 0x0454 .endm -.macro _0807E9E4 s +.macro _0807E9E4 s:req .2byte 0x0855 .2byte \s .endm @@ -472,7 +471,7 @@ .2byte 0x0457 .endm -.macro _0807EA88 s +.macro _0807EA88 s:req .2byte 0x0858 .2byte \s .endm @@ -481,56 +480,37 @@ .2byte 0x0459 .endm -.macro TextboxNoOverlapFollow s +.macro TextboxNoOverlapFollow s:req .2byte 0x085a .2byte \s .endm -.macro TextboxNoOverlap s +.macro TextboxNoOverlap s:req .2byte 0x085b .2byte \s .endm -.macro TextboxNoOverlapFollowPos a,b +.macro TextboxNoOverlapFollowPos a:req, b:req .2byte 0x0c5c .2byte \a .2byte \b .endm -.macro TextboxNoOverlapFollowPos_1 s +.macro TextboxNoOverlapFollowPos_1 s:req .2byte 0x085c .2byte \s .endm -.macro TextboxNoOverlapFollowTableOpN n label labels:vararg - .ifnb \labels - TextboxNoOverlapFollowTableOpN \n + 1 \labels - .else - .2byte 0x400 * (\n) + 0x5d - .endif -.endm - -.macro TextboxNoOverlapFollowTableOp labels:vararg - TextboxNoOverlapFollowTableOpN 2 \labels -.endm - -.macro TextboxNoOverlapFollowTableLabel label labels:vararg - .2byte \label - .ifnb \labels - TextboxNoOverlapFollowTableLabel \labels - .endif -.endm - .macro TextboxNoOverlapFollowTable labels:vararg - TextboxNoOverlapFollowTableOp \labels - TextboxNoOverlapFollowTableLabel \labels + RecursiveOpcode 0x5d 1 \labels + RecursiveArgs .2byte \labels .endm .macro TextboxNoOverlapVar .2byte 0x045e .endm -.macro _0807EB28 s +.macro _0807EB28 s:req .2byte 0x085f .2byte \s .endm @@ -539,12 +519,12 @@ .2byte 0x0460 .endm -.macro _0807EB44 s +.macro _0807EB44 s:req .2byte 0x0861 .2byte \s .endm -.macro _0807EB4C a,b +.macro _0807EB4C a:req, b:req .2byte 0x0c62 .2byte \a .2byte \b @@ -558,85 +538,85 @@ .2byte 0x0464 .endm -.macro SetEntityDirection s +.macro SetEntityDirection direction:req .2byte 0x0865 - .2byte \s + .2byte \direction .endm -.macro SetEntityDirectionWithAnimationState s +.macro SetEntityDirectionWithAnimationState direction:req .2byte 0x0866 - .2byte \s + .2byte \direction .endm -.macro SetEntityNonPlanarMovement s +.macro SetEntityNonPlanarMovement nonPlanarMovement:req .2byte 0x0867 - .2byte \s + .2byte \nonPlanarMovement .endm -.macro SetEntity0x20 w +.macro SetEntity0x20 value:req .2byte 0x0c68 - .4byte \w + .4byte \value .endm -.macro SetEntityPositionRelative a,b +.macro SetEntityPositionRelative xOffset:req, yOffset:req .2byte 0x0c69 - .2byte \a - .2byte \b + .2byte \xOffset + .2byte \yOffset .endm -.macro SetEntityPosition a,b +.macro SetEntityPosition x:req, y:req .2byte 0x0c6a - .2byte \a - .2byte \b + .2byte \x + .2byte \y .endm .macro MoveEntityToPlayer .2byte 0x046b .endm -.macro ScriptCommandNop3 +.macro Nop3 .2byte 0x046c .endm -.macro _0807EC1C s +.macro _0807EC1C s:req .2byte 0x086d .2byte \s .endm -.macro _0807EC64 s +.macro _0807EC64 s:req .2byte 0x086e .2byte \s .endm -.macro _0807EC94 s +.macro _0807EC94 s:req .2byte 0x086f .2byte \s .endm -.macro _0807ECC4 s +.macro _0807ECC4 s:req .2byte 0x0870 .2byte \s .endm -.macro _0807ECF4 s +.macro _0807ECF4 s:req .2byte 0x0871 .2byte \s .endm -.macro _0807ED24 a,b,c +.macro _0807ED24 a:req, b:req, c:req .2byte 0x1072 .2byte \a .2byte \b .2byte \c .endm -.macro _0807EDD4 a,b +.macro _0807EDD4 a:req, b:req .2byte 0x0c73 .2byte \a .2byte \b .endm -.macro _0807EE04 a,b +.macro _0807EE04 a:req, b:req .2byte 0x0c74 .2byte \a .2byte \b @@ -650,39 +630,39 @@ .2byte 0x0476 .endm -.macro _0807EEF4 a,b +.macro _0807EEF4 a:req, b:req .2byte 0x0c77 .2byte \a .2byte \b .endm -.macro _0807EF3C a,b +.macro _0807EF3C a:req, b:req .2byte 0x0c78 .2byte \a .2byte \b .endm -.macro _0807EF80 s +.macro DoPostScriptAction action:req .2byte 0x0879 - .2byte \s + .2byte \action .endm -.macro _0807EF90 s +.macro DoPostScriptAction2 action:req .2byte 0x087a - .2byte \s + .2byte \action .endm -.macro SoundReq s +.macro SoundReq s:req .2byte 0x087b .2byte \s .endm -.macro SoundReq2 s +.macro SoundReq2 s:req .2byte 0x087c .2byte \s .endm -.macro SoundReq3 w +.macro SoundReq3 w:req .2byte 0x0c7d .4byte \w .endm @@ -691,43 +671,44 @@ .2byte 0x047e .endm -.macro ModRupees s +.macro ModRupees amount:req .2byte 0x087f - .2byte \s + .2byte \amount .endm -.macro ModHealth s +.macro ModHealth amount:req .2byte 0x0880 - .2byte \s + .2byte \amount .endm -.macro IncreaseMaxHealth s +@ this command doesn't actually take an argument +.macro IncreaseMaxHealth .2byte 0x0881 - .2byte \s + .2byte 8 .endm -.macro _0807F034 s +.macro _0807F034 s:req .2byte 0x0882 .2byte \s .endm -.macro _0807F050 s +.macro _0807F050 s:req .2byte 0x0883 .2byte \s .endm -.macro GetInventoryValue s +.macro GetInventoryValue s:req .2byte 0x0884 .2byte \s .endm -.macro _0807F078 a,b +.macro _0807F078 a:req, b:req .2byte 0x0c85 .2byte \a .2byte \b .endm -.macro _0807F088 s +.macro _0807F088 s:req .2byte 0x0886 .2byte \s .endm @@ -740,12 +721,12 @@ .2byte 0x0488 .endm -.macro _0807F0B4 s +.macro _0807F0B4 s:req .2byte 0x0889 .2byte \s .endm -.macro _0807F0C8 a,b +.macro _0807F0C8 a:req, b:req .2byte 0x0c8a .2byte \a .2byte \b diff --git a/asm/mama.s b/asm/mama.s index 048f5f7e..252b21e6 100644 --- a/asm/mama.s +++ b/asm/mama.s @@ -75,9 +75,9 @@ _0806C41C: .4byte gPlayerEntity _0806C420: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame b _0806C450 diff --git a/asm/manager16.s b/asm/manager16.s index 25cd6698..f1f6c5d9 100644 --- a/asm/manager16.s +++ b/asm/manager16.s @@ -175,7 +175,7 @@ _0805AC6A: beq _0805ACA6 adds r0, r3, #0 mov r1, sb - bl sub_0807DAF0 + bl InitScriptForEntity _0805ACA6: adds r4, #0x10 adds r5, #1 diff --git a/asm/mazaalMacro.s b/asm/mazaalMacro.s index 85f2f709..1f0cef9a 100644 --- a/asm/mazaalMacro.s +++ b/asm/mazaalMacro.s @@ -334,7 +334,7 @@ _08034ED6: sub_08034ED8: @ 0x08034ED8 push {lr} movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity pop {pc} .align 2, 0 @@ -389,7 +389,7 @@ sub_08034EE4: @ 0x08034EE4 _08034F46: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity pop {r4, r5, pc} .align 2, 0 _08034F50: .4byte gUnk_080CEEC8 diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s index 438e9ae2..e6c2ea60 100644 --- a/asm/minishEzlo.s +++ b/asm/minishEzlo.s @@ -33,9 +33,9 @@ MinishEzlo: @ 0x08062F70 _08062FA0: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame adds r4, #0x5b diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index 916c1f91..3b8e7e7f 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -199,9 +199,9 @@ _08067F94: .4byte gPlayerEntity _08067F98: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r5, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions ldrb r0, [r5, #0xb] cmp r0, #3 bne _0806801A diff --git a/asm/object3E.s b/asm/object3E.s index 87dc86a0..786ee7ba 100644 --- a/asm/object3E.s +++ b/asm/object3E.s @@ -328,9 +328,9 @@ _0808D31C: ldrsh r5, [r4, r0] adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions ldr r0, _0808D354 @ =gRoomControls ldrh r0, [r0, #0x16] cmp r0, #0 @@ -375,9 +375,9 @@ sub_0808D360: @ 0x0808D360 _0808D382: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions pop {r4, pc} .align 2, 0 diff --git a/asm/object5B.s b/asm/object5B.s index 5cd3f85a..a80ba72b 100644 --- a/asm/object5B.s +++ b/asm/object5B.s @@ -116,7 +116,7 @@ sub_08092940: @ 0x08092940 adds r5, r4, #0 adds r5, #0x84 ldr r1, [r5] - bl ExecuteScriptCommandSet + bl ExecuteScript ldr r1, [r5] adds r0, r4, #0 bl sub_08092958 diff --git a/asm/object6.s b/asm/object6.s index 038c3924..af416ed0 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -426,7 +426,7 @@ sub_08082B9C: @ 0x08082B9C adds r4, #0x84 ldr r1, [r4] adds r0, r6, #0 - bl ExecuteScriptCommandSet + bl ExecuteScript ldr r1, [r4] adds r0, r6, #0 bl sub_08082D20 @@ -451,7 +451,7 @@ sub_08082C38: @ 0x08082C38 adds r4, r5, #0 adds r4, #0x84 ldr r1, [r4] - bl ExecuteScriptCommandSet + bl ExecuteScript ldr r1, [r4] adds r0, r5, #0 bl sub_08082D20 @@ -705,7 +705,7 @@ sub_08082E14: @ 0x08082E14 adds r0, #0x84 ldr r1, [r0] adds r0, r4, #0 - bl ExecuteScriptCommandSet + bl ExecuteScript movs r1, #0xc0 lsls r1, r1, #5 adds r0, r4, #0 diff --git a/asm/object6A.s b/asm/object6A.s index 1f89494e..761e95e4 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -37,9 +37,9 @@ sub_08094A5C: @ 0x08094A5C _08094A78: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame pop {r4, pc} @@ -78,9 +78,9 @@ sub_08094A90: @ 0x08094A90 _08094ACE: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame pop {r4, pc} @@ -933,9 +933,9 @@ sub_08095120: @ 0x08095120 _0809514C: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame pop {r4, pc} @@ -984,9 +984,9 @@ sub_08095188: @ 0x08095188 _080951B4: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions pop {r4, pc} thumb_func_start sub_080951C4 @@ -1010,9 +1010,9 @@ sub_080951C4: @ 0x080951C4 _080951E8: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame movs r1, #0x36 @@ -1261,9 +1261,9 @@ sub_080953A4: @ 0x080953A4 _080953E0: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame ldrb r0, [r4, #0xa] @@ -1588,9 +1588,9 @@ _08095664: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame pop {r4, r5, pc} @@ -1795,9 +1795,9 @@ sub_080957DC: @ 0x080957DC _080957F8: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame pop {r4, pc} @@ -1884,9 +1884,9 @@ _08095880: _080958B2: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r5, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions ldrb r4, [r5, #0xa] movs r0, #0x5c strb r0, [r5, #0xa] @@ -1912,9 +1912,9 @@ sub_080958D8: @ 0x080958D8 _080958EC: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame adds r0, r4, #0 @@ -1950,9 +1950,9 @@ sub_08095918: @ 0x08095918 _0809593C: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame pop {r4, pc} @@ -2038,9 +2038,9 @@ sub_080959CC: @ 0x080959CC _080959F2: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame adds r0, r4, #0 @@ -2146,9 +2146,9 @@ _08095ABC: _08095ACC: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions b _08095B44 _08095ADC: ldrb r0, [r4, #0xc] @@ -2455,9 +2455,9 @@ sub_08095CE0: @ 0x08095CE0 _08095D06: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame adds r0, r4, #0 @@ -2571,7 +2571,7 @@ _08095DD0: _08095DE6: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity b _08095E74 .align 2, 0 _08095DF0: .4byte gActiveScriptInfo @@ -2904,9 +2904,9 @@ sub_08096058: @ 0x08096058 _0809606C: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame pop {r4, pc} @@ -2929,9 +2929,9 @@ sub_08096084: @ 0x08096084 _080960A0: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl GetNextFrame ldr r0, [r4, #0x50] @@ -3204,9 +3204,9 @@ sub_0809629C: @ 0x0809629C _080962B2: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r5, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions movs r1, #0x80 lsls r1, r1, #5 adds r0, r5, #0 diff --git a/asm/object89.s b/asm/object89.s index 504dccbe..69ca1913 100644 --- a/asm/object89.s +++ b/asm/object89.s @@ -100,7 +100,7 @@ _0809ABA0: .4byte script_08012DD8 sub_0809ABA4: @ 0x0809ABA4 push {lr} movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity pop {pc} .align 2, 0 diff --git a/asm/object97.s b/asm/object97.s index f237a9d2..0da8dbe7 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -901,9 +901,9 @@ sub_0809E088: @ 0x0809E088 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame pop {r4, pc} diff --git a/asm/objectB3.s b/asm/objectB3.s index 91fd1641..158006ad 100644 --- a/asm/objectB3.s +++ b/asm/objectB3.s @@ -103,7 +103,7 @@ sub_080A0ADC: @ 0x080A0ADC bl sub_0807DD64 adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity pop {r4, pc} .align 2, 0 @@ -112,7 +112,7 @@ sub_080A0AF0: @ 0x080A0AF0 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 bl GetNextFrame adds r0, r4, #0 diff --git a/asm/phonograph.s b/asm/phonograph.s index c296947d..dc6a64f8 100644 --- a/asm/phonograph.s +++ b/asm/phonograph.s @@ -36,9 +36,9 @@ Phonograph: @ 0x0806E91C _0806E950: adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r5, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions pop {r4, r5, pc} .align 2, 0 _0806E960: .4byte 0x0000FFFF diff --git a/asm/pina.s b/asm/pina.s index 5d4927ac..39aeaf15 100644 --- a/asm/pina.s +++ b/asm/pina.s @@ -208,9 +208,9 @@ _08063BDC: .4byte gPlayerEntity _08063BE0: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r0, r4, #0 bl UpdateAnimationSingleFrame b _08063C10 diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s index 29d3221c..74e7db0e 100644 --- a/asm/sittingPerson.s +++ b/asm/sittingPerson.s @@ -110,9 +110,9 @@ _08063800: .4byte gPlayerEntity _08063804: adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity adds r0, r4, #0 - bl sub_0807DDE4 + bl HandleEntity0x82Actions adds r5, r4, #0 adds r5, #0x59 ldrb r0, [r5] diff --git a/asm/stockwell.s b/asm/stockwell.s index d7ea48f1..6d91bf82 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -22,7 +22,7 @@ Stockwell: @ 0x08065054 adds r0, #0x84 ldr r1, [r0] adds r0, r4, #0 - bl ExecuteScriptCommandSet + bl ExecuteScript adds r0, r4, #0 bl sub_0806ED78 pop {r4, pc} @@ -84,7 +84,7 @@ sub_080650CC: @ 0x080650CC adds r0, #0x84 ldr r0, [r0] ldr r1, _080650FC @ =script_080143C0 - bl sub_0807DB88 + bl InitScriptExecutionContext b _080651A6 .align 2, 0 _080650F8: .4byte gRoomVars @@ -124,7 +124,7 @@ _0806513C: bl GetSaleItemConfirmMessageID adds r7, r0, #0 ldrb r0, [r6, #6] - bl sub_08053FE0 + bl GetItemPrice mov r8, r0 movs r0, #4 strb r0, [r5, #0xc] @@ -133,7 +133,7 @@ _0806513C: adds r0, #0x84 ldr r0, [r0] ldr r1, _08065174 @ =script_08014384 - bl sub_0807DB88 + bl InitScriptExecutionContext _0806515E: adds r0, r7, #0 adds r1, r5, #0 @@ -529,7 +529,7 @@ _0806543C: cmp r6, #0 beq _080654C8 adds r0, r5, #0 - bl sub_08053FE0 + bl GetItemPrice adds r6, r0, #0 ldr r7, _08065494 @ =gSave adds r0, r7, #0 diff --git a/asm/vaati.s b/asm/vaati.s index 982a913c..a9f5bf86 100644 --- a/asm/vaati.s +++ b/asm/vaati.s @@ -313,7 +313,7 @@ _08066C86: adds r0, #0x84 ldr r1, [r0] mov r0, ip - bl sub_0807DB98 + bl HandlePostScriptActions pop {r4, r5, r6, pc} thumb_func_start sub_08066C94 diff --git a/asm/whirlwind.s b/asm/whirlwind.s index f5ed706c..2d7befb7 100644 --- a/asm/whirlwind.s +++ b/asm/whirlwind.s @@ -108,7 +108,7 @@ _08092D5C: bl sub_0807DD64 adds r0, r4, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity _08092D74: pop {r4, pc} .align 2, 0 @@ -125,7 +125,7 @@ sub_08092D7C: @ 0x08092D7C beq _08092D92 adds r0, r5, #0 movs r1, #0 - bl sub_0807DDAC + bl ExecuteScriptForEntity _08092D92: ldrb r0, [r5, #0x18] lsls r0, r0, #0x1e diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 373c731b..0116c89c 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08008B5C _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08008B6E: _0807E944 @@ -19,7 +19,7 @@ script_08008B6E: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 EndBlock script_08008BA2: @@ -35,7 +35,7 @@ script_08008BA2: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 EndBlock script_08008BD2: @@ -76,7 +76,7 @@ script_08008C5C: Jump script_08008BD2 BeginBlock SetEntityPositionRelative 0x0068, 0x0018 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EB44 0x0004 _0807E930 0x0004 SetEntityNonPlanarMovement 0x0300 @@ -85,7 +85,7 @@ script_08008C5C: WaitForSomething 0x00000002 TextboxNoOverlap 0x490d _0807EA94 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_08064D08 _0807EDD4 0x0068, 0x0078 Call sub_08064D10 @@ -124,6 +124,6 @@ script_08008C5C: Call sub_08064D10 SoundReq 0x0121 _0807E5F8 0x00000001 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 3ed61266..38305661 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -12,6 +12,6 @@ SCRIPT_START script_08008D50 CameraTargetPlayer Wait 0x001e _0807E5F8 0x00000004 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 4ac7bfc3..4f31145b 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08008D8C BeginBlock Call sub_08061FD8 Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08008DA0: CheckEntityInteractType @@ -17,7 +17,7 @@ script_08008DA0: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock @@ -105,6 +105,6 @@ script_08008E12: Call sub_0806DCC0 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index d9007ba2..f8f1f63c 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -2,16 +2,16 @@ SCRIPT_START script_08008F74 BeginBlock SetEntityNonPlanarMovement 0x0100 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x00b8, 0x0090 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0088, 0x0078 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000f _0807E5F8 0x00000020 Call sub_080791BC diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index b77dea3b..d0fa9c93 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -11,8 +11,8 @@ SCRIPT_START script_08008FFC _0807EB44 0x0004 _0807E930 0x0006 Wait 0x0010 - _0807EF80 0x000f + DoPostScriptAction 0x000f SetEntityNonPlanarMovement 0x0200 _0807ECC4 0x1c20 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 97ec4042..43e1ad79 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800903C BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000004 SoundReq 0x007c @@ -13,16 +13,16 @@ SCRIPT_START script_0800903C _0807E5F8 0x00000008 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Jump script_0800927E .short 0x0000 BeginBlock Call sub_0807F348 SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock WaitForSomething2 0x00000080 _0807EB44 0x0004 @@ -30,20 +30,20 @@ SCRIPT_START script_0800903C _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1050, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1052, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 TextboxNoOverlapFollowPos 0x1054, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0004 @@ -52,25 +52,25 @@ SCRIPT_START script_0800903C _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1056, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1057, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1058, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x105c, 0x000e _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 script_0800917C: CheckEntityInteractType @@ -85,62 +85,62 @@ script_0800917C: BeginBlock Call sub_0807F348 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 _0807EB74 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x105b, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807EF80 0x0005 + DoPostScriptAction 0x0005 Wait 0x003c - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1051, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EB74 _0807EB8C - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1055, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB74 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 _0807EB74 - _0807EF80 0x0000 - _0807EF80 0x0001 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1059, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Jump script_080092B2 .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_0800927E: Call sub_080668F0 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800928A: CheckEntityInteractType @@ -155,10 +155,10 @@ script_0800928A: .short 0x0000 BeginBlock _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_080092B2: _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080092BA: CheckEntityInteractType @@ -172,14 +172,14 @@ script_080092BA: Jump script_080092BA BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0806672C - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock Jump script_0800917C .short 0x0000 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08066E38 _0807E9D4 EndBlock diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 553923bd..e490d51f 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -25,5 +25,5 @@ script_080094BC: _0807EE30 JumpIfNot script_080094BC Wait 0x003c - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index 3822f0b7..5422e60d 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -10,6 +10,6 @@ script_080094EA: _0807EE30 JumpIfNot script_080094EA Wait 0x001e - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index 1d6b8ba5..aafd95f8 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -1,45 +1,45 @@ SCRIPT_START script_080094FC BeginBlock Call sub_08067100 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08009512: CheckEntityInteractType JumpIfNot script_08009512 _0807E864 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EB74 Call sub_080670B4 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_08009512 .short 0x0000 BeginBlock Call sub_08067100 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_0800954E: CheckEntityInteractType JumpIfNot script_0800954E _0807E864 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EB74 Call sub_080670E4 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_0800954E .short 0x0000 BeginBlock Call sub_08067314 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 @@ -62,12 +62,12 @@ script_08009592: .short 0x0000 BeginBlock Call sub_0806BE3C - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 EndBlock script_080095DE: Call sub_0806BF44 JumpIf script_080095F2 - _0807EF80 0x000b - _0807EF80 0x0006 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index 0c6dda78..cf491e2a 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -4,7 +4,7 @@ script_080095F2: JumpIfNot script_080095DE _0807E864 _0807EB74 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0806BE84 _0807EA94 JumpIfNot script_08009622 @@ -16,11 +16,11 @@ script_080095F2: _0807F078 0x003c, 0x0001 script_08009622: _0807E878 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_080095DE BeginBlock - _0807EF80 0x000b - _0807EF80 0x0008 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 EndBlock script_08009638: EndBlock @@ -33,14 +33,14 @@ script_08009646: JumpIf script_08009646 EndBlock Call sub_0806BE3C - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 script_08009660: CheckEntityInteractType JumpIfNot script_08009660 _0807E864 _0807EB74 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0806BEC8 _0807EA94 JumpIfNot script_0800968E @@ -50,10 +50,10 @@ script_08009660: Call sub_0806BEFC script_0800968E: _0807E878 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_08009660 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Jump script_080096FC CheckGlobalFlag 0x0020 JumpIf script_080096FC @@ -67,11 +67,11 @@ script_080096AC: StartPlayerScript script_08009704 WaitForSomething2 0x00000001 SoundReq 0x0111 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 LoadRoomEntityList gUnk_080D9048 Wait 0x000f SoundReq 0x0111 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 script_080096EC: CheckGlobalFlag 0x0020 JumpIfNot script_080096EC diff --git a/data/scripts/script_08009704.inc b/data/scripts/script_08009704.inc index 9c0f3cd2..e3de4497 100644 --- a/data/scripts/script_08009704.inc +++ b/data/scripts/script_08009704.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08009704 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01a0, 0x01b0 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000a - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000001 - _0807EF80 0x000d + DoPostScriptAction 0x000d SetEntityNonPlanarMovement 0x0100 _0807ECC4 0x0010 Call sub_080791BC diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index 1cd49c67..1418cfcf 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -2,16 +2,16 @@ SCRIPT_START script_08009740 BeginBlock Call sub_08065D00 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 EndBlock script_0800975A: CheckEntityInteractType JumpIfNot script_0800975A _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_08065F64 _0807EA94 _0807E878 @@ -42,5 +42,5 @@ script_0800975A: _0807EA94 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index d2b7de31..8f1f9439 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080097F0 BeginBlock _0807E930 0x0003 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SetEntityNonPlanarMovement 0x0300 Call sub_0807F348 EndBlock @@ -17,5 +17,5 @@ script_08009816: _0807E5F8 0x00000004 Call sub_0807FBD4 SoundReq 0x01f3 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 1371f551..e1737518 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009838 BeginBlock _0807E930 0x0003 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SetEntityNonPlanarMovement 0x0300 Call sub_0807F348 EndBlock @@ -12,6 +12,6 @@ SCRIPT_START script_08009838 Call sub_0807FBD4 SoundReq 0x01f3 _0807E5F8 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc index c25d85ee..14a31e8f 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -13,7 +13,7 @@ SCRIPT_START script_0800987C _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000040 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 7f1277be..105a4124 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -18,6 +18,6 @@ script_080098E0: Call sub_0807DF50 _0807E878 script_08009910: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index a83cd628..e6d6e44e 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -12,23 +12,23 @@ SCRIPT_START script_08009950 _0807E800 0x00000000 WaitFor_2 WaitForSomething2 0x00000008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e _0807E930 0x000b Wait 0x001e TextboxNoOverlapFollow 0x1002 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E908 0x0001 _0807EB44 0x0004 _0807EDD4 0x00b8, 0x005c _0807EB44 0x0006 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollow 0x1004 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807E778 0x0002 DoFade5 diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 71648ce7..c983ca21 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -3,21 +3,21 @@ SCRIPT_START script_080099DC Call sub_0807F348 SetEntityNonPlanarMovement 0x00c0 _0807EB44 0x0002 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f TextboxNoOverlapFollow 0x1001 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollow 0x1003 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index ee6102b7..02fd4d8c 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08009A84 BeginBlock SetEntityPositionRelative 0x01e8, 0x0110 SetEntityNonPlanarMovement 0x00c0 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01e8, 0x0200 _0807EDD4 0x01f8, 0x0218 _0807EDD4 0x0220, 0x0228 @@ -20,7 +20,7 @@ SCRIPT_START script_08009A84 Wait 0x001e _0807E5F8 0x00000010 _0807EDD4 0x0290, 0x0190 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EDD4 0x0290, 0x0188 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 3ba22264..4ef2891b 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -3,10 +3,10 @@ SCRIPT_START script_08009AF8 EndBlock WaitForSomething2 0x00000010 SoundReq 0x00f0 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x001e SoundReq 0x00f1 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Wait 0x005a _0807E778 0x0004 _0807E80C 0x00000000 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index 5181c91f..bacab8e4 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08009B30 Wait 0x003c Call sub_0807529C Wait 0x003c - _0807EF80 0x0014 + DoPostScriptAction 0x0014 Wait 0x001e Call sub_08053250 _0807E878 diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index b340c2fb..c5204cb2 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -15,42 +15,42 @@ SCRIPT_START script_08009B78 WaitForSomething2 0x00000008 _0807EDD4 0x0080, 0x005c _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000f - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1009, 0x0000 _0807E8E4_1 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x100b, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 _0807EDD4 0x007c, 0x005c Wait 0x000f - _0807EF80 0x000d + DoPostScriptAction 0x000d _0807EDD4 0x0084, 0x005c _0807EB44 0x0006 - _0807EF80 0x000c - _0807EF80 0x0000 + DoPostScriptAction 0x000c + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 Call sub_08053250 _0807F034 0x0034 WaitPlayerAction8 _0807E8E4_1 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x100c, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 script_08009C4C: - _0807EF80 0x000a + DoPostScriptAction 0x000a script_08009C50: CheckEntityInteractType JumpIfNot script_08009C50 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index 5584030d..30dca264 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -5,26 +5,26 @@ SCRIPT_START script_08009C68 Call sub_0807F348 EndBlock WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 _0807EB74 WaitForSomething2 0x00000004 _0807EB74 WaitForSomething2 0x00000004 _0807EB74 _0807EB8C - _0807EF80 0x0001 + DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x100a, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807EB8C - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EB8C _0807EB44 0x0002 TextboxNoOverlapFollowPos 0x100d, 0x0000 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 _0807EDD4 0x0000, 0x0060 Call sub_080536A8 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index 5b0fe695..7405c078 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -4,22 +4,22 @@ SCRIPT_START script_08009CFC SetEntityNonPlanarMovement 0x00c0 EndBlock _0807E5F8 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EDD4 0x0040, 0x0060 _0807EDD4 0x0060, 0x0068 _0807E5F8 0x00000004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E8E4_0 Wait 0x000f SoundReq 0x0094 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807E5F8 0x00000008 WaitForSomething2 0x00000002 _0807EDD4 0x0070, 0x005c _0807E8E4_1 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000f _0807E5F8 0x00000008 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index 2a302362..e66c5519 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -9,10 +9,10 @@ SCRIPT_START script_08009D6C Call sub_0805368C Wait 0x0008 _0807EDD4 0x0078, 0x0098 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807E778 0x0010 DoFade5 WaitFor_2 Call sub_08053634 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index eb4c471d..51f47a09 100644 --- a/data/scripts/script_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08009DB0 Call sub_0807F348 Call sub_08066288 Call sub_08066274 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x000c _0807E908 0x0003 EndBlock @@ -39,5 +39,5 @@ script_08009DF0: _0807EA94 _0807E878 Call sub_0807DF50 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 41213ed3..2c71ed55 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08009E4E script_08009E4E: _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc index 86a566ec..fb9c9b00 100644 --- a/data/scripts/script_08009E58.inc +++ b/data/scripts/script_08009E58.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08009E58 _0807E778 0x0002 DoFade4 WaitFor_2 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 Wait 0x001e _0807E5F8 0x00000001 SCRIPT_END diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc index c080230a..d21a9d8e 100644 --- a/data/scripts/script_08009E88.inc +++ b/data/scripts/script_08009E88.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08009E88 script_08009EA4: Call sub_0807F0D8 JumpIfNot script_08009EA4 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 Wait 0x000a Call sub_08053250 _0807E878 diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc index da218f10..8ef940d1 100644 --- a/data/scripts/script_08009ECC.inc +++ b/data/scripts/script_08009ECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009ECC BeginBlock SetIntVariable 0x00000002 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 EndBlock WaitForSomething2 0x00000004 BeginBlock SetIntVariable 0x00000003 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 EndBlock SCRIPT_END diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc index 4e1b8076..632f0d1e 100644 --- a/data/scripts/script_08009EF0.inc +++ b/data/scripts/script_08009EF0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009EF0 BeginBlock SetIntVariable 0x00000000 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 EndBlock WaitForSomething2 0x00000004 BeginBlock SetIntVariable 0x00000001 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 EndBlock SCRIPT_END diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 27e3b581..16b7954c 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08009F14 BeginBlock _0807EB44 0x0004 Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckKinstoneFused 0x001c JumpIf script_08009FD2 CheckInventory1 0x0007 @@ -17,7 +17,7 @@ script_08009F36: EndBlock _0807E864 Call sub_0807DF28 - _0807EF80 0x000b + DoPostScriptAction 0x000b StartPlayerScript script_0800A088 WaitForSomething2 0x00000002 Call sub_0806014C @@ -26,7 +26,7 @@ script_08009F36: Wait 0x001e _0807F034 0x0065 WaitPlayerAction8 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807DF50 _0807E878 script_08009F84: diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index ea40d645..bc76a17f 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0800A088 _0807EDD4 0x0078, 0x0060 _0807EB44 0x0000 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index db5885c1..3b011d92 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -12,7 +12,7 @@ script_0800A0D2: JumpIfNot script_0800A0D2 _0807E8E4_0 Wait 0x0008 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 Wait 0x003c diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index 46bd1328..a83416b8 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -20,6 +20,6 @@ script_0800A0FE: WaitFor_2 WaitForSomething2 0x00000004 CallWithArg sub_0806DA1C, 0x00000006 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index 28d242c0..148b1209 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800A160 BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807E930 0x0002 SetEntityPositionRelative 0x00b0, 0x0080 CallWithArg sub_0807F98C, 0xff800000 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index a50269c7..933c0576 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A1B4 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock WaitForSomething 0x00000002 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index c66714f6..96faa56d 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -59,5 +59,5 @@ SCRIPT_START script_0800A1D8 SoundReq2 0x0008 SoundReq 0x00f7 CallWithArg sub_0806DA1C, 0x00000007 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index e8d67562..2ac3adb5 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -12,17 +12,17 @@ SCRIPT_START script_0800A310 Call sub_080791BC .short 0x0000 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSomething2 0x00000002 _0807E930 0x000e - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F2D4 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 _0807E930 0x000c diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index bd3a9564..9e2aa8ca 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800A3D8 BeginBlock SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000004 BeginBlock - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Call sub_0807F3F8 EndBlock Wait 0x003c _0807EC94 0x0010 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000080 WaitForSomething2 0x00000004 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SoundReq 0x0142 CallWithArg sub_080960C4, script_0800A638 _0807E5F8 0x00000080 @@ -55,6 +55,6 @@ SCRIPT_START script_0800A3D8 SoundReq 0x0143 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index 5f94f54f..332a734a 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800A500 BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807E930 0x0005 Call sub_0807F348 EndBlock @@ -22,7 +22,7 @@ SCRIPT_START script_0800A500 SoundReq 0x0143 _0807E5F8 0x00000100 WaitForSomething2 0x00000008 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call sub_080961B0 SoundReq 0x00fa Wait 0x003c diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index fa9442e2..13e7d09e 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800A590 BeginBlock SetEntityNonPlanarMovement 0x0080 SetEntity0x20 0x00000000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0000 Call sub_0807F714 MoveEntityToPlayer @@ -11,7 +11,7 @@ SCRIPT_START script_0800A590 _0807E930 0x0023 WaitForSomething2 0x00000010 CallWithArg sub_0807F6E8, 0x00000008 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0142 _0807E610 0x00000800 CallWithArg sub_080960C4, script_0800A65C @@ -25,11 +25,11 @@ SCRIPT_START script_0800A590 _0807E5F8 0x00000200 WaitForSomething2 0x00000010 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000200 Wait 0x0001 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 WaitForSomething2 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index 9b58af14..40523784 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A638 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock WaitForSomething 0x00001000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index 2ea49e9e..e221b79a 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A65C BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock WaitForSomething 0x00000800 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index da8c4144..87bf2e8e 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A680 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock WaitForSomething 0x00000020 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index 19933d36..b59a7fdf 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -8,5 +8,5 @@ SCRIPT_START script_0800A6A4 Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x00000008 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index 86b321d6..0c4d8409 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -8,5 +8,5 @@ SCRIPT_START script_0800A6D4 EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x00000009 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index 5d8bd4e8..ad6120c2 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -8,5 +8,5 @@ SCRIPT_START script_0800A704 Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x0000000a - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index bd94a8d3..1bbc5b98 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -8,5 +8,5 @@ SCRIPT_START script_0800A734 EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000b - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index adf69a41..e89ebe2c 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -27,5 +27,5 @@ SCRIPT_START script_0800A764 _0807E5F8 0x00000020 Wait 0x0078 CallWithArg sub_0806DA1C, 0x0000000c - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index f92b1e92..bb2a3700 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800A7E4 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000002 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c script_0800A80C: _0807E930 0x0001 @@ -16,14 +16,14 @@ script_0800A80C: Wait 0x001e Jump script_0800A80C BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c script_0800A848: _0807E930 0x0001 @@ -32,14 +32,14 @@ script_0800A848: Wait 0x0014 Jump script_0800A848 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0010 EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c script_0800A884: _0807E930 0x0001 @@ -48,14 +48,14 @@ script_0800A884: Wait 0x000a Jump script_0800A884 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0008 EndBlock WaitForSomething 0x00000001 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 WaitForSomething2 0x00000010 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c script_0800A8C0: _0807EB44 0x0002 @@ -64,14 +64,14 @@ script_0800A8C0: Wait 0x0019 Jump script_0800A8C0 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0008 EndBlock WaitForSomething 0x00000001 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 WaitForSomething2 0x00000020 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c script_0800A8FC: _0807EB44 0x0002 @@ -95,5 +95,5 @@ script_0800A8FC: _0807E5F8 0x00000008 Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000d - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index fe9cce56..393a57c4 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A964 BeginBlock _0807EB44 0x0002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0001 EndBlock WaitForSomething2 0x00000001 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index 2b55cd98..aad9af72 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A988 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0002 EndBlock WaitForSomething2 0x00000002 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index b98bf6c4..2d8f3578 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A9AC BeginBlock _0807EB44 0x0000 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock WaitForSomething2 0x00000004 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index 73e16655..c2d5e2b3 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A9D0 BeginBlock _0807EB44 0x0006 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0003 EndBlock WaitForSomething2 0x00000008 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc index 0eef461d..e9a1788a 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/data/scripts/script_0800A9F4.inc @@ -15,5 +15,5 @@ SCRIPT_START script_0800A9F4 _0807E5F8 0x00000008 Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000e - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index fa37eafb..989a90a2 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA48 BeginBlock _0807EB44 0x0002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock WaitForSomething2 0x00000001 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index e4418cc6..f46249d4 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA6C BeginBlock _0807EB44 0x0004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock WaitForSomething2 0x00000002 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index 35e554fc..f5f4c96c 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA90 BeginBlock _0807EB44 0x0000 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock WaitForSomething2 0x00000004 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index a5d82d5d..e7b8d6b9 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AAB4 BeginBlock _0807EB44 0x0006 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock WaitForSomething2 0x00000008 Call CreateDust - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index ee03ea94..869e2aec 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -8,5 +8,5 @@ SCRIPT_START script_0800AAD8 Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x0000000f - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index 6f816d96..1f8e3217 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -65,5 +65,5 @@ SCRIPT_START script_0800AB6E WaitFor_2 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 8d3e1eca..035a5e25 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800ACBC EndBlock _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC .short 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index a8a8d990..3ddf7d42 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -13,13 +13,13 @@ SCRIPT_START script_0800ACE0 EndBlock Call sub_0807F304 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x003c _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0004 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC .short 0x0000 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 584626aa..e191815b 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -4,18 +4,18 @@ SCRIPT_START script_0800AD54 EndBlock _0807EC64 0x0020 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 @@ -61,5 +61,5 @@ SCRIPT_START script_0800AD54 WaitForSomething2 0x00000002 _0807EDD4 0x0088, 0x0040 _0807E5F8 0x00000004 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 4dd2942b..8dee61d5 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800AEA4 BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000040 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000080 WaitForSomething2 0x80000000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index b2eab374..85c122f3 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800AEDC BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807E930 0x0000 EndBlock WaitForSomething2 0x00000008 @@ -10,6 +10,6 @@ SCRIPT_START script_0800AEDC _0807EF3C 0x0000, 0x0001 _0807E5F8 0x00000010 WaitForSomething2 0x00000008 - _0807EF80 0x0008 - _0807EF80 0x0006 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index 789396ce..588860a3 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800AF18 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 SoundReq 0x0142 EndBlock WaitForSomething 0x00000020 SoundReq 0x0143 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc index 6dc7083e..600b6138 100644 --- a/data/scripts/script_0800AF44.inc +++ b/data/scripts/script_0800AF44.inc @@ -6,6 +6,6 @@ SCRIPT_START script_0800AF44 SetLocalFlagByOffset 0x0100, 0x0001 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc index 0484fab7..c051e9d2 100644 --- a/data/scripts/script_0800AF68.inc +++ b/data/scripts/script_0800AF68.inc @@ -6,6 +6,6 @@ SCRIPT_START script_0800AF68 SetLocalFlagByOffset 0x0100, 0x0002 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc index a39fc1ed..c413b752 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/data/scripts/script_0800AF8C.inc @@ -6,6 +6,6 @@ SCRIPT_START script_0800AF8C SetLocalFlagByOffset 0x0100, 0x0003 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index e79c08d9..aec2c2e2 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -13,6 +13,6 @@ script_0800AFB2: SetLocalFlagByOffset 0x0100, 0x0004 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc index 19d420e7..92f7317f 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/data/scripts/script_0800AFE8.inc @@ -6,6 +6,6 @@ SCRIPT_START script_0800AFE8 SetLocalFlagByOffset 0x0100, 0x0005 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 9e01e5ea..b7748277 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -2,8 +2,8 @@ SCRIPT_START script_0800B00C BeginBlock Call sub_0807F934 Call sub_080A2124 - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 EndBlock script_0800B024: CheckEntityInteractType @@ -16,7 +16,7 @@ script_0800B024: JumpIf script_0800B064 TextboxNoOverlap 0x3f32 _0807EA94 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5c @@ -26,7 +26,7 @@ script_0800B024: script_0800B064: TextboxNoOverlap 0x3f32 _0807EA94 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5d @@ -35,7 +35,7 @@ script_0800B064: script_0800B082: TextboxNoOverlap 0x3f32 _0807EA94 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5e @@ -43,6 +43,6 @@ script_0800B082: script_0800B09C: Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc index 24d9dcd8..d89cc551 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -7,5 +7,5 @@ SCRIPT_START script_0800B0AC _0807EA94 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index 8081128e..4e167a77 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B0D0 BeginBlock Call sub_0806BCD4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0806BC94, 0x00000000 EndBlock script_0800B0E8: diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 6310ff69..293b95d5 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800B1C0 BeginBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0088, 0x0090 ClearLocalFlag 0x0039 - _0807EF80 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0004 Wait 0x002c LoadRoomEntityList gUnk_080DA260 Wait 0x001e diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index a57bf6e8..872613b6 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -47,12 +47,12 @@ script_0800B2C8: _0807E878 Jump script_0800B2C8 script_0800B2E2: - _0807EF80 0x0013 + DoPostScriptAction 0x0013 _0807EB44 0x0004 _0807E9DC Call sub_080676E0 Call sub_08067534 - _0807EF80 0x0012 + DoPostScriptAction 0x0012 _0807E5F8 0x00000001 script_0800B302: EndBlock diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index 870fe39e..6fa1ad9f 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800B308 BeginBlock CheckLocalFlag 0x001d JumpIf script_0800B39C - _0807EF80 0x0001 + DoPostScriptAction 0x0001 SetEntityNonPlanarMovement 0x0040 SetEntityDirection 0x0010 CheckKinstoneFused 0x0006 @@ -39,6 +39,6 @@ script_0800B350: SetLocalFlag 0x001d SoundReq 0x0072 script_0800B39C: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index e76ae5d9..ff9dd344 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B3A4 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F158 SetEntityNonPlanarMovement 0x0120 _0807EB44 0x0004 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index e384808d..1abdb55f 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800B41C BeginBlock SetEntityNonPlanarMovement 0x00c0 _0807E908 0x0001 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807E864 Call sub_0807FBC4 EndBlock Wait 0x000a - _0807EF80 0x0004 + DoPostScriptAction 0x0004 _0807E5F8 0x00000008 StartPlayerScript script_0800B54C _0807EDD4 0x0140, 0x0298 @@ -29,8 +29,8 @@ SCRIPT_START script_0800B41C _0807E5F8 0x00000010 _0807EDD4 0x0158, 0x0280 Wait 0x000a - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807E5F8 0x00000010 _0807E5F8 0x00000008 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 78ce2000..552c3aa0 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B4AC BeginBlock - _0807EF80 0x000a - _0807EF80 0x0001 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0001 SetEntityNonPlanarMovement 0x00c0 _0807E9D4 script_0800B4BC: @@ -15,12 +15,12 @@ script_0800B4BC: script_0800B4D4: _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlapFollow 0x200b EndBlock _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_0800B4BC script_0800B4F0: EndBlock @@ -31,16 +31,16 @@ script_0800B4F0: TextboxNoOverlapFollow 0x2016 _0807EA94 _0807EDD4 0x0158, 0x0288 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0000 Wait 0x000a _0807E5F8 0x00000010 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x001e _0807E5F8 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C _0807E878 Call sub_0807FBCC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index fdf9b629..81c16ece 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800B54C _0807EDD4 0x0128, 0x0298 Wait 0x000a _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SCRIPT_END diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index 27bf8bf6..c42e9417 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800B574 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CheckGlobalFlag 0x001d JumpIf script_0800B5BC EndBlock WaitForSomething2 0x00000010 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SoundReq 0x0111 WaitForSomething2 0x00000010 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0111 WaitForSomething2 0x00000010 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SoundReq 0x0111 WaitForSomething2 0x00000010 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0111 script_0800B5BC: Call sub_0808692C diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index aca848f1..e549b811 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B5EC BeginBlock - _0807EF80 0x000a - _0807EF80 0x0001 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0001 _0807E9D4 EndBlock script_0800B5FA: diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index fa1ca762..6841ae66 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -8,6 +8,6 @@ SCRIPT_START script_0800B7C4 CallWithArg sub_0807F4F8, 0x00000090 script_0800B7EE: _0807E8E4_0 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index 4985e36b..823e716d 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -4,7 +4,7 @@ script_0800B7FC: CallWithArg sub_0807F464, 0x00000078 Jump script_0800B7EE BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0000 EndBlock diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index b6c5ed0f..ae2357f1 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800B828 BeginBlock _0807E9D4 _0807EB44 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800B836: _0807E944 @@ -16,8 +16,8 @@ script_0800B836: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a EndBlock script_0800B85E: Wait 0x003c @@ -27,7 +27,7 @@ script_0800B85E: _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800B87E: Wait 0x003c @@ -36,8 +36,8 @@ script_0800B87E: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a EndBlock script_0800B89E: CheckEntityInteractType @@ -52,8 +52,8 @@ script_0800B89E: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a CallWithArg sub_08064644, 0x0806464d EndBlock script_0800B8D4: @@ -63,7 +63,7 @@ script_0800B8D4: .short 0x0000 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 EndBlock @@ -80,8 +80,8 @@ script_0800B8FC: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a EndBlock CheckLocalFlag 0x005f JumpIf script_0800B94E @@ -105,8 +105,8 @@ script_0800B94E: _0807E878 Jump script_0800B94E BeginBlock - _0807EF80 0x000b - _0807EF80 0x0008 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800B9AC Call sub_0806DAD0 @@ -124,6 +124,6 @@ script_0800B99E: Call sub_0807DF50 _0807E878 script_0800B9AC: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index c5954db4..16313d57 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800B9B4 BeginBlock _0807E9D4 Call sub_080694EC - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_080694B0 EndBlock script_0800B9CA: @@ -11,7 +11,7 @@ script_0800B9CA: script_0800B9D8: _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_080694D8 _0807EA94 Call sub_080694EC @@ -20,7 +20,7 @@ script_0800B9D8: script_0800B9F4: _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807F650 _0807E9F0 _0807E864 @@ -60,7 +60,7 @@ script_0800BA6C: Jump script_0800BA46 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetEntityNonPlanarMovement 0x0040 Call sub_0807F348 EndBlock @@ -69,7 +69,7 @@ script_0800BA8E: JumpIfNot script_0800BA8E _0807EDD4 0x02f8, 0x0350 Wait 0x001e - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EB44 0x0006 Wait 0x001e diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index 133a026c..df7c4e03 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800BACC BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807F348 EndBlock script_0800BADE: CheckRoomFlag 0x00ff JumpIfNot script_0800BADE - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e01 _0807EA94 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 10bfcea7..e7e21cd9 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -4,12 +4,12 @@ SCRIPT_START script_0800BB00 script_0800BB04: CheckRoomFlag 0x00ff JumpIfNot script_0800BB04 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e02 _0807EA94 Wait 0x003c - _0807EF80 0x000f + DoPostScriptAction 0x000f Wait 0x00b4 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 0c4829d7..072d935e 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800BB30 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807F348 EndBlock script_0800BB42: CheckRoomFlag 0x00ff JumpIfNot script_0800BB42 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e05 _0807EA94 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index ad84165e..60ce3a02 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800BB64 BeginBlock _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetEntityNonPlanarMovement 0x0040 Call sub_0807F348 EndBlock diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index b7948c1a..58a0884d 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800BBA4 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807F348 EndBlock script_0800BBBA: CheckRoomFlag 0x00ff JumpIfNot script_0800BBBA - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e04 _0807EA94 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index d575f774..61a8f18b 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800BBDC script_0800BBE4: CheckRoomFlag 0x00ff JumpIfNot script_0800BBE4 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e03 _0807EA94 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index aa156173..52f34b61 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800BC08 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_0800BC18: CheckRoomFlag 0x00ff JumpIfNot script_0800BC18 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e07 _0807EA94 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 1d5647e0..baa24609 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -9,21 +9,21 @@ script_0800BC62: JumpIfNot script_0800BC62 _0807E930 0x0000 Wait 0x001e - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e08 _0807EA94 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 Call sub_08054EFC _0807EB44 0x0000 _0807E930 0x0000 SetEntityNonPlanarMovement 0x0040 - _0807EF80 0x000d + DoPostScriptAction 0x000d CallWithArg sub_0807F4F8, 0x00000378 Wait 0x003c - _0807EF80 0x000c + DoPostScriptAction 0x000c Wait 0x003c TextboxNoOverlap 0x0e09 _0807EA94 @@ -31,7 +31,7 @@ script_0800BC62: CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e SoundReq 0x0188 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 3203c912..bf86bcf4 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -19,13 +19,13 @@ script_0800BD1C: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E930 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e0c _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x0168 _0807E930 0x0000 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 22170a6f..7d668cc2 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800BD78 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e TextboxNoOverlap 0x0e0b @@ -18,7 +18,7 @@ SCRIPT_START script_0800BD78 _0807EDD4 0x0088, 0x0228 Wait 0x000f _0807E5F8 0x00000004 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000000 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index f2f58345..5df0ddf2 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -37,13 +37,13 @@ script_0800BE8C: _0807E5F8 0x00000002 Call sub_08054F64 _0807E930 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e0f _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index e1f86753..e620c95e 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800BECC BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e0e @@ -18,7 +18,7 @@ SCRIPT_START script_0800BECC _0807EDD4 0x0088, 0x0178 Wait 0x000f _0807E5F8 0x0000000c - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 Call sub_08054968 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 991b6ba8..0e16a8ad 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -37,13 +37,13 @@ script_0800BFA8: _0807E5F8 0x00000002 Call sub_08054F64 _0807E930 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e12 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x0168 _0807EB44 0x0004 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index b9b431f3..990a55df 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800C004 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e11 @@ -20,7 +20,7 @@ SCRIPT_START script_0800C004 _0807EDD4 0x00a8, 0x0178 Wait 0x000f _0807E5F8 0x0000001c - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000001 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 741f5256..b5c2d224 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -37,13 +37,13 @@ script_0800C120: _0807E5F8 0x00000002 Call sub_08054F64 _0807E930 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e15 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 89f66c7b..7fe378ae 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800C160 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e14 @@ -20,7 +20,7 @@ SCRIPT_START script_0800C160 _0807EDD4 0x00a8, 0x00d8 Wait 0x000f _0807E5F8 0x0000003c - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 Call sub_08054968 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index e8669b83..f4b62315 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -37,13 +37,13 @@ script_0800C248: _0807E5F8 0x00000002 Call sub_08054F64 _0807E930 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e18 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x0168 _0807EB44 0x0004 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index efe7ad5e..7853cf4b 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800C2A4 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e17 @@ -20,7 +20,7 @@ SCRIPT_START script_0800C2A4 _0807EDD4 0x00c8, 0x00d8 Wait 0x000f _0807E5F8 0x0000007c - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000002 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index 3e5fcded..99d16109 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800C45C Call sub_080A0B28 EndBlock Wait 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0136 script_0800C47A: _0807EE30 diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index f4f87e6c..375f4770 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800C494 _0807E930 0x0004 EndBlock Wait 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0136 _0807EEF4 0x0000, 0xff90 Wait 0x001e diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index b4393ca1..68d2a19f 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800C4D0 _0807E930 0x0004 EndBlock Wait 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0136 _0807EEF4 0x00c0, 0x0000 Wait 0x001e diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 07445982..49086ad3 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -2,11 +2,11 @@ SCRIPT_START script_0800C50C BeginBlock SetEntityNonPlanarMovement 0x0100 _0807E930 0x0004 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000001 Wait 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SoundReq 0x0136 _0807EEF4 0x0000, 0x0060 Wait 0x003c diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 0e57b91e..5e110933 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C550 BeginBlock Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800C55E: BeginBlock @@ -19,7 +19,7 @@ script_0800C572: Jump script_0800C55E BeginBlock Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800C592: BeginBlock @@ -43,7 +43,7 @@ script_0800C5C0: Jump script_0800C592 BeginBlock Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800C5D6: BeginBlock @@ -62,7 +62,7 @@ script_0800C5EA: BeginBlock script_0800C5FE: Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800C60A: BeginBlock @@ -80,7 +80,7 @@ script_0800C61E: _0807E878 Jump script_0800C60A BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a SetEntityNonPlanarMovement 0x0080 _0807EB44 0x0004 CheckLocalFlag 0x0082 @@ -96,20 +96,20 @@ script_0800C652: JumpIf script_0800C684 CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 JumpIfNot script_0800C674 - _0807EF80 0x000b + DoPostScriptAction 0x000b script_0800C674: StartPlayerScript script_0800C8C8 WaitForSomething2 0x00000001 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800C684: CheckInventory1 0x0040 JumpIf script_0800C730 CheckInventory1 0x005b JumpIf script_0800C6B6 - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f16 _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a SetLocalFlag 0x0080 Call sub_0807DF50 @@ -118,10 +118,10 @@ script_0800C684: script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f1b _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 _0807E878 @@ -129,23 +129,23 @@ script_0800C6B6: script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f17 _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a _0807EB44 0x0002 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC94 0x0020 _0807EB44 0x0004 Wait 0x000f SoundReq 0x0072 SetLocalFlag 0x0082 script_0800C712: - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f18 _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 _0807E878 @@ -153,25 +153,25 @@ script_0800C712: script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f19 _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 _0807E878 Jump script_0800C652 script_0800C756: - _0807EF80 0x0002 + DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f1a _0807EA94 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 _0807E878 Jump script_0800C652 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 EndBlock script_0800C780: @@ -187,7 +187,7 @@ script_0800C780: _0807E930 0x0008 TextboxNoOverlapFollow 0x2122 _0807EA94 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 Jump script_0800C780 @@ -207,7 +207,7 @@ script_0800C7C0: TextboxNoOverlapFollow 0x1133 _0807EA94 Wait 0x000a - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetLocalFlag 0x0081 Call sub_0807DF50 _0807E878 @@ -228,7 +228,7 @@ script_0800C824: _0807EA94 SetEntityNonPlanarMovement 0x0040 _0807EDD4 0x0038, 0x0044 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000f SetLocalFlag 0x0083 Wait 0x003c @@ -242,7 +242,7 @@ script_0800C824: _0807EA94 Wait 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 script_0800C87C: @@ -255,7 +255,7 @@ script_0800C87C: TextboxNoOverlapFollow 0x1136 _0807EA94 Wait 0x000a - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 Jump script_0800C87C @@ -263,7 +263,7 @@ script_0800C8AE: TextboxNoOverlapFollow 0x1136 _0807EA94 Wait 0x000a - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 Jump script_0800C780 diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index 94925a3f..170a566c 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800C8C8 _0807EDD4 0x00e8, 0x0068 _0807EB44 0x0000 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 6fd43f22..609bddbd 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0800C8F0 _0807EDD4 0x0078, 0x0058 _0807EB44 0x0000 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 40415799..094b43f3 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -78,5 +78,5 @@ script_0800C928: SetLocalFlag 0x008d Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index 3136b4a9..fd9661ce 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -2,11 +2,11 @@ SCRIPT_START script_0800CA8C BeginBlock SetEntityNonPlanarMovement 0x0100 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0208, 0x0358 SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x0208, 0x0340 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index d6f1ffe0..465dc589 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800CABC BeginBlock - _0807EF80 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000f + DoPostScriptAction 0x000f Call sub_0807F338 EndBlock WaitForSomething2 0x00000200 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000400 WaitForSomething2 0x00000200 SoundReq 0x007c @@ -20,15 +20,15 @@ SCRIPT_START script_0800CABC _0807E5F8 0x00000400 WaitForSomething2 0x00000200 SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x0328 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000400 WaitForSomething2 0x00000200 SetEntityNonPlanarMovement 0x0300 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x02b0 _0807E5F8 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index c72b75cf..38f0687a 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,30 +1,30 @@ SCRIPT_START script_0800CB54 BeginBlock - _0807EF80 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000f + DoPostScriptAction 0x000f Call sub_0807F338 EndBlock WaitForSomething2 0x00000800 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0002 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01a8, 0x0330 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0348 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 SetEntityNonPlanarMovement 0x0300 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0178, 0x0328 _0807E5F8 0x00001000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index c0589c83..0e6187bc 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,22 +1,22 @@ SCRIPT_START script_0800CBD4 BeginBlock - _0807EF80 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000f + DoPostScriptAction 0x000f Call sub_0807F338 EndBlock WaitForSomething2 0x00002000 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0340 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 SoundReq 0x007c @@ -26,9 +26,9 @@ SCRIPT_START script_0800CBD4 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 SetEntityNonPlanarMovement 0x0300 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0288, 0x02d8 _0807E5F8 0x00004000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index 414479f7..523e3bf3 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,22 +1,22 @@ SCRIPT_START script_0800CC6C BeginBlock - _0807EF80 0x0008 - _0807EF80 0x0000 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0000 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000f + DoPostScriptAction 0x000f Call sub_0807F338 EndBlock WaitForSomething2 0x00008000 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0330 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 SoundReq 0x007c @@ -26,9 +26,9 @@ SCRIPT_START script_0800CC6C _0807E5F8 0x00010000 WaitForSomething2 0x00008000 SetEntityNonPlanarMovement 0x0300 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0188, 0x02d8 _0807E5F8 0x00010000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index d820e6ac..9d75f438 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,28 +1,28 @@ SCRIPT_START script_0800CD04 BeginBlock - _0807EF80 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000f + DoPostScriptAction 0x000f Call sub_0807F338 EndBlock WaitForSomething2 0x00020000 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0350 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 SetEntityNonPlanarMovement 0x0300 - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EDD4 0x02a8, 0x0328 _0807E5F8 0x00040000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 85678ca9..e225e56f 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800CD7C CheckInventory1 0x005b JumpIfNot script_0800C5FE Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800CD92: EndBlock @@ -147,7 +147,7 @@ script_0800CF40: .short 0x0000 BeginBlock Call sub_08068104 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800CF5E: BeginBlock @@ -166,7 +166,7 @@ script_0800CF72: Jump script_0800CF5E BeginBlock Call sub_08068104 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800CF96: _0807E944 @@ -178,7 +178,7 @@ script_0800CF96: Jump script_0800CF96 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 EndBlock diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index b052bb90..69e087fe 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800D190 EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 4c6444ad..986fa584 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800D1B4 _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc index 85b3aa5d..50f35779 100644 --- a/data/scripts/script_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -4,9 +4,9 @@ SCRIPT_START script_0800D218 JumpIf script_0800D24C CheckLocalFlag 0x007e JumpIf script_0800D242 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000010 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 WaitForSomething2 0x00000010 SCRIPT_END diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc index 6dd2aa01..0d543eb1 100644 --- a/data/scripts/script_0800D242.inc +++ b/data/scripts/script_0800D242.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800D242 script_0800D242: - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0003 SCRIPT_END diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc index d9304479..dd9a5e5a 100644 --- a/data/scripts/script_0800D24C.inc +++ b/data/scripts/script_0800D24C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800D24C script_0800D24C: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index 6d9ff822..c0f99f30 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D254 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000020 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 WaitForSomething2 0x00000020 - _0807EF80 0x0008 - _0807EF80 0x0006 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index ad48ee0b..a7c3a384 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D278 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800D282: CheckInventory1 0x0041 @@ -46,7 +46,7 @@ script_0800D2EE: Jump script_0800D2EE BeginBlock Call sub_08068884 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 EndBlock @@ -68,7 +68,7 @@ script_0800D31E: Jump script_0800D31E BeginBlock Call sub_08068104 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800D35E: BeginBlock @@ -87,7 +87,7 @@ script_0800D372: JumpIf script_0800D3E4 CheckLocalFlag 0x007e JumpIfNot script_0800D3E4 - _0807EF80 0x000b + DoPostScriptAction 0x000b SetEntityNonPlanarMovement 0x0100 CheckPlayerInRegion 0x0090, 0x0130, 0x0810 JumpIfNot script_0800D3B2 @@ -103,7 +103,7 @@ script_0800D3B2: Call sub_080681D8 SoundReq 0x00cd Wait 0x001e - _0807EF80 0x000a + DoPostScriptAction 0x000a SetLocalFlag 0x007f script_0800D3E4: _0807E878 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index 42cf8c15..0300f2e7 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -3,8 +3,8 @@ SCRIPT_START script_0800D3EC SetEntityNonPlanarMovement 0x0080 EndBlock _0807EB44 0x0000 - _0807EF80 0x0000 - _0807EF80 0x000d + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000d _0807ECC4 0x0020 _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index bb3fc93c..5f7545e1 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800D414 BeginBlock SetEntityNonPlanarMovement 0x0100 Call sub_08068104 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800D426: _0807EB44 0x0002 @@ -40,10 +40,10 @@ script_0800D426: Jump script_0800D426 .short 0x0000 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08062A48 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_0800D4E4: EndBlock Call sub_08062698 @@ -96,9 +96,9 @@ script_0800D584: _0807E878 Jump script_0800D4E4 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08062A48 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_0800D5AC: EndBlock Call sub_08062698 @@ -127,8 +127,8 @@ script_0800D5F2: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x000b - _0807EF80 0x0008 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800D6AE Call sub_0806DAD0 @@ -157,5 +157,5 @@ script_0800D650: Call sub_0806DB44 JumpIfNot script_0800D698 LoadRoomEntityList gUnk_080DD730 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc index 3326499e..6e71e13b 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -7,5 +7,5 @@ script_0800D698: _0807E878 Call sub_0807DF50 script_0800D6AE: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index 09e80f0c..c994019e 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D6B4 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x0011 + DoPostScriptAction 0x0007 + DoPostScriptAction 0x0011 Call sub_0807F158 Call sub_0807F738 EndBlock diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 70ce4312..65080eb4 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -2,12 +2,12 @@ SCRIPT_START script_0800D6D0 BeginBlock CheckLocalFlag 0x00f3 JumpIf script_0800D6E8 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_0800D6E0: CheckLocalFlag 0x00f3 JumpIfNot script_0800D6E0 script_0800D6E8: - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index 20742cca..a39a56f4 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -2,11 +2,11 @@ SCRIPT_START script_0800D6F0 BeginBlock CheckLocalFlag 0x00f5 JumpIf script_0800D6E8 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_0800D700: CheckLocalFlag 0x00f5 JumpIfNot script_0800D700 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index 99cb9e11..e5130920 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -18,6 +18,6 @@ SCRIPT_START script_0800D710 Call sub_0807FBCC _0807E878 Call sub_0807DF50 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index f22917cf..373f3f59 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,31 +1,31 @@ SCRIPT_START script_0800D76C BeginBlock Call sub_0807F360 - _0807EF80 0x000b + DoPostScriptAction 0x000b SetEntityNonPlanarMovement 0x0200 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c SoundReq 0x0123 CallWithArg sub_0807F464, 0x000001e0 _0807EDD4 0x01e0, 0x01d8 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000010 SoundReq 0x007c _0807EF3C 0x0180, 0x0030 SoundReq 0x007c _0807EF3C 0x0180, 0x0030 _0807EB44 0x0002 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 WaitForSomething2 0x00000008 Jump script_0800D80C BeginBlock Call sub_0807F360 - _0807EF80 0x000b + DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntityNonPlanarMovement 0x0100 EndBlock @@ -36,7 +36,7 @@ SCRIPT_START script_0800D76C script_0800D80C: SetEntityNonPlanarMovement 0x0100 _0807EEF4 0x0000, 0xffe0 - _0807EF80 0x000e + DoPostScriptAction 0x000e Call sub_0806CA5C SetEntity0x20 0x00040000 SoundReq 0x00f5 @@ -45,6 +45,6 @@ script_0800D82A: Call sub_0807F8BC JumpIf script_0800D82A _0807E5F8 0x00000004 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index 964c646c..32cd7303 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -9,6 +9,6 @@ script_0800D850: Wait 0x003c Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index cd34dd5b..ef4b487b 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D874 BeginBlock Call sub_0807F934 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetIntVariable 0x00000001 Call sub_0806DA04 EndBlock @@ -32,7 +32,7 @@ script_0800D8D6: Jump script_0800D88E .short 0x0000 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 CheckInventory1 0x0017 JumpIf script_0800D924 EndBlock @@ -50,6 +50,6 @@ script_0800D8F4: _0807E878 Call sub_0807DF50 script_0800D924: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index f8b49843..ec1171f4 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -2,10 +2,10 @@ SCRIPT_START script_0800D92C BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index d258b15d..fa5755b5 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D954 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call sub_0807F180 EndBlock script_0800D962: @@ -13,8 +13,8 @@ script_0800D962: WaitForSomething2 0x00000001 Wait 0x003c _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x0007 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0007 SoundReq 0x01ce SetEntity0x20 0xffff8000 TextboxNoOverlap 0x1701 @@ -37,6 +37,6 @@ script_0800D962: Call sub_0806DA1C Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index 11619bda..fb8ca4a8 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -2,10 +2,10 @@ SCRIPT_START script_0800DA00 BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index 93fb7c76..cd2daa3f 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DA28 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 EndBlock WaitForSomething2 0x00000004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807EDD4 0x0118, 0x0060 _0807E5F8 0x00000002 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 309c74fd..733bf33b 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -41,6 +41,6 @@ script_0800DA64: SetLocalFlag 0x0077 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc index 0690c1db..3cf5e35c 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB18 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08066E38 EndBlock SCRIPT_END diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index b51c50a7..08038ccb 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800DB28 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0000 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 EndBlock WaitForSomething2 0x00000001 Wait 0x003c - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EB44 0x0004 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB44 0x0004 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc index 8c9ddfc9..305493d4 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -17,5 +17,5 @@ SCRIPT_START script_0800DC4C CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index a4e0fee5..a3c0f2e5 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DCAC BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08066E38 EndBlock WaitForSomething2 0x00000001 @@ -9,9 +9,9 @@ SCRIPT_START script_0800DCAC script_0800DCD0: CheckRoomFlag 0x0000 JumpIfNot script_0800DCD0 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x003c - _0807EF80 0x0010 + DoPostScriptAction 0x0010 SetEntityPositionRelative 0x0078, 0x0068 WaitForSomething2 0x00000001 SoundReq0x80100000 @@ -20,11 +20,11 @@ script_0800DCD0: Call sub_0807F2D4 SoundReq 0x01ca Wait 0x003c - _0807EF80 0x0004 + DoPostScriptAction 0x0004 SoundReq2 0x000b Wait 0x0078 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000a _0807EB44 0x0006 Wait 0x000a @@ -33,24 +33,24 @@ script_0800DCD0: _0807EB44 0x0006 Wait 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x0100 _0807EEF4 0x0000, 0x0008 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e Call sub_08066E80 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x000a _0807EB44 0x0006 Wait 0x000a @@ -59,7 +59,7 @@ script_0800DCD0: _0807EB44 0x0006 Wait 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index 318e60e8..dd7e3a6a 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800DDD0 CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index a5ed1fc5..e1425d7e 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -3,10 +3,10 @@ SCRIPT_START script_0800DE00 SetEntityNonPlanarMovement 0x0100 EndBlock _0807EB44 0x0000 - _0807EF80 0x000d - _0807EF80 0x0000 + DoPostScriptAction 0x000d + DoPostScriptAction 0x0000 _0807ECC4 0x0010 - _0807EF80 0x000c + DoPostScriptAction 0x000c _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index 2a9997cb..d637c711 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800DE2C SetEntityNonPlanarMovement 0x0100 EndBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 _0807E5F8 0x00000004 Call sub_080791BC diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc index 56e71bbe..afed1ce2 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE50 EndBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc index 0ecd30e4..eda4b452 100644 --- a/data/scripts/script_0800DE78.inc +++ b/data/scripts/script_0800DE78.inc @@ -10,5 +10,5 @@ SCRIPT_START script_0800DE78 SetLocalFlag 0x007a Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index fe8eb6e9..5ea6b35a 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800DEB0 EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index 410e9296..a88bfd5b 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800DED4 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x000b + DoPostScriptAction 0x000b Call sub_08066D04 EndBlock BeginBlock Call sub_08066D14 SetEntityPositionRelative 0x0198, 0x0148 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 EndBlock _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_08066D4C - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 465aeb71..1bbcf592 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DF24 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock _0807E864 Call sub_0807F9A4 @@ -18,15 +18,15 @@ SCRIPT_START script_0800DF24 Call sub_0807F5C0 Call sub_08066C94 Wait 0x00e9 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 TextboxNoOverlapFollowPos 0x162f, 0x0002 _0807EA94 SoundReq2 0x002f - _0807EF80 0x0019 + DoPostScriptAction 0x0019 SoundReq 0x0198 Call sub_0807F2D4 SetRoomFlag 0x0000 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer @@ -34,5 +34,5 @@ SCRIPT_START script_0800DF24 SetLocalFlag 0x0078 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index a8525746..1a66bdab 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -10,5 +10,5 @@ script_0800DFB6: CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 533f67f8..b628b130 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -26,6 +26,6 @@ script_0800E012: CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index f06ea0ba..008f8c98 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -15,6 +15,6 @@ SCRIPT_START script_0800E050 WaitForSomething2 0x00000002 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index 23bfe931..5b912f70 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800E094 SetEntityNonPlanarMovement 0x00c0 EndBlock WaitForSomething2 0x00000001 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c _0807E5F8 0x00000002 Call sub_080791BC diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 51d48b48..7bf1a3eb 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E0BC BeginBlock _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E _0807E930 0x0008 @@ -12,18 +12,18 @@ script_0800E0DE: JumpIfNot script_0800E0DE _0807E864 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 SoundReq 0x01c9 _0807E930 0x0009 Wait 0x003c SoundReq 0x01ca - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e SoundReq 0x0072 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB8C _0807EB74 Wait 0x000a @@ -47,7 +47,7 @@ script_0800E138: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 _0807E930 0x0010 @@ -58,18 +58,18 @@ script_0800E176: JumpIfNot script_0800E176 _0807E864 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 SoundReq 0x01c9 _0807E930 0x0015 Wait 0x003c SoundReq 0x01ca - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e SoundReq 0x0072 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB8C _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 @@ -95,7 +95,7 @@ script_0800E1E0: BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 _0807E9D4 @@ -115,24 +115,24 @@ script_0800E24A: JumpIfNot script_0800E24A _0807E864 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 SoundReq 0x01c9 _0807E930 0x0015 Wait 0x003c SoundReq 0x01ca - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e SoundReq 0x0072 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB8C _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 _0807E878 @@ -183,7 +183,7 @@ script_0800E32E: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x0071 JumpIf script_0800E3E8 CheckLocalFlag 0x0096 @@ -196,22 +196,22 @@ script_0800E37A: JumpIfNot script_0800E37A _0807E864 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 SoundReq 0x01c9 _0807E930 0x000d Wait 0x003c SoundReq 0x01ca - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e SoundReq 0x0072 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x001e - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB74 SetLocalFlag 0x0096 script_0800E3BE: - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E9D4 _0807E878 EndBlock @@ -243,7 +243,7 @@ script_0800E3EE: Jump script_0800E3EE BeginBlock _0807EB44 0x0002 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_080668F0 EndBlock script_0800E41A: @@ -259,7 +259,7 @@ script_0800E41A: BeginBlock _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E9D4 EndBlock script_0800E44C: @@ -275,7 +275,7 @@ script_0800E44C: BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E9D4 EndBlock script_0800E484: @@ -315,6 +315,6 @@ script_0800E4B6: SetLocalFlag 0x007c script_0800E4FA: _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index c0332ba7..aa6d96c5 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -16,5 +16,5 @@ script_0800E510: SetLocalFlag 0x007d script_0800E53C: _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index f46e30bb..f8ea1fde 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -17,6 +17,6 @@ script_0800E550: SetLocalFlag 0x007e script_0800E582: _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index cdcde694..03454897 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E58C BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0000 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 EndBlock Wait 0x003c SoundReq 0x0105 diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc index 65098577..04160a36 100644 --- a/data/scripts/script_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -2,6 +2,6 @@ SCRIPT_START script_0800E5C4 BeginBlock CheckLocalFlag 0x0086 JumpIfNot script_0800E5D6 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 1f41c8bb..13ed8190 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800E600 EndBlock WaitForPlayerAction0x17 _0807E8E4_0 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_080752AC _0807E878 Call sub_080791D0 diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 51379a5e..3400590c 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800E62C EndBlock WaitForPlayerAction0x17 _0807E8E4_1 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_080752AC _0807E878 Call sub_080791D0 diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index 79adc65b..d72f1ad6 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800E658 EndBlock WaitForPlayerAction0x17 _0807E8E4_2 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_080752AC _0807E878 Call sub_080791D0 diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index cfddbd91..bdb35605 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800E684 EndBlock WaitForPlayerAction0x17 _0807E8E4_3 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_080752AC _0807E878 Call sub_080791D0 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index f1abdc45..dd055f19 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E6B0 BeginBlock Call sub_08060090 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800E6BE: BeginBlock @@ -20,7 +20,7 @@ script_0800E6D2: Jump script_0800E6BE BeginBlock Call sub_0806ADFC - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800E6F4: EndBlock BeginBlock @@ -47,7 +47,7 @@ script_0800E722: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800E73E: CheckEntityInteractType @@ -61,7 +61,7 @@ script_0800E73E: Jump script_0800E73E BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a SetEntityNonPlanarMovement 0x0200 CheckGlobalFlag 0x0029 JumpIfNot script_0800E77C @@ -90,7 +90,7 @@ script_0800E7A4: _0807E878 Jump script_0800E788 script_0800E7BA: - _0807EF80 0x000f + DoPostScriptAction 0x000f _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 @@ -107,7 +107,7 @@ script_0800E7D8: Jump script_0800E6F4 BeginBlock Call sub_0806C674 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 EndBlock script_0800E806: @@ -123,7 +123,7 @@ script_0800E806: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0000 EndBlock script_0800E832: diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 6c558ea9..f2f46798 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -11,7 +11,7 @@ script_0800E914: Jump script_0800E832 BeginBlock Call sub_0806C4F8 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0000 EndBlock script_0800E932: @@ -31,7 +31,7 @@ script_0800E942: Jump script_0800E932 .short 0x0000 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 EndBlock @@ -45,10 +45,10 @@ script_0800E974: Call sub_0806B260 JumpIfNot script_0800E9E4 _0807EA94 - _0807EF80 0x000b + DoPostScriptAction 0x000b StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 - _0807EF80 0x000a + DoPostScriptAction 0x000a TextboxNoOverlapFollow 0x4a24 _0807EA94 _0807E930 0x000a diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index 0a268ef1..69dc9e0b 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -3,9 +3,9 @@ SCRIPT_START script_0800E9F4 _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/script_0800EA1C.inc index 294402ba..037d857f 100644 --- a/data/scripts/script_0800EA1C.inc +++ b/data/scripts/script_0800EA1C.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800EA1C _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0014 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0014 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x0005 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0005 Wait 0x003c _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index d5a38e14..ae6cfc3d 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800EA54 BeginBlock Call sub_0806CE5C - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 EndBlock @@ -23,7 +23,7 @@ script_0800EA6A: BeginBlock _0807E9D4 Call sub_0806C09C - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 _0807EB44 0x0004 EndBlock @@ -47,7 +47,7 @@ script_0800EAD4: Jump script_0800EABC BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 EndBlock @@ -64,7 +64,7 @@ script_0800EB0E: .short 0x0000 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 EndBlock @@ -81,7 +81,7 @@ script_0800EB44: .short 0x0000 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 EndBlock @@ -99,21 +99,21 @@ script_0800EB7C: Jump script_0800EB7C BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 EndBlock Jump script_0800EBF4 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 EndBlock Jump script_0800EBF4 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 EndBlock @@ -130,7 +130,7 @@ script_0800EBF4: .short 0x0000 BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 EndBlock @@ -148,7 +148,7 @@ script_0800EC2C: Jump script_0800EC2C BeginBlock Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 EndBlock @@ -167,7 +167,7 @@ script_0800EC6C: _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 SetEntityNonPlanarMovement 0x0040 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0002 EndBlock @@ -195,7 +195,7 @@ script_0800ECAC: Jump script_0800ECAC BeginBlock Call sub_080639D0 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock BeginBlock CallWithArg sub_08063850, 0x00000000 @@ -218,8 +218,8 @@ script_0800ED46: Jump script_0800ED20 BeginBlock Call sub_08064CC0 - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807EB44 0x0002 _0807E930 0x0000 EndBlock @@ -235,7 +235,7 @@ script_0800ED76: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800ED98: EndBlock BeginBlock @@ -285,7 +285,7 @@ script_0800EE3E: Jump script_0800ED98 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800EE58: EndBlock BeginBlock diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 793fb4de..fa2511c4 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800EF40 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CheckGlobalFlag 0x001f JumpIf script_0800EF92 EndBlock diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index 21f358bb..61f94c12 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800EF9C SetEntityNonPlanarMovement 0x0100 EndBlock _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index 4a9dc22c..e69fb191 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800EFC0 BeginBlock SetEntityNonPlanarMovement 0x0080 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 EndBlock @@ -21,7 +21,7 @@ script_0800EFFE: _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0088, 0x0040 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 @@ -34,7 +34,7 @@ script_0800EFFE: _0807EB44 0x0006 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0068, 0x0040 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 Jump script_0800EFDA @@ -86,6 +86,6 @@ script_0800F11A: WaitForSomething2 0x000003c0 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index 424a5b99..b13edcab 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -2,14 +2,14 @@ SCRIPT_START script_0800F14C BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0006 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0338 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index a11ddc09..4e4cbb74 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800F184 BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0008 - _0807EF80 0x000a + DoPostScriptAction 0x0008 + DoPostScriptAction 0x000a EndBlock Call sub_0807F348 _0807EB44 0x0002 WaitForSomething2 0x00000002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0328 _0807E5F8 0x00000040 _0807EDD4 0x01f8, 0x0328 @@ -30,7 +30,7 @@ script_0800F1E6: Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c _0807EA94 @@ -46,7 +46,7 @@ script_0800F22A: Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c _0807EA94 @@ -62,7 +62,7 @@ script_0800F26A: Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c _0807EA94 @@ -78,7 +78,7 @@ script_0800F2AA: Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c _0807EA94 @@ -109,5 +109,5 @@ script_0800F314: _0807EB44 0x0002 _0807EEF4 0x00c0, 0x0000 _0807E5F8 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index bcc37575..271e6083 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -2,20 +2,20 @@ SCRIPT_START script_0800F39C BeginBlock _0807E9D4 _0807EB44 0x0002 - _0807EF80 0x0001 - _0807EF80 0x0008 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x000b + DoPostScriptAction 0x000b EndBlock Call sub_0807F348 WaitForSomething2 0x00000004 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 _0807EDD4 0x0208, 0x0338 _0807EB44 0x0006 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E5F8 0x00000080 script_0800F3EA: EndBlock @@ -32,11 +32,11 @@ script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA EndBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b Wait 0x0010 SetEntityNonPlanarMovement 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 _0807E5F8 0x00000080 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index a8fdfe28..45b67055 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -2,19 +2,19 @@ SCRIPT_START script_0800F430 BeginBlock _0807E9D4 _0807EB44 0x0002 - _0807EF80 0x0001 - _0807EF80 0x0008 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x000b + DoPostScriptAction 0x000b EndBlock Call sub_0807F348 WaitForSomething2 0x00000008 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01d8, 0x0328 _0807EDD4 0x01f8, 0x0348 _0807EB44 0x0000 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E5F8 0x00000100 script_0800F478: EndBlock @@ -31,13 +31,13 @@ script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 EndBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b Wait 0x0018 SetEntityNonPlanarMovement 0x0100 _0807EC94 0x0010 _0807EC64 0x0020 _0807EDD4 0x0288, 0x0328 _0807E5F8 0x00000100 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 2e0a260f..86830725 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -2,19 +2,19 @@ SCRIPT_START script_0800F4C4 BeginBlock _0807E9D4 _0807EB44 0x0002 - _0807EF80 0x0001 - _0807EF80 0x0008 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x000b + DoPostScriptAction 0x000b EndBlock Call sub_0807F348 WaitForSomething2 0x00000010 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EDD4 0x01c8, 0x0328 _0807EDD4 0x01e8, 0x0338 _0807EB44 0x0002 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E5F8 0x00000200 script_0800F50C: EndBlock @@ -31,12 +31,12 @@ script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C EndBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b Wait 0x0028 SetEntityNonPlanarMovement 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 _0807E5F8 0x00000200 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index e0320f22..d362eb4b 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800F554 BeginBlock Call sub_08061FE4 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800F564: CheckEntityInteractType @@ -17,9 +17,9 @@ script_0800F564: .short 0x0000 script_0800F584: BeginBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0800F592: CheckEntityInteractType @@ -29,13 +29,13 @@ script_0800F592: Call sub_0806265C _0807EA94 _0807E878 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_0800F592 .short 0x0000 BeginBlock _0807EB44 0x0006 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000008 EndBlock script_0800F5C8: @@ -53,7 +53,7 @@ script_0800F5C8: _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F348 EndBlock script_0800F604: @@ -69,8 +69,8 @@ script_0800F604: Jump script_0800F604 BeginBlock _0807E9D4 - _0807EF80 0x000a - _0807EF80 0x0001 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0001 EndBlock script_0800F636: _0807E30C @@ -84,8 +84,8 @@ script_0800F636: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E9D4 EndBlock script_0800F662: @@ -93,19 +93,19 @@ script_0800F662: JumpIfNot script_0800F662 _0807E864 _0807EB74 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0806B4F0 _0807EA94 Wait 0x000f _0807E878 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_0800F662 .short 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F348 EndBlock script_0800F6A0: @@ -128,9 +128,9 @@ script_0800F6C8: Jump script_0800F6A0 .short 0x0000 BeginBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08062788 EndBlock script_0800F6F4: @@ -143,9 +143,9 @@ script_0800F6F4: Call sub_0806265C _0807EA94 _0807E878 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_0800F6F4 script_0800F718: Call sub_080627E8 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 5df1fae4..0a5bab7d 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800F724 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_0800F72C: CheckLocalFlag 0x00cd JumpIfNot script_0800F72C - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Jump script_0800F584 CheckLocalFlag 0x00cd JumpIf script_0800FA4C @@ -171,6 +171,6 @@ script_0800F72C: Call sub_0807DF50 _0807E878 script_0800FA4C: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index 593a4b3e..076c3a6c 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800FA54 EndBlock SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index b93f0644..d9444222 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800FA78 EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index 2d2128af..4e9ffa05 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800FA9C EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index f3571b1b..bca6c339 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800FAC0 EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index 851e045d..22643bc1 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -11,7 +11,7 @@ script_0800FB06: script_0800FB10: _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/script_0800FB2C.inc index bc358f9f..8a92506b 100644 --- a/data/scripts/script_0800FB2C.inc +++ b/data/scripts/script_0800FB2C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FB2C _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index fb92befb..eb52579c 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FB44 BeginBlock - _0807EF80 0x0008 - _0807EF80 0x000b + DoPostScriptAction 0x0008 + DoPostScriptAction 0x000b SetEntityNonPlanarMovement 0x0080 Call sub_08066D04 EndBlock @@ -10,28 +10,28 @@ SCRIPT_START script_0800FB44 JumpIf script_0800FB6C MoveEntityToPlayer script_0800FB6C: - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SetEntityPositionRelative 0x00b8, 0x0398 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 _0807EB44 0x0000 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E5F8 0x00000004 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E9D4 script_0800FBAE: _0807E30C JumpIfNot script_0800FBAE - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 @@ -40,66 +40,66 @@ script_0800FBAE: _0807EDD4 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 _0807EB44 0x0000 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E5F8 0x00000004 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800FC06: _0807E30C JumpIfNot script_0800FC06 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 _0807EB44 0x0002 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E5F8 0x00000004 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800FC52: _0807E30C JumpIfNot script_0800FC52 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 _0807EB44 0x0000 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807E5F8 0x00000004 - _0807EF80 0x000a + DoPostScriptAction 0x000a script_0800FC9E: CheckEntityInteractType JumpIfNot script_0800FC9E - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 WaitForSomething2 0x00000002 - _0807EF80 0x000d + DoPostScriptAction 0x000d SetEntityNonPlanarMovement 0x0040 _0807EC94 0x0020 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - _0807EF80 0x000c + DoPostScriptAction 0x000c SetEntityNonPlanarMovement 0x0040 _0807ECF4 0x0020 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 Call sub_08066D4C - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc index d95b4687..724039bc 100644 --- a/data/scripts/script_0800FD80.inc +++ b/data/scripts/script_0800FD80.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800FD80 SetEntityNonPlanarMovement 0x0080 _0807EC64 0x0020 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index dc10ff58..192cfda5 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800FDA0 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E9D4 EndBlock script_0800FDB2: @@ -17,8 +17,8 @@ script_0800FDB2: .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 EndBlock @@ -37,24 +37,24 @@ script_0800FDEE: script_0800FE06: EndBlock _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A3C Jump script_0800FDE8 .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 EndBlock @@ -73,16 +73,16 @@ script_0800FE66: script_0800FE7E: EndBlock _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A84 Jump script_0800FE60 @@ -97,7 +97,7 @@ script_0800FE7E: script_0800FED8: EndBlock BeginBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b Call sub_080642B8 CheckEntityInteractType JumpIfNot script_0800FED8 @@ -111,6 +111,6 @@ script_0800FED8: _0807E878 Jump script_0800FED8 script_0800FF0E: - _0807EF80 0x0008 - _0807EF80 0x0006 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc index d659f684..33b87618 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800FF18 script_0800FF34: EndBlock BeginBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b Call sub_08064198 CheckEntityInteractType JumpIfNot script_0800FF34 @@ -23,6 +23,6 @@ script_0800FF34: _0807E878 Jump script_0800FF34 script_0800FF6A: - _0807EF80 0x0008 - _0807EF80 0x0006 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 18283eb4..1b87d588 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -9,10 +9,10 @@ SCRIPT_START script_0800FF74 script_0800FF92: EndBlock BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckLocalFlag 0x00ce JumpIf script_0800FFCC - _0807EF80 0x000b + DoPostScriptAction 0x000b Call sub_08064198 CheckLocalFlag 0x00c7 JumpIfNot script_0800FFCC @@ -69,7 +69,7 @@ script_08010060: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 EndBlock @@ -86,5 +86,5 @@ script_08010090: _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010090 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 7c6f200e..ac42504d 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080100C8 BeginBlock Call sub_08061FE4 Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080100DC: CheckEntityInteractType @@ -18,7 +18,7 @@ script_080100DC: BeginBlock Call sub_08061FE4 Call sub_08061E70 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08010110: Wait 0x003c @@ -28,8 +28,8 @@ script_08010110: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a EndBlock script_08010132: CheckEntityInteractType @@ -41,9 +41,9 @@ script_08010132: _0807E878 Jump script_08010132 BeginBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0806C354 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0801015A: CheckEntityInteractType @@ -72,7 +72,7 @@ script_080101A6: Jump script_0801015A script_080101AC: BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Call sub_080A1648 EndBlock Call sub_080A1270 @@ -114,6 +114,6 @@ script_08010240: CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 2aa304fb..3a0354d7 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08010264 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_0801027A: CheckEntityInteractType @@ -17,9 +17,9 @@ script_0801027A: Jump script_0801027A .short 0x0000 BeginBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_08062A48 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080102A6: CheckEntityInteractType @@ -42,9 +42,9 @@ script_080102CC: Jump script_080102A6 .short 0x0000 BeginBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_08062A48 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080102F2: CheckEntityInteractType @@ -57,7 +57,7 @@ script_080102F2: Jump script_080102F2 .short 0x0000 BeginBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08010314: EndBlock @@ -101,9 +101,9 @@ script_08010396: Jump script_08010314 .short 0x0000 BeginBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_08062A48 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080103C2: Wait 0x001e @@ -112,7 +112,7 @@ script_080103C2: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000004 EndBlock script_080103E8: @@ -123,7 +123,7 @@ script_080103E8: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08010410: @@ -138,8 +138,8 @@ script_08010410: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a SetIntVariable 0x08064689 Call sub_08064644 EndBlock @@ -151,7 +151,7 @@ script_08010446: _0807EB44 0x0004 _0807E930 0x0000 Call sub_080636F4 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F348 EndBlock script_08010470: @@ -170,7 +170,7 @@ script_08010470: _0807EB44 0x0004 _0807E930 0x0000 Call sub_08063CAC - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F348 EndBlock script_080104BC: @@ -188,7 +188,7 @@ script_080104BC: BeginBlock _0807EB44 0x0004 _0807E930 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0807F348 EndBlock script_08010502: @@ -259,9 +259,9 @@ script_080105E0: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08010602: CheckEntityInteractType @@ -277,7 +277,7 @@ script_08010602: _0807E930 0x0008 script_08010622: Call sub_08062A48 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0801062E: CheckEntityInteractType @@ -305,9 +305,9 @@ script_0801062E: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08010686: CheckEntityInteractType @@ -324,9 +324,9 @@ script_08010686: .short 0x0000 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_080106BE: CheckEntityInteractType @@ -334,7 +334,7 @@ script_080106BE: _0807E864 _0807EB74 Call sub_0807F2D4 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 TextboxNoOverlap 0x3c07 @@ -362,13 +362,13 @@ script_08010724: script_08010726: _0807EA94 _0807E878 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_080106BE .short 0x0000 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 EndBlock script_08010746: @@ -398,29 +398,29 @@ script_08010786: _0807E930 0x0008 Jump script_08010746 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_080107AA: CheckEntityInteractType JumpIfNot script_080107AA _0807E864 Call sub_0807F2D4 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_08062CBC _0807EA94 _0807E878 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_080107AA .short 0x0000 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807E9D4 Call sub_0807F348 Call sub_08069684 @@ -493,7 +493,7 @@ script_080108BA: Call sub_0807DF50 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_08010804 script_080108D0: CheckPlayerInRegion2 0x0808 @@ -512,7 +512,7 @@ script_08010900: _0807E878 Jump script_080108D0 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 CheckKinstoneFused 0x001b JumpIf script_0800EF92 EndBlock diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index 21fad75c..82db0677 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -37,5 +37,5 @@ script_080109DE: _0807E878 Jump script_080109A0 script_080109EA: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index 3c55ca52..04fe995f 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_080109F0 EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index 020139cf..53105cf2 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08010A14 EndBlock _0807EC64 0x0010 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 5e924e89..0f012078 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08010A38 EndBlock _0807EC94 0x0010 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 22b8abef..0f9dcf76 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08010A5C script_08010A78: Call sub_0807F0D8 JumpIfNot script_08010A78 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 _0807E878 Call sub_0807DF50 Call sub_080791D0 diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index b9ba3821..6201c14e 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08010A98 BeginBlock _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08067314 EndBlock script_08010AB4: @@ -21,9 +21,9 @@ script_08010AB4: CheckInventory1 0x0067 JumpIfNot script_08010B62 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetEntityNonPlanarMovement 0x0180 - CallWithArg_2 sub_0807F348 + CallWithArg sub_0807F348 Call sub_0806075C EndBlock _0807EA94 @@ -31,7 +31,7 @@ script_08010AB4: script_08010B10: EndBlock Call sub_0806076C - _0807EF80 0x0007 + DoPostScriptAction 0x0007 script_08010B1C: Call sub_08060700 script_08010B22: @@ -47,7 +47,7 @@ script_08010B3A: Jump script_08010B10 script_08010B44: EndBlock - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08010B4A: EndBlock BeginBlock @@ -56,5 +56,5 @@ script_08010B4A: EndBlock Jump script_08010B1C script_08010B62: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 450e733f..27dbc37f 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -4,9 +4,9 @@ SCRIPT_START script_08010B68 JumpIfNot script_08010BAC Call sub_0807F924 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x0007 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000a EndBlock script_08010B88: EndBlock @@ -23,6 +23,6 @@ script_08010B88: _0807E878 Jump script_08010B88 script_08010BAC: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index c6b72220..8fee4cbf 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08010BB4 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 Call sub_0806E440 @@ -10,7 +10,7 @@ script_08010BCA: JumpIfNot script_08010BCA _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0806E418 _0807EA94 _0807E878 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 39454d09..0e59d2cd 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -39,6 +39,6 @@ SCRIPT_START script_08010F84 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 Call sub_0804BCDC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index 9b71ddce..a127e6c2 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08011074 EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc index 99edfb68..ae79a2e7 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011098 SetEntityPositionRelative 0x01a8, 0x0058 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000400 _0807E610 0x00000002 EndBlock diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index 631f5ca5..bf562d30 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -3,10 +3,10 @@ SCRIPT_START script_080110BC SetEntityNonPlanarMovement 0x0040 EndBlock SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index a8e836b4..11113c53 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080110E8 SoundReq 0x007a _0807EB44 0x0004 - _0807EF80 0x000d + DoPostScriptAction 0x000d SoundReq 0x0086 Call sub_0807F36C SetEntityNonPlanarMovement 0x0400 _0807ECF4 0x0008 BeginBlock Call sub_0807F1E8 - _0807EF80 0x0011 + DoPostScriptAction 0x0011 EndBlock Call sub_0807F2D4 WaitForSomething 0x80000000 diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index a643786f..48c4f798 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08011128 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08011134: CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 JumpIfNot script_08011134 LoadRoomEntityList gUnk_080F06B0 - _0807EF80 0x000b + DoPostScriptAction 0x000b WaitForSomething2 0x00000004 SetEntityPositionRelative 0x01b8, 0x0058 _0807EB44 0x0004 @@ -20,18 +20,18 @@ script_08011134: _0807E5F8 0x00000008 WaitForSomething2 0x00000004 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807ECC4 0x0010 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Call sub_0807F3C8 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c _0807E5F8 0x00000008 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 50541810..3aa09161 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080111CC BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 Call sub_08066D04 EndBlock @@ -14,42 +14,42 @@ script_080111F6: JumpIf script_08011206 SetEntityPositionRelative 0x01f8, 0x00b8 script_08011206: - _0807EF80 0x0007 - _0807EF80 0x0001 + DoPostScriptAction 0x0007 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0050 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0020 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0007 - _0807EF80 0x0001 + DoPostScriptAction 0x0007 + DoPostScriptAction 0x0001 SetEntityNonPlanarMovement 0x0040 _0807EDD4 0x01e8, 0x0040 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 Call sub_08095810 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0058 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 SoundReq 0x01c9 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x0014 Call sub_08066E20 Wait 0x0014 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Call sub_0807F2D4 SoundReq 0x01ca _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index 65ce1ed2..6f573aa7 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_080112C4 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0100 Call sub_08095244 Call sub_0807F338 EndBlock WaitForSomething 0x0002a800 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0006 _0807ECC4 0x0010 Wait 0x003c @@ -27,7 +27,7 @@ script_08011312: _0807E930 0x0002 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 SoundReq 0x011e @@ -39,14 +39,14 @@ script_08011312: _0807E930 0x0013 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x000a - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c _0807E5F8 0x00001000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc index 790c8547..94883932 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -10,7 +10,7 @@ script_080113AA: _0807E930 0x0002 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 SoundReq 0x011e @@ -22,14 +22,14 @@ script_080113AA: _0807E930 0x0013 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x000a - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c _0807E5F8 0x00004000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc index fe2d6936..5511fd5e 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -12,7 +12,7 @@ script_08011442: _0807E930 0x0002 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 SoundReq 0x011e @@ -26,12 +26,12 @@ script_08011442: _0807E930 0x0013 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - _0807EF80 0x000d + DoPostScriptAction 0x000d _0807E930 0x0014 SetEntityNonPlanarMovement 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 Call sub_0807F3C8 @@ -40,5 +40,5 @@ script_08011442: SetEntityDirection 0x001e _0807EC1C 0x003c _0807E5F8 0x00010000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index c70497c3..c8c35491 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -12,7 +12,7 @@ script_08011508: _0807E930 0x0002 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 SoundReq 0x011e @@ -26,12 +26,12 @@ script_08011508: _0807E930 0x0013 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 - _0807EF80 0x000d + DoPostScriptAction 0x000d _0807E930 0x0014 SetEntityNonPlanarMovement 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 Call sub_0807F3C8 @@ -40,6 +40,6 @@ script_08011508: SetEntityDirection 0x0002 _0807EC1C 0x003c _0807E5F8 0x00040000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index d28dc323..aa1bdf6e 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -11,5 +11,5 @@ SCRIPT_START script_080115D0 _0807E930 0x0001 _0807E5F8 0x00100000 WaitForSomething2 0x00080000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index ce79cf08..c879f4a3 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -11,5 +11,5 @@ SCRIPT_START script_08011608 _0807E930 0x0003 _0807E5F8 0x00400000 WaitForSomething2 0x00200000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index 504dd3c9..479e22ac 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,25 +1,25 @@ SCRIPT_START script_08011640 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 EndBlock Call sub_0807F338 WaitForSomething2 0x00000040 - _0807EF80 0x0007 - _0807EF80 0x0001 + DoPostScriptAction 0x0007 + DoPostScriptAction 0x0001 SetEntityNonPlanarMovement 0x0040 _0807EDD4 0x01f8, 0x0048 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000080 WaitForSomething2 0x00000040 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Call sub_0807F3C8 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c _0807E5F8 0x00000080 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index f0cee9c2..2809f1cf 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -5,81 +5,81 @@ SCRIPT_START script_080116A8 EndBlock Call sub_0807F338 WaitForSomething2 0x00000100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00d0 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0004 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 - _0807EF80 0x001a + DoPostScriptAction 0x001a Call sub_0807F2D4 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 SoundReq 0x0120 CallWithArg sub_08095420, script_08011890 Wait 0x00f0 - _0807EF80 0x0016 + DoPostScriptAction 0x0016 SoundReq 0x01cb WaitForSomething2 0x10000000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 SoundReq 0x01c4 CallWithArg sub_0809545C, script_080118D4 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Wait 0x003c - _0807EF80 0x0016 + DoPostScriptAction 0x0016 SoundReq 0x01c5 _0807E5F8 0x08000000 WaitForSomething2 0x10000000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 _0807EB44 0x0000 - _0807EF80 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0004 Wait 0x005a _0807EB44 0x0004 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Call sub_08066CA4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 _0807E5F8 0x00000200 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 4c95cf75..823a28a1 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -14,6 +14,6 @@ SCRIPT_START script_0801183C _0807E930 0x0002 _0807E5F8 0x01000000 WaitForSomething2 0x00800000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 626b893c..44128a3c 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -12,5 +12,5 @@ SCRIPT_START script_08011890 SoundReq 0x01cc _0807E5F8 0x10000000 WaitForSomething2 0x08000000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index f4d24323..9b8ec154 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -16,6 +16,6 @@ SCRIPT_START script_080118D4 _0807E5F8 0x10000000 WaitForSomething2 0x08000000 SoundReq 0x011d - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08011940.inc b/data/scripts/script_08011940.inc index faacc51a..0fdf418f 100644 --- a/data/scripts/script_08011940.inc +++ b/data/scripts/script_08011940.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08011940 WaitForSomething 0x40000000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index adfa48c9..03141c41 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -11,7 +11,7 @@ SCRIPT_START script_0801194C _0807EB44 0x0004 script_0801196A: _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_0801197C: @@ -34,7 +34,7 @@ script_080119A4: BeginBlock _0807E9D4 _0807EB44 0x0004 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x0000000c EndBlock script_080119C8: @@ -54,7 +54,7 @@ script_080119C8: _0807EB44 0x0006 script_080119F6: _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08011A08: @@ -71,7 +71,7 @@ script_08011A08: BeginBlock _0807EB44 0x0004 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08011A44: @@ -87,7 +87,7 @@ script_08011A44: BeginBlock _0807EB44 0x0002 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08011A7C: @@ -106,7 +106,7 @@ script_08011A7C: BeginBlock _0807EB44 0x0004 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08011AC4: @@ -132,6 +132,6 @@ script_08011AFA: CallWithArg sub_0806DA1C, 0x00000003 _0807E878 Call sub_0807DF50 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 1712c9e9..8e19052d 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -5,6 +5,6 @@ SCRIPT_START script_08011B20 _0807EA94 _0807E878 Call sub_0807DF50 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 785af9f9..435cfc37 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08011B40 BeginBlock _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSomething2 0x00000004 _0807EB44 0x0006 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807EB8C TextboxNoOverlap 0x3d07 @@ -34,7 +34,7 @@ script_08011B9A: script_08011BA4: HasRupees 0x000a JumpIf script_08011BBC - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x3d05 Jump script_08011B9A diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index 3e32c45d..a31ccbe5 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08011C50 CallWithArg sub_0806C2A0, 0x00000001 WaitFor_2 Wait 0x003c - _0807EF80 0x0014 + DoPostScriptAction 0x0014 Wait 0x001e _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 41e79e5b..82e25509 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -2,8 +2,8 @@ SCRIPT_START script_08011C7C BeginBlock Call sub_08064828 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011CC2 EndBlock @@ -15,12 +15,12 @@ script_08011C9A: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4515 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011C9A script_08011CC2: EndBlock @@ -34,35 +34,35 @@ script_08011CC2: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x3105 _0807EA94 _0807E3E8 JumpIf script_08011D0E _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011CC2 script_08011D00: CheckEntityInteractType JumpIfNot script_08011D00 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08011D0E: TextboxNoOverlap 0x3108 _0807EA94 SetGlobalFlag 0x002b _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011D00 .short 0x0000 BeginBlock Call sub_08064928 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011D6E EndBlock @@ -74,12 +74,12 @@ script_08011D46: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4513 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011D46 script_08011D6E: EndBlock @@ -93,35 +93,35 @@ script_08011D6E: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x3103 _0807EA94 _0807E3E8 JumpIf script_08011DBA _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011D6E script_08011DAC: CheckEntityInteractType JumpIfNot script_08011DAC _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08011DBA: TextboxNoOverlap 0x3106 _0807EA94 SetGlobalFlag 0x002c _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011DAC .short 0x0000 BeginBlock Call sub_08064A28 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011E1A EndBlock @@ -133,12 +133,12 @@ script_08011DF2: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4514 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011DF2 script_08011E1A: EndBlock @@ -152,35 +152,35 @@ script_08011E1A: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x3104 _0807EA94 _0807E3E8 JumpIf script_08011E66 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011E1A script_08011E58: CheckEntityInteractType JumpIfNot script_08011E58 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08011E66: TextboxNoOverlap 0x3107 _0807EA94 SetGlobalFlag 0x002d _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011E58 .short 0x0000 BeginBlock Call sub_08064828 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_08011E96: EndBlock @@ -194,7 +194,7 @@ script_08011E96: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC TextboxNoOverlap 0x4524 @@ -208,27 +208,27 @@ script_08011ECC: script_08011ED8: _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011E96 script_08011EE6: CheckEntityInteractType JumpIfNot script_08011EE6 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08011EF4: TextboxNoOverlap 0x3114 _0807EA94 SetGlobalFlag 0x002e _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011EE6 BeginBlock Call sub_08064928 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_08011F22: EndBlock @@ -242,7 +242,7 @@ script_08011F22: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 TextboxNoOverlap 0x4522 @@ -256,27 +256,27 @@ script_08011F58: script_08011F64: _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011F22 script_08011F72: CheckEntityInteractType JumpIfNot script_08011F72 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_08011F80: TextboxNoOverlap 0x3112 _0807EA94 SetGlobalFlag 0x002f _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011F72 BeginBlock Call sub_08064A28 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_08011FAE: EndBlock @@ -290,7 +290,7 @@ script_08011FAE: EndBlock _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 TextboxNoOverlap 0x4523 @@ -304,34 +304,34 @@ script_08011FE4: script_08011FF0: _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011FAE script_08011FFE: CheckEntityInteractType JumpIfNot script_08011FFE _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 script_0801200C: TextboxNoOverlap 0x3113 _0807EA94 SetGlobalFlag 0x0030 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08011FFE BeginBlock Call sub_08064828 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_0801203A: CheckEntityInteractType JumpIfNot script_0801203A _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E TextboxNoOverlap 0x3122 @@ -363,21 +363,21 @@ script_0801209E: _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_0801203A .short 0x0000 BeginBlock Call sub_08064928 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_080120C6: CheckEntityInteractType JumpIfNot script_080120C6 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA TextboxNoOverlap 0x3116 @@ -409,21 +409,21 @@ script_0801212A: _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_080120C6 .short 0x0000 BeginBlock Call sub_08064A28 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_08012152: CheckEntityInteractType JumpIfNot script_08012152 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 TextboxNoOverlap 0x311c @@ -455,68 +455,68 @@ script_080121B6: _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08012152 .short 0x0000 BeginBlock Call sub_08064828 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_080121DE: CheckEntityInteractType JumpIfNot script_080121DE _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4527 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_080121DE BeginBlock Call sub_08064928 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_08012216: CheckEntityInteractType JumpIfNot script_08012216 _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4525 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_08012216 BeginBlock Call sub_08064A28 _0807EB44 0x0004 - _0807EF80 0x0001 - _0807EF80 0x000a + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a EndBlock script_0801224E: CheckEntityInteractType JumpIfNot script_0801224E _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x4526 _0807EA94 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Jump script_0801224E BeginBlock _0807EB44 0x0004 Call sub_08061FD8 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08012284: EndBlock @@ -560,16 +560,16 @@ script_080122EC: _0807EB74 _0807E864 Call sub_08061FD8 - _0807EF80 0x000b + DoPostScriptAction 0x000b Call sub_08061FB0 Call sub_08061F94 LoadRoomEntityList gUnk_080F2758 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x003c SoundReq 0x0072 SetLocalFlag 0x0043 Wait 0x001e _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 4ae5828a..d6a27b80 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0801232C BeginBlock _0807EB74 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08012338: CheckEntityInteractType @@ -20,7 +20,7 @@ script_0801235A: _0807E878 Jump script_08012338 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_08012368: CheckLocalFlag 0x0004 @@ -39,8 +39,8 @@ script_08012368: _0807EB28 0x1401 _0807EA94 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x0007 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0007 SoundReq 0x01ce SetEntity0x20 0xffff8000 Wait 0x003c @@ -66,6 +66,6 @@ script_08012368: Call sub_0807F420 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index 867eacda..7eb8b910 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08012410 BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index eb4dfa12..7032e0df 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012430 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 EndBlock @@ -155,5 +155,5 @@ script_08012566: CallWithArg sub_0807F6F8, 0x00000008 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 775b6340..ae7f743b 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080126FC BeginBlock SetEntityNonPlanarMovement 0x0040 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 EndBlock _0807E930 0x0020 WaitForSomething2 0x00000004 @@ -19,11 +19,11 @@ SCRIPT_START script_080126FC _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x0011 + DoPostScriptAction 0x0011 _0807E930 0x001c TextboxNoOverlapFollowPos 0x1105, 0x000c _0807EA94 @@ -50,7 +50,7 @@ SCRIPT_START script_080126FC TextboxNoOverlapFollowPos 0x1109, 0x000c _0807EA94 _0807E930 0x0020 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E9D4 _0807E5F8 0x00000008 script_080127F2: @@ -77,7 +77,7 @@ script_08012824: EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807E5F8 0x00000008 WaitForSomething2 0x00000004 Call sub_0806D944 @@ -93,7 +93,7 @@ script_08012824: _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110c, 0x000c @@ -114,7 +114,7 @@ script_08012824: SetEntityNonPlanarMovement 0x0080 Call sub_0806D908 _0807EC1C 0x0010 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E9D4 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 @@ -215,7 +215,7 @@ script_08012A3E: Call sub_0807F9A4 Call sub_0807DF28 SoundReq0x80100000 - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807EB8C Call sub_0806D944 _0807E930 0x0010 @@ -230,7 +230,7 @@ script_08012A74: _0807EA94 StartPlayerScript script_08012B18 Call sub_0806D9A4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 SoundReq2 0x000e BeginBlock @@ -239,5 +239,5 @@ script_08012A74: EndBlock _0807EA94 _0807E5F8 0x00000008 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index cefbed66..a4e1e4c6 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -3,8 +3,8 @@ SCRIPT_START script_08012AC8 SetEntityNonPlanarMovement 0x0080 EndBlock _0807EB44 0x0000 - _0807EF80 0x0000 - _0807EF80 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index eb7e88ac..5218b68d 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012AF0 BeginBlock SetEntityNonPlanarMovement 0x0100 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B18.inc b/data/scripts/script_08012B18.inc index 4b79a8fe..c317235e 100644 --- a/data/scripts/script_08012B18.inc +++ b/data/scripts/script_08012B18.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08012B18 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index 66f6d97c..a5adfb9a 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08012B24 SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index 1cc013d5..8e0045ae 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08012B50 SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0000 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index a7ce8981..a013bbf7 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08012B7C SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0002 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc index 3aed7170..071ced29 100644 --- a/data/scripts/script_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012BA8 BeginBlock _0807EB44 0x0002 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0001 EndBlock WaitForSomething2 0x00000040 @@ -16,5 +16,5 @@ SCRIPT_START script_08012BA8 _0807E930 0x0001 WaitForSomething2 0x00000040 Wait 0x0001 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc index 775c193c..97cea951 100644 --- a/data/scripts/script_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012BF8 BeginBlock _0807EB44 0x0006 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0003 EndBlock WaitForSomething2 0x00000010 @@ -16,5 +16,5 @@ SCRIPT_START script_08012BF8 _0807E930 0x0003 WaitForSomething2 0x00000010 Wait 0x0001 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index de175629..bfeb243d 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08012C48 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SetEntityNonPlanarMovement 0x0280 EndBlock _0807EDD4 0x0388, 0x0168 _0807E5F8 0x00000100 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index f11a59ef..30fa7e4c 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012C68 BeginBlock _0807E9D4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 SetIntVariable 0x00000000 Call sub_0806DA04 EndBlock @@ -34,5 +34,5 @@ script_08012CA0: Call sub_0807DF50 _0807E878 script_08012CD2: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index 754bf33d..420aa1ee 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -16,5 +16,5 @@ script_08012CD8: SetLocalFlag 0x003e Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index e0d086e1..092f737d 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -20,6 +20,6 @@ script_08012D18: _0807E878 Jump script_08012D18 script_08012D68: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index 5aaf0d08..dff75ef9 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -12,6 +12,6 @@ script_08012D70: SetLocalFlag 0x0014 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index d4247f15..d0888079 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08012DB0 EndBlock _0807EDD4 0x0088, 0x0068 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x001e _0807E5F8 0x00000001 Call sub_080791BC diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 9a36403b..4fc67096 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08012DF8 EndBlock _0807EDD4 0x00b8, 0x0094 Wait 0x0008 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0008 _0807E5F8 0x00000001 SCRIPT_END diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index f1168887..74f77908 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012E88 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a Call sub_0806B60C EndBlock script_08012E9E: @@ -10,17 +10,17 @@ script_08012E9E: JumpIfNot script_08012E9E _0807E864 _0807EB74 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0806B4F0 _0807EA94 _0807E878 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_08012E9E .short 0x0000 BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_0806B60C EndBlock script_08012EDC: diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index f97acf88..038b7bad 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -46,12 +46,12 @@ script_08013006: Call sub_0806AB9C _0807E930 0x000b Wait 0x003c - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x4404 _0807EA94 Wait 0x001e - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x440e _0807EA94 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index fed8e431..7c273007 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -5,9 +5,9 @@ SCRIPT_START script_080130E4 EndBlock _0807EDD4 0x00a8, 0x0060 Wait 0x0008 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0008 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x000f _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index 962663af..8173e078 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013114 BeginBlock _0807E9D4 - _0807EF80 0x000a - _0807EF80 0x0012 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0012 Call sub_0807F348 EndBlock script_08013128: @@ -34,6 +34,6 @@ script_08013176: BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A - _0807EF80 0x0006 + DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index b3e2a28c..361e94cd 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -74,6 +74,6 @@ script_080131AC: SetGlobalFlag 0x005d Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index d76346d9..752b9606 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -2,10 +2,10 @@ SCRIPT_START script_080132E4 BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index e9c28cf6..298ffe37 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -2,9 +2,9 @@ SCRIPT_START script_0801330C BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC64 0x0020 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index c525ece7..e8edd9b8 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0801334C BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x000d + DoPostScriptAction 0x000d EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807ECC4 0x0020 - _0807EF80 0x0000 - _0807EF80 0x000c + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000c _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc index 2d46d61c..8c8dbfbf 100644 --- a/data/scripts/script_08013378.inc +++ b/data/scripts/script_08013378.inc @@ -9,7 +9,7 @@ SCRIPT_START script_08013378 _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index b1c6656a..6ce49d56 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080133C4 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b Call sub_0807F338 EndBlock WaitForSomething2 0x00000008 Call sub_08061F94 Wait 0x000a _0807E5F8 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index 2eafd8d1..285ce1a5 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,34 +1,34 @@ SCRIPT_START script_080133F8 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0008 - _0807EF80 0x000b + DoPostScriptAction 0x0008 + DoPostScriptAction 0x000b Call sub_0807F338 EndBlock WaitForSomething2 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 Wait 0x00e9 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E5F8 0x00000040 WaitForSomething2 0x00000020 Wait 0x003c - _0807EF80 0x0014 + DoPostScriptAction 0x0014 SoundReq 0x0120 CallWithArg sub_08095420, script_08013494 Wait 0x005a - _0807EF80 0x0016 + DoPostScriptAction 0x0016 WaitForSomething2 0x00000080 _0807E5F8 0x00000040 WaitForSomething2 0x00000020 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000040 WaitForSomething2 0x00000020 Call sub_08066CA4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 _0807E5F8 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index 043ebc9a..12714774 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -14,5 +14,5 @@ SCRIPT_START script_08013494 Call sub_0807F36C _0807E5F8 0x00000080 EndBlock - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 293a7179..702550f2 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080134DC BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock BeginBlock Call sub_0807F92C diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc index 9661f4f6..0b142523 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -19,5 +19,5 @@ SCRIPT_START script_08013650 Call sub_08053250 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index b4063e78..4e10b00a 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_080136B4 EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index 9287f00b..662b5c12 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -11,7 +11,7 @@ script_080136FA: script_08013704: _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index 05a00285..11cd6075 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013720 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock BeginBlock Call sub_0807F92C @@ -76,6 +76,6 @@ script_0801373C: Call sub_08053250 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index 9b260191..66b8d0d0 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080138B4 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock BeginBlock Call sub_0807F92C diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc index 7ff4f62e..484789c1 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -24,5 +24,5 @@ SCRIPT_START script_08013AA6 Call sub_08053250 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index 528cee4f..43d1d8a9 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013B18 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 script_08013B1E: EndBlock BeginBlock diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index 032e80cf..67891a1b 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08013BE8 CheckInventory1 0x0041 JumpIfNot script_08013C98 EndBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 WaitForSomething2 0x00000004 _0807E908 0x0002 SoundReq 0x0134 @@ -21,9 +21,9 @@ script_08013C2A: JumpIf script_08013C98 script_08013C32: BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F934 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_080962F8, 0x00000000 CallWithArg sub_0807F8E8, 0x00000004 EndBlock @@ -52,7 +52,7 @@ script_08013C92: EndBlock _0807E908 0x0004 script_08013C98: - _0807EF80 0x0008 - _0807EF80 0x0006 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc index 5f0219a6..923f7045 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -21,5 +21,5 @@ script_08013CA6: SetLocalFlag 0x0079 Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 2d14d794..90cfccf5 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08013D04 BeginBlock Call sub_0807F92C - _0807EF80 0x0008 + DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock script_08013D1C: @@ -11,6 +11,6 @@ script_08013D1C: SoundReq 0x01cd _0807E5F8 0x08000000 Call sub_080791BC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index e4ad6652..bb4117f3 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08013D44 BeginBlock Call sub_0807F92C - _0807EF80 0x0008 + DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock script_08013D5C: @@ -11,6 +11,6 @@ script_08013D5C: SoundReq 0x01cd _0807E5F8 0x10000000 Call sub_080791BC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index e4b43a10..4b637104 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08013D84 BeginBlock Call sub_0807F92C - _0807EF80 0x0008 + DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock script_08013D9C: @@ -11,6 +11,6 @@ script_08013D9C: SoundReq 0x01cd _0807E5F8 0x20000000 Call sub_080791BC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index 42e07201..edb69499 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08013DC4 BeginBlock Call sub_0807F92C - _0807EF80 0x0008 + DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock script_08013DDC: @@ -11,6 +11,6 @@ script_08013DDC: SoundReq 0x01cd _0807E5F8 0x40000000 Call sub_080791BC - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index d401ba90..71123815 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013E04 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index b0477348..424bed26 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013E28 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0002 EndBlock SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 242f4f06..e41a8b42 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013E4C BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0004 EndBlock SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index 4fd09419..8207c91f 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013E70 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0006 EndBlock SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index e6bb7c0b..4775f6f3 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013E94 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x00f8 _0807E930 0x0001 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index e0da07f3..094b17ce 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013EB0 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x00f8 _0807E930 0x0003 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index 23f48e40..b3ce8ba1 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013ECC BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x0168 _0807E930 0x0005 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index ead09cb8..e0b367c4 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013EE8 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x0168 _0807E930 0x0007 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 757805a3..750253da 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013F04 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0008 EndBlock WaitForSomething2 0x00000080 @@ -8,6 +8,6 @@ SCRIPT_START script_08013F04 Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index c9d52cc3..568b3d9e 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013F34 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0009 EndBlock WaitForSomething2 0x00000080 @@ -8,6 +8,6 @@ SCRIPT_START script_08013F34 Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index ab8809de..df02227b 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013F64 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x000a EndBlock WaitForSomething2 0x00000080 @@ -8,6 +8,6 @@ SCRIPT_START script_08013F64 Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index c3d2e778..9f773d46 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013F94 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock CheckLocalFlag 0x007d JumpIf script_08013FE0 @@ -22,6 +22,6 @@ script_08013FA4: Call sub_0807DF50 _0807E878 script_08013FE0: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index ec00e1a9..29ae298f 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08013FE8 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_08013FF0: EndBlock @@ -27,6 +27,6 @@ script_08013FF0: _0807E878 Jump script_08013FF0 script_0801404C: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index c7edd934..c19c455e 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014054 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0000 Call sub_0807F738 EndBlock WaitForSomething 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index 82ec7f2e..e8fe16a3 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014074 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0001 Call sub_0807F738 EndBlock WaitForSomething 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index 8ad5b706..6160fb05 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014094 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0002 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index e557ffcc..8fb4d8e0 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080140B8 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0003 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething 0x00000040 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc index 86b594cb..2cce09f5 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080140DC BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0004 EndBlock WaitForSomething2 0x00000200 @@ -11,5 +11,5 @@ SCRIPT_START script_080140DC WaitForSomething 0x00000020 _0807E930 0x0010 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc index 58d8ec5f..350984a1 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014118 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0005 EndBlock WaitForSomething2 0x00000400 @@ -11,5 +11,5 @@ SCRIPT_START script_08014118 WaitForSomething 0x00000020 _0807E930 0x0011 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index 3a36b36e..834b28ca 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014154 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0006 SetEntityPosition 0x0000, 0xfff0 EndBlock @@ -12,6 +12,6 @@ SCRIPT_START script_08014154 WaitForSomething 0x00000020 _0807E930 0x0012 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index d8f28858..8934d70d 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014198 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0007 SetEntityPosition 0x0000, 0xfff0 EndBlock @@ -12,6 +12,6 @@ SCRIPT_START script_08014198 WaitForSomething 0x00000020 _0807E930 0x0013 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index 1b744211..fab8a67a 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080141DC BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0014 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc @@ -8,6 +8,6 @@ SCRIPT_START script_080141DC WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc index b3f78c2e..73c8e186 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014210 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807E930 0x0015 Call sub_0807F714 Call sub_0807F714 @@ -9,5 +9,5 @@ SCRIPT_START script_08014210 WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 2d48d1f8..bbafbef3 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -10,7 +10,7 @@ script_08014264: Jump script_08014264 .short 0x0000 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 EndBlock script_0801427C: CheckLocalFlag 0x0078 diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index e70bff48..f1a44fb0 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08014450 _0807E9D4 _0807EB44 0x0000 SetEntityNonPlanarMovement 0x01c0 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08014462: _0807E30C @@ -17,9 +17,9 @@ script_08014462: _0807EA94 _0807E3E8 JumpIfNot script_080144F0 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Wait 0x008c - _0807EF80 0x0000 + DoPostScriptAction 0x0000 HasRupees 0x000a JumpIf script_080144A2 TextboxNoOverlapFollow 0x4204 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index ecbad4ab..06a34665 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0801450C _0807E9D4 _0807EB44 0x0000 SetEntityNonPlanarMovement 0x01c0 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index 212980d9..0d0ed719 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08014588 WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0078, 0x0078 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0010 _0807E5F8 0x00000002 Call sub_0807921C diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 122ff8c1..01413c54 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080145E8 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_080145F8: CheckRoomFlag 0x0000 @@ -21,7 +21,7 @@ script_08014608: _0807E9D4 _0807EB44 0x0004 SetEntityDirection 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0801463A: _0807E30C diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index 68f82c4c..da36490e 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -3,7 +3,7 @@ SCRIPT_START script_080147DC WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0078, 0x0068 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Wait 0x0010 _0807E5F8 0x00000001 Call sub_0807921C diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index c6fbfaa7..d69ee530 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08014804 BeginBlock _0807E9D4 _0807EB44 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock _0807E864 Call sub_0807DF38 diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index 1360301f..8dffa2f0 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014958 BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIf script_08014976 _0807EB44 0x0004 @@ -20,7 +20,7 @@ script_08014978: Jump script_08014978 BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIfNot script_080149C6 EndBlock @@ -35,5 +35,5 @@ script_080149AA: _0807E878 Jump script_080149AA script_080149C6: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index cbe83bdc..44cd6af7 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080149CC BeginBlock SetEntityNonPlanarMovement 0x0080 Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_080149DE: _0807E30C @@ -16,20 +16,20 @@ script_080149DE: CheckLocalFlag 0x00b1 JumpIf script_08014A20 SetLocalFlag 0x00b1 - _0807EF80 0x000b - _0807EF80 0x0001 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 SoundReq 0x0072 _0807EB74 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a script_08014A20: _0807E878 Jump script_080149DE .short 0x0000 BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08014A36: _0807E30C @@ -44,7 +44,7 @@ script_08014A36: .short 0x0000 BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08014A62: _0807E30C diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 4f88f247..673f7fcc 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014A80 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock WaitForSomething2 0x00000001 _0807EB74 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 TextboxNoOverlap 0x2f0a @@ -22,7 +22,7 @@ script_08014AAC: .short 0x0000 BeginBlock Call sub_0806C870 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08014AD2: _0807E30C diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index d961acfe..c06b6709 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08014B10 EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index f19cefb0..cd5191b5 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014B34 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 EndBlock CheckLocalFlag 0x0063 @@ -25,7 +25,7 @@ script_08014B70: _0807E864 Call sub_0807DF28 _0807E5F8 0x00000001 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 WaitForSomething2 0x00000002 _0807E930 0x0010 Call sub_0806CCF8 @@ -71,7 +71,7 @@ script_08014C22: Jump script_08014BF2 BeginBlock Call sub_0806CD58 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0006 EndBlock @@ -107,8 +107,8 @@ script_08014C82: CheckGlobalFlag 0x0024 JumpIf script_08014CD4 Call sub_0806C870 - _0807EF80 0x000a - _0807EF80 0x0000 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0000 EndBlock script_08014CAE: EndBlock @@ -125,6 +125,6 @@ script_08014CAE: _0807E878 Jump script_08014CAE script_08014CD4: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index 8ea91ea5..d0bbc238 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08014CDC BeginBlock SetEntityNonPlanarMovement 0x0180 - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08066D04 Call sub_08066D14 SetEntityPositionRelative 0x01e8, 0x0180 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 @@ -40,7 +40,7 @@ script_08014D60: _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 _0807E878 @@ -56,5 +56,5 @@ script_08014D96: SetLocalFlag 0x006d Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index be6b4d4a..d71a64c0 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -15,6 +15,6 @@ SCRIPT_START script_08014DCC CameraTargetPlayer Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 0785f772..3f660b57 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08014E14 BeginBlock _0807EB44 0x0004 _0807E9D4 - _0807EF80 0x000a + DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08014E2C: @@ -17,10 +17,10 @@ script_08014E2C: Jump script_08014E2C .short 0x0000 BeginBlock - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08014E64: CheckEntityInteractType @@ -52,10 +52,10 @@ script_08014EBC: Jump script_08014E64 .short 0x0000 BeginBlock - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_08014EE0: CheckEntityInteractType @@ -68,8 +68,8 @@ script_08014EE0: Jump script_08014EE0 .short 0x0000 BeginBlock - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000a EndBlock @@ -78,7 +78,7 @@ script_08014F0C: JumpIfNot script_08014F0C _0807E864 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlap 0x200e _0807EA94 _0807E878 @@ -87,8 +87,8 @@ script_08014F0C: Jump script_08014F0C .short 0x0000 BeginBlock - _0807EF80 0x000a - _0807EF80 0x0007 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000e EndBlock @@ -99,7 +99,7 @@ script_08014F4A: _0807E864 Call sub_0807DF28 _0807EB74 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 BeginBlock TextboxNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 @@ -271,5 +271,5 @@ script_08015104: SoundReq2 0xffff Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index 22b00245..ab814f8e 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,30 +1,30 @@ SCRIPT_START script_08015234 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Call sub_0807F354 EndBlock WaitForSomething2 0x00000002 Call sub_08066C94 Wait 0x00e9 - _0807EF80 0x0007 - _0807EF80 0x001e + DoPostScriptAction 0x0007 + DoPostScriptAction 0x001e _0807E5F8 0x00000004 WaitForSomething2 0x00000002 Wait 0x0014 _0807EB44 0x0000 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SoundReq 0x00f5 - _0807EF80 0x001f + DoPostScriptAction 0x001f SetEntityNonPlanarMovement 0x0200 - _0807EF80 0x000d - _0807EF80 0x0000 + DoPostScriptAction 0x000d + DoPostScriptAction 0x0000 _0807ECC4 0x0030 _0807E5F8 0x00000004 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index 5d81c0e8..6d1d581b 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -2,10 +2,10 @@ SCRIPT_START script_080152B4 BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index 963e9473..773a9c35 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -2,10 +2,10 @@ SCRIPT_START script_080152DC BeginBlock SetEntityNonPlanarMovement 0x0200 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index 7675dc35..722f838a 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08015338 BeginBlock SetEntityNonPlanarMovement 0x0100 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index 0d162f83..5e999a0e 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015360 SetEntityPositionRelative 0x0208, 0x0148 EndBlock _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015384.inc b/data/scripts/script_08015384.inc index 01e78330..a46df80e 100644 --- a/data/scripts/script_08015384.inc +++ b/data/scripts/script_08015384.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08015384 - _0807EF80 0x0015 + DoPostScriptAction 0x0015 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 1832e1b9..054a574f 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015390 BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 EndBlock _0807E930 0x001f Call sub_0806D944 @@ -17,8 +17,8 @@ script_080153C2: _0807E930 0x001f StartPlayerScript script_08015384 Call sub_0806D9A4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 _0807E5F8 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index b43f09ea..5b27435f 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -22,5 +22,5 @@ SCRIPT_START script_0801548E DoFade5 WaitFor_2 SetRoomFlag 0x0001 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 678b91a9..9ec275ae 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801550C BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0000 Call sub_0807F338 EndBlock @@ -13,7 +13,7 @@ SCRIPT_START script_0801550C CallWithArg sub_0806AF60, 0x00000000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - _0807EF80 0x000d + DoPostScriptAction 0x000d _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 @@ -21,7 +21,7 @@ SCRIPT_START script_0801550C WaitForSomething2 0x00008000 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x0028 SoundReq 0x0125 CallWithArg sub_0807FB28, 0x00000003 @@ -29,17 +29,17 @@ SCRIPT_START script_0801550C SoundReq 0x0125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807E930 0x000d Call sub_0807F2D4 _0807E5F8 0x00010000 Wait 0x003c - _0807EF80 0x0005 + DoPostScriptAction 0x0005 Wait 0x003c script_080155E6: CheckRoomFlag 0x0001 JumpIfNot script_080155E6 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080155F4.inc b/data/scripts/script_080155F4.inc index 62f56e9f..0538498b 100644 --- a/data/scripts/script_080155F4.inc +++ b/data/scripts/script_080155F4.inc @@ -6,6 +6,6 @@ SCRIPT_START script_080155F4 script_08015608: CheckRoomFlag 0x0001 JumpIfNot script_08015608 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index 49d79afe..ae9fb4d9 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015618 BeginBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 SetEntityNonPlanarMovement 0x0040 Call sub_08094B80 EndBlock @@ -17,6 +17,6 @@ SCRIPT_START script_08015618 WaitForSomething2 0x00000080 _0807E930 0x0001 Call sub_0807F2D4 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index 6c040c2e..8c4ca549 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,46 +1,46 @@ SCRIPT_START script_08015684 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000b + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000b _0807EB44 0x0000 - _0807EF80 0x0017 + DoPostScriptAction 0x0017 Call sub_0807F180 EndBlock WaitForSomething2 0x00000800 _0807EB44 0x0002 - _0807EF80 0x0017 + DoPostScriptAction 0x0017 Wait 0x000a _0807EB44 0x0004 - _0807EF80 0x0017 + DoPostScriptAction 0x0017 _0807EB44 0x0004 - _0807EF80 0x001b + DoPostScriptAction 0x001b _0807E5F8 0x00001000 WaitForSomething2 0x00000800 Wait 0x0078 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x0014 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 - _0807EF80 0x0018 + DoPostScriptAction 0x0018 Call sub_0807F2D4 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 _0807EB44 0x0004 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 CallWithArg sub_0809545C, script_08015754 SoundReq 0x01c4 Wait 0x0078 - _0807EF80 0x0016 + DoPostScriptAction 0x0016 WaitForSomething2 0x00020000 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 Call sub_08066CA4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x0078 _0807E5F8 0x00001000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index 38b4c33d..f63f2e84 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -16,5 +16,5 @@ SCRIPT_START script_08015754 _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00080000 WaitForSomething2 0x00040000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 8029861e..982c9bdf 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -70,5 +70,5 @@ script_08015888: _0807E878 _0807F0B4 0x0004 CameraTargetPlayer - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080158F8.inc b/data/scripts/script_080158F8.inc index a339eeb9..cd1e1208 100644 --- a/data/scripts/script_080158F8.inc +++ b/data/scripts/script_080158F8.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080158F8 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015918.inc b/data/scripts/script_08015918.inc index c39a541d..355718a5 100644 --- a/data/scripts/script_08015918.inc +++ b/data/scripts/script_08015918.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08015918 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015938.inc b/data/scripts/script_08015938.inc index 4a24da0e..17f2e6a2 100644 --- a/data/scripts/script_08015938.inc +++ b/data/scripts/script_08015938.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08015938 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 1ef2dc75..9932c7a1 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015958 BeginBlock SetEntityNonPlanarMovement 0x0180 - _0807EF80 0x0008 - _0807EF80 0x000b + DoPostScriptAction 0x0008 + DoPostScriptAction 0x000b Call sub_08066D04 EndBlock WaitForSomething2 0x00000001 @@ -10,21 +10,21 @@ SCRIPT_START script_08015958 Call sub_08066D14 MoveEntityToPlayer EndBlock - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 TextboxNoOverlapFollowPos 0x1011, 0x0002 _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 Call sub_0807F3C8 @@ -34,18 +34,18 @@ SCRIPT_START script_08015958 _0807E930 0x0040 Call sub_0807F2D4 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 _0807EB44 0x0006 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0238, 0x0238 _0807EB44 0x0000 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a _0807E9D4 _0807E5F8 0x00000002 script_08015A32: @@ -62,12 +62,12 @@ script_08015A32: Jump script_08015A32 script_08015A54: EndBlock - _0807EF80 0x000b + DoPostScriptAction 0x000b _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 WaitForSomething2 0x00000001 Call sub_08066D4C _0807E5F8 0x00000002 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc index d63cabcf..82ec4092 100644 --- a/data/scripts/script_08015A7C.inc +++ b/data/scripts/script_08015A7C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015A7C SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc index 33a12392..d1e1aa77 100644 --- a/data/scripts/script_08015AA0.inc +++ b/data/scripts/script_08015AA0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015AA0 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC94 0x0010 _0807EB44 0x0002 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index 63c27059..05f17a9e 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015AC4 BeginBlock - _0807EF80 0x0007 - _0807EF80 0x000a + DoPostScriptAction 0x0007 + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000008 _0807E908 0x0007 @@ -11,11 +11,11 @@ SCRIPT_START script_08015AC4 _0807E908 0x0006 SetRoomFlag 0x0000 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 WaitForSomething2 0x00000008 Wait 0x003c SoundReq 0x0072 Call sub_08046078 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index 8b0d85ba..b2c61214 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -5,6 +5,6 @@ SCRIPT_START script_08015B14 EndBlock _0807EDD4 0x0248, 0x0218 _0807E5F8 0x00000020 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 4740736d..1da50cf7 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -18,5 +18,5 @@ script_08015B34: _0807E878 Jump script_08015B34 script_08015B7E: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc index b33385e4..a316c70a 100644 --- a/data/scripts/script_08015B84.inc +++ b/data/scripts/script_08015B84.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015B84 SetEntityNonPlanarMovement 0x0100 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index 2169ce97..f5c9fcc5 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -17,5 +17,5 @@ SCRIPT_START script_08015BA8 _0807EEB4 CameraTargetPlayer _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index 9367894c..9bed7be6 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -35,6 +35,6 @@ script_08015BF0: Call sub_0807FBCC Call sub_0807DF50 _0807E878 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index c992078f..ac412e51 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08015C7C BeginBlock SetEntityNonPlanarMovement 0x0080 EndBlock - _0807EF80 0x0001 + DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 TextboxNoOverlapFollowPos 0x1318, 0x000c @@ -13,7 +13,7 @@ SCRIPT_START script_08015C7C CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000100 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index 2e0a49ca..118b74bc 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -63,5 +63,5 @@ SCRIPT_START script_08015CD4 WaitFor_2 SoundReq0x80100000 SetRoomFlag 0x0000 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index e6525c72..660f818c 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015DF0 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000004 - _0807EF80 0x0004 + DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x1319 _0807EA94 @@ -22,5 +22,5 @@ SCRIPT_START script_08015DF0 _0807EA94 _0807E5F8 0x00000008 WaitForSomething 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index 207f81d0..1f4a3001 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,40 +1,40 @@ SCRIPT_START script_08015E58 BeginBlock - _0807EF80 0x0008 + DoPostScriptAction 0x0008 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x001d + DoPostScriptAction 0x0000 + DoPostScriptAction 0x001d EndBlock WaitForSomething2 0x00000010 Call sub_08066C94 Wait 0x00e9 - _0807EF80 0x0007 - _0807EF80 0x001e + DoPostScriptAction 0x0007 + DoPostScriptAction 0x001e Wait 0x0014 _0807EB44 0x0000 - _0807EF80 0x001c + DoPostScriptAction 0x001c Call sub_0807F2D4 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 Call sub_08066CA4 - _0807EF80 0x0008 + DoPostScriptAction 0x0008 Wait 0x00bc _0807E5F8 0x00000020 WaitForSomething2 0x00000010 SetEntityPositionRelative 0x0088, 0x0068 Call sub_08066C94 Wait 0x00e8 - _0807EF80 0x0007 - _0807EF80 0x001e + DoPostScriptAction 0x0007 + DoPostScriptAction 0x001e Wait 0x0014 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0014 + DoPostScriptAction 0x0014 Wait 0x001e TextboxNoOverlap 0x131b _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 7dd91177..29fc1626 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08015F08 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 TextboxNoOverlap 0x131c _0807EA94 _0807E5F8 0x00000002 WaitForSomething 0x00000200 - _0807EF80 0x0005 + DoPostScriptAction 0x0005 WaitForSomething 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index b5dcb92d..1845bd29 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -11,8 +11,8 @@ SCRIPT_START script_08015F3C Wait 0x003c _0807E5F8 0x00000080 WaitForSomething 0x00000200 - _0807EF80 0x0005 + DoPostScriptAction 0x0005 WaitForSomething 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index 786f82f2..4b208e24 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015F80 BeginBlock _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock WaitForSomething 0x00000200 - _0807EF80 0x0005 + DoPostScriptAction 0x0005 WaitForSomething 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index a51c761c..2c4817d2 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015FA4 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a Call sub_08066E38 EndBlock WaitForSomething 0x00000400 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc index 7a2076ee..0182664e 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08015FC0 JumpIf script_08016028 _0807EA88 0x0009 CallWithArg sub_0806DA04, 0x00000007 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_08015FE4: _0807EA4C diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index dc04c09c..86740a2a 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -8,6 +8,6 @@ SCRIPT_START script_08016004 Call sub_0807DF50 _0807E878 script_08016028: - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index 9c15297f..fd4ca990 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -4,11 +4,11 @@ SCRIPT_START script_08016030 JumpIf script_08016062 EndBlock WaitForSomething2 0x00000001 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x003c SetEntityNonPlanarMovement 0x0020 _0807ECF4 0x0080 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00000008 SCRIPT_END diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index c265fce4..1966d5cf 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -4,11 +4,11 @@ SCRIPT_START script_0801606C JumpIf script_0801609E EndBlock WaitForSomething2 0x00000002 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x003c SetEntityNonPlanarMovement 0x0020 _0807EC94 0x0080 Wait 0x001e - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 0bff4916..9bf8bbdc 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -107,9 +107,9 @@ script_080161E2: Jump script_0801619A BeginBlock Call sub_0807F348 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 EndBlock script_080161FE: Call sub_08068C28 @@ -140,7 +140,7 @@ script_08016204: script_08016262: Call sub_08068E00 _0807EA94 - _0807EF80 0x0001 + DoPostScriptAction 0x0001 Call sub_0807F2D4 Call sub_08068E90 Call sub_08068C8C @@ -202,6 +202,6 @@ script_08016346: Call sub_0807DF50 _0807E878 _0807EB44 0x0004 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 Jump script_080161FE .short 0x0000 diff --git a/data/scripts/script_0801635C.inc b/data/scripts/script_0801635C.inc index 2f32c7fe..12ddcd91 100644 --- a/data/scripts/script_0801635C.inc +++ b/data/scripts/script_0801635C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0801635C SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 01cb19f0..63c6e52b 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08016482 _0807E79C - ScriptCommandNop2 0x0080 + Nop2 0x0080 DoFade4 DoFade5 DoFade6 @@ -46,7 +46,7 @@ SCRIPT_START script_08016482 SetEntity0x20 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 MoveEntityToPlayer - ScriptCommandNop3 + Nop3 _0807EC1C 0x0010 _0807EC64 0x0020 _0807EC94 0x0030 @@ -58,15 +58,15 @@ SCRIPT_START script_08016482 _0807EE30 _0807EEB4 _0807EEF4 0xfff0, 0x0014 - _0807EF80 0x0000 - _0807EF90 0x0001 + DoPostScriptAction 0x0000 + DoPostScriptAction2 0x0001 SoundReq 0x0074 SoundReq2 0x001d SoundReq3 0x00000074 SoundReq0x80100000 ModRupees 0xff38 ModHealth 0x0010 - IncreaseMaxHealth 0x0008 + IncreaseMaxHealth _0807F050 0x0001 _0807F034 0x0001 GetInventoryValue 0x0001 diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index 287147df..4cd700ef 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080165A4 BeginBlock - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E9D4 EndBlock @@ -12,7 +12,7 @@ script_080165BC: Wait 0x001e CheckPlayerInRegion2 0x2020 JumpIfNot script_080165BC - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Call script_0801637C+1 Jump script_080165BC .short 0x0000 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index b217604e..92c33414 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080165D8 Wait 0x001e CheckPlayerInRegion2 0x2020 JumpAbsoluteIfNot script_080165D8 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Call script_0801637C+1 JumpAbsolute script_080165D8 .short 0x0000 @@ -83,11 +83,11 @@ script_08016700: _0807EC94 0x0030 _0807E5F8 0x00000002 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 WaitForSomething 0x00000001 _0807E610 0x00000001 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -100,11 +100,11 @@ script_08016700: _0807E610 0x00000001 _0807ECF4 0x0030 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e _0807E5F8 0x00000006 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -122,11 +122,11 @@ script_0801679C: _0807EC94 0x0030 _0807E5F8 0x00000004 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 WaitForSomething 0x00000002 _0807E610 0x00000002 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -140,11 +140,11 @@ script_0801679C: _0807ECF4 0x0030 _0807E5F8 0x00000001 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 WaitForSomething 0x00000002 _0807E610 0x00000002 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -160,11 +160,11 @@ script_08016848: _0807E610 0x00000004 _0807EC94 0x0030 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e _0807E5F8 0x00000003 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -177,11 +177,11 @@ script_08016848: _0807ECF4 0x0030 _0807E5F8 0x00000002 Wait 0x000f - _0807EF80 0x0000 + DoPostScriptAction 0x0000 _0807EB44 0x0004 WaitForSomething 0x00000004 _0807E610 0x00000004 - _0807EF80 0x0003 + DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 Wait 0x0002 @@ -203,8 +203,8 @@ script_080168E6: BeginBlock Call sub_08064EA4 _0807EB44 0x0004 - _0807EF80 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a EndBlock script_0801690A: _0807E30C @@ -223,7 +223,7 @@ script_08016926: BeginBlock _0807E9D4 _0807EB44 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a EndBlock script_0801693E: _0807E944 @@ -238,7 +238,7 @@ script_0801693E: BeginBlock _0807E9D4 _0807EB44 0x0000 - _0807EF80 0x000a + DoPostScriptAction 0x000a _0807E930 0x0000 EndBlock script_0801696A: diff --git a/include/functions.h b/include/functions.h index ecf438fb..097c9a73 100644 --- a/include/functions.h +++ b/include/functions.h @@ -83,12 +83,9 @@ extern u32 sub_080045D4(s16, s16, u32, u32); extern void sub_0806F69C(Entity*); extern void sub_0805E3A0(void*, u32); extern void sub_0806D0B0(Entity*); -extern void sub_0807DD64(Entity*); -extern void sub_0807DDE4(Entity*); extern void sub_0806D02C(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_08078784(Entity*, u32); -extern void sub_0807DD50(Entity*); extern s32 sub_0806ED9C(Entity*, u32, u32); extern void sub_0807000C(Entity*); extern void sub_0805E47C(Entity*); @@ -100,7 +97,6 @@ extern s32 sub_0806F078(Entity*, s32); extern void sub_0801D2B4(Entity*, u32); extern void sub_0806FD3C(Entity*); extern u32 sub_0801E99C(Entity*); -extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); extern void sub_0805ED14(u32*); extern void sub_080A7C18(u32, u32, u32); @@ -278,7 +274,7 @@ extern u32 sub_08052734(); // has Dungeon Map? extern u32 sub_08052764(); // has Dungeon Compass? extern u32 sub_0805279C(); // has Dungeon Big Key? extern u32 sub_080527CC(); // num Dungeon small keys? -extern u32 sub_08053FE0(); +extern u32 GetItemPrice(); extern void sub_08078790(Entity*, u32); extern void sub_080788E0(Entity*); extern void sub_08078AA8(u32, u32); diff --git a/include/manager.h b/include/manager.h index f292baf2..d86f203c 100644 --- a/include/manager.h +++ b/include/manager.h @@ -26,7 +26,7 @@ typedef struct Manager { /*0x11*/ u8 unk_11[3]; /*0x14*/ struct Manager* parent; /*0x18*/ u8 unk_18[0x8]; - // union SplitHWord unk_20; + // union SplitHWord y; // u16 unk_22; // u16 unk_24; // u16 unk_26; diff --git a/include/script.h b/include/script.h index b1aeca73..cfc2c180 100644 --- a/include/script.h +++ b/include/script.h @@ -6,7 +6,7 @@ typedef struct ScriptExecutionContext { u16* scriptInstructionPointer; u32 intVariable; - u32 unk_08; + u32 postScriptActions; u8 unk_0C[0x4]; // unused u16 wait; u16 unk_12; @@ -15,22 +15,27 @@ typedef struct ScriptExecutionContext { u8 unk_19; u8 unk_1A; u8 unk_1B; // unused - union SplitWord unk_1C; - union SplitWord unk_20; + union SplitWord x; + union SplitWord y; } ScriptExecutionContext; -extern void ExecuteScriptCommandSet(Entity*, ScriptExecutionContext*); +void ExecuteScript(Entity* entity, ScriptExecutionContext* context); extern u32 GetNextScriptCommandHalfword(u16*); extern u32 GetNextScriptCommandWord(u16*); extern u32 GetNextScriptCommandWordAfterCommandMetadata(u16*); extern u32 GetNextScriptCommandHalfwordAfterCommandMetadata(u16*); -extern void StartPlayerScript(u16*); +void UnloadCutsceneData(Entity* entity); +void StartPlayerScript(u16*); -extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); +void sub_0807DD50(Entity* entity); +void sub_0807DD64(Entity* entity); +void sub_0807DD80(Entity* entity, u16* script); +void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); -extern ScriptExecutionContext* StartCutscene(Entity*, u16*); -extern void sub_0807DDAC(Entity*, void (*function)(Entity*, ScriptExecutionContext*)); -extern void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*)); +ScriptExecutionContext* StartCutscene(Entity* entity, u16* script); +void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*)); +void HandleEntity0x82Actions(Entity* entity); +void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*)); #endif diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 6f888658..61e54b6a 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -5,7 +5,7 @@ extern u32 PlayerInRange(Entity*, u32, u32); u32 sub_08021D00(); -void sub_08021D44(Entity* this, u32 param_2); +void sub_08021D44(Entity* this, u32 direction); extern void (*const gUnk_080CB590[])(Entity*); extern void (*const gUnk_080CB5A8[])(Entity*); diff --git a/src/entity.c b/src/entity.c index 2e99ed68..d574f05c 100644 --- a/src/entity.c +++ b/src/entity.c @@ -1,5 +1,6 @@ #include "global.h" #include "entity.h" +#include "script.h" typedef struct OtherEntity { struct OtherEntity* prev; @@ -77,7 +78,6 @@ extern void sub_08078954(); extern void sub_0805EC60(); extern void sub_08017744(); extern void sub_0805E92C(); -extern void UnloadCutsceneData(); extern void UnloadHitbox(); extern void sub_0801DA0C(); extern void sub_0804AA1C(); diff --git a/src/npc/anju.c b/src/npc/anju.c index f5cc69a0..d77c5356 100644 --- a/src/npc/anju.c +++ b/src/npc/anju.c @@ -6,12 +6,11 @@ #include "sprite.h" #include "textbox.h" #include "npc.h" +#include "script.h" extern void sub_0805E3A0(Entity*, u32); -extern void sub_0807DD50(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); -extern void sub_0807DD94(Entity*, u32); extern u32 sub_0801E99C(void); extern void sub_08078784(Entity*, u32); diff --git a/src/npc/beedle.c b/src/npc/beedle.c index db962461..3e09302f 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -109,8 +109,8 @@ void sub_08063410(Entity* this) { if (this->type != 0) { sub_0806346C(this); } - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); GetNextFrame(this); } diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 2874115f..d4896ce9 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -9,8 +9,6 @@ extern void (*gUnk_081140D4[])(Entity*); extern u16 gUnk_081140CC[]; extern void sub_0806D0B0(Entity*); -extern void sub_0807DD64(Entity*); -extern void sub_0807DDE4(Entity*); extern void SoundReq(u32); extern void sub_0806D02C(Entity*); extern Entity* FindEntityInListByForm(u32, u32, u32, u32, u32); @@ -28,8 +26,8 @@ void sub_0806CF30(Entity* this) { sub_0806D0B0(this); sub_0807DD64(this); } else { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); } switch (this->previousActionFlag) { diff --git a/src/npc/carlov.c b/src/npc/carlov.c index d3824e78..a091f54f 100644 --- a/src/npc/carlov.c +++ b/src/npc/carlov.c @@ -7,9 +7,8 @@ #include "textbox.h" #include "npc.h" #include "structures.h" +#include "script.h" -extern void sub_0807DD50(Entity*); -extern void sub_0807DD94(Entity*, u32); extern void EnqueueSFX(u32); void Carlov(Entity* this) { diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index b49e67d9..1d8209b1 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -8,10 +8,8 @@ extern void DeleteThisEntity(); extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*); extern SpriteLoadData gUnk_08110CA8[]; extern void sub_0805E3A0(Entity*, u32); -extern void sub_0807DD64(Entity*); extern u32 GetFacingDirection(Entity*, Entity*); extern void sub_0806F118(Entity*); -extern void sub_0807DDE4(Entity*); extern u32 UpdateFuseInteraction(Entity*); extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32); extern void sub_0807000C(Entity*); @@ -39,8 +37,8 @@ void Carpenter(Entity* this) { sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4 + (this->type * 8)); sub_0806F118(this); } else { - sub_0807DDAC(this, 0); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, 0); + HandleEntity0x82Actions(this); GetNextFrame(this); } break; diff --git a/src/npc/dampe.c b/src/npc/dampe.c index c9ec14b1..d55840f7 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -9,7 +9,6 @@ #include "script.h" extern void sub_0805E3A0(Entity*, u32); -extern void sub_0807DD50(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); extern u32 sub_0801E99C(void); diff --git a/src/npc/emma.c b/src/npc/emma.c index 7d4ac28d..a10a5f03 100644 --- a/src/npc/emma.c +++ b/src/npc/emma.c @@ -1,13 +1,12 @@ #include "global.h" #include "entity.h" +#include "script.h" extern u32 gUnk_0813AD10; extern u32 gUnk_0813AD24; extern u32 gUnk_0813AD38; extern void sub_0805E3A0(Entity*, u32); -extern void sub_0807DD50(Entity*); -extern void sub_0807DD94(Entity*, u32); extern void DoExitTransition(u32*); void Emma(Entity* this) { diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c index ee4ef053..acf37ec5 100644 --- a/src/npc/ezloCap.c +++ b/src/npc/ezloCap.c @@ -34,8 +34,8 @@ void EzloCap(Entity* this) { sub_0805E3A0(this, 2); sub_0807DD50(this); } - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); UpdateAnimationSingleFrame(this); } @@ -44,7 +44,7 @@ void sub_0806D8A0(Entity* this, ScriptExecutionContext* context) { s32 yOffset; context->unk_19 = 8; - context->unk_08 |= 2; + context->postScriptActions |= 2; context->condition = 0; xOffset = 16; if (this->spriteSettings.b.flipX) { @@ -52,8 +52,8 @@ void sub_0806D8A0(Entity* this, ScriptExecutionContext* context) { } xOffset += gPlayerEntity.x.HALF.HI; yOffset = gPlayerEntity.y.HALF.HI + 2; - context->unk_1C.HALF.HI = xOffset; - context->unk_20.HALF.HI = yOffset; + context->x.HALF.HI = xOffset; + context->y.HALF.HI = yOffset; xOffset -= this->x.HALF.HI; this->direction = sub_080045DA(xOffset, yOffset - this->y.HALF.HI); diff --git a/src/npc/festari.c b/src/npc/festari.c index ad1635bd..53093ebf 100644 --- a/src/npc/festari.c +++ b/src/npc/festari.c @@ -7,7 +7,6 @@ extern u32 sub_0801E99C(Entity*); extern void sub_08078784(Entity*, u32); -extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); extern void sub_0805FF2C(Entity*, void*); @@ -38,7 +37,7 @@ void sub_0805FE48(Entity* this) { InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { - ExecuteScriptCommandSet(this, *(ScriptExecutionContext**)&this->cutsceneBeh); + ExecuteScript(this, *(ScriptExecutionContext**)&this->cutsceneBeh); sub_0805FF2C(this, *(void**)&this->cutsceneBeh); uVar4 = this->field_0x80.HWORD; if (uVar4 < 8) { diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index b846d29e..0ce3b893 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -9,9 +9,7 @@ #include "save.h" #include "script.h" -extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); -extern void sub_0807DDE4(Entity*); extern void sub_080600F0(Entity*); extern s32 sub_0806EDD8(Entity*, u32, u32); extern u32 sub_0806F5B0(u32); @@ -51,8 +49,8 @@ void ForestMinish(Entity* this) { this->interactType = 0; sub_0806F118(this); } else { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); if (this->frameDuration != 0xf0) { sub_080600F0(this); } diff --git a/src/npc/gentari.c b/src/npc/gentari.c index b7387777..c480de5a 100644 --- a/src/npc/gentari.c +++ b/src/npc/gentari.c @@ -2,14 +2,13 @@ #include "entity.h" #include "npc.h" #include "player.h" +#include "script.h" extern void sub_0805E3A0(Entity*, u32); extern u32 sub_0801E99C(Entity*); extern void sub_08078784(Entity*, u32); -extern void sub_0807DD50(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); -extern void sub_0807DD94(Entity*, u32); void Gentari(Entity* this) { switch (this->action) { diff --git a/src/npc/guard.c b/src/npc/guard.c index 1b3ba9b3..2fad648d 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -23,12 +23,10 @@ extern u32 sub_0806F5A4(u32); extern void sub_0806EE20(Entity*); extern void sub_08064428(Entity*); extern u32 sub_0805ACC0(Entity*); -extern void sub_0807DDE4(Entity*); extern void sub_0807000C(Entity*); extern void sub_0806EE04(Entity*, void*, u32); extern Entity* sub_080A7EE0(int); extern void sub_08078778(Entity*); -extern void sub_0807DD64(Entity*); void sub_08063DC8(Entity*); void sub_08063F20(Entity*); @@ -155,8 +153,8 @@ void sub_08063E90(Entity* this) { } void sub_08063F20(Entity* this) { - sub_0807DDAC(this, 0); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, 0); + HandleEntity0x82Actions(this); GetNextFrame(this); if (this->interactType != 0) { this->action++; diff --git a/src/npc/librari.c b/src/npc/librari.c index 30c5ea99..ce6fbefc 100644 --- a/src/npc/librari.c +++ b/src/npc/librari.c @@ -25,8 +25,8 @@ void Librari(Entity* this) { this->interactType = 0; sub_0806F118(this); } else { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); UpdateAnimationSingleFrame(this); } break; diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c index df7366dd..38db736c 100644 --- a/src/npc/mayorHagen.c +++ b/src/npc/mayorHagen.c @@ -11,11 +11,9 @@ #include "save.h" #include "script.h" -extern void sub_0807DD50(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); extern void sub_08078784(Entity*, u32); -extern void sub_0807DDE4(Entity*); extern void sub_08078850(); extern u32 gUnk_08113F44; extern Dialog gUnk_08113F48[]; @@ -43,8 +41,8 @@ void MayorHagen(Entity* this) { sub_0806F118(this); break; } - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); UpdateAnimationSingleFrame(this); break; case 2: diff --git a/src/npc/melari.c b/src/npc/melari.c index 38bc4e54..86679811 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -7,9 +7,7 @@ extern void sub_08068780(Entity*); extern void sub_08078778(Entity*); -extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); -extern void sub_0807DDE4(Entity*); extern u32 sub_080040A8(Entity*); extern void EnqueueSFX(u32); extern u32 sub_0801E99C(Entity*); @@ -82,8 +80,8 @@ void sub_08068780(Entity* this) { this->interactType = 0; sub_0806F118(this); } else { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); GetNextFrame(this); } break; diff --git a/src/npc/moblinLady.c b/src/npc/moblinLady.c index 640c09d9..c1ddbe6a 100644 --- a/src/npc/moblinLady.c +++ b/src/npc/moblinLady.c @@ -6,8 +6,7 @@ #include "sprite.h" #include "textbox.h" #include "npc.h" -extern void sub_0807DD50(); -extern void sub_0807DD94(); +#include "script.h" void MoblinLady(Entity* this) { if (this->action == 0) { diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index 998a54a6..2eaeb91b 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -9,7 +9,6 @@ #include "save.h" #include "script.h" -extern void sub_0807DD50(Entity*); extern u32 GetFacingDirection(Entity*, Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); diff --git a/src/npc/postman.c b/src/npc/postman.c index 3aa6dd86..2701efd1 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -17,7 +17,6 @@ extern s32 sub_0806ED9C(Entity*, u32, u32); extern void sub_0806EE20(Entity*); extern u32 sub_080040A8(Entity*); extern u32 sub_0801E99C(Entity*); -extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); extern u32 sub_0806F5A4(u32); extern u32 GetFacingDirection(Entity*, Entity*); diff --git a/src/npc/rem.c b/src/npc/rem.c index c0be96f9..bb1d78ff 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -3,7 +3,6 @@ #include "entity.h" #include "script.h" -extern void sub_0807DDE4(Entity*); extern void SoundReq(u32); extern void sub_0806A8C8(Entity*); @@ -20,8 +19,8 @@ void sub_0806a370(Entity* this) { u8* pbVar1; gUnk_08112278[this->action](this); - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); UpdateAnimationSingleFrame(this); sub_0806ED78(this); if (this->animIndex == 0xf) { diff --git a/src/npc/smith.c b/src/npc/smith.c index 2ae9e7f7..432df784 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -12,8 +12,6 @@ extern Entity* CreateFx(Entity*, u32, u32); extern void SoundReq(u32); extern void sub_0807000C(Entity*); extern u32 sub_0801E99C(Entity*); -extern void sub_0807DD50(Entity*); -extern void sub_0807DDE4(Entity*); extern u32 UpdateFuseInteraction(Entity*); extern u32 GetAnimationState(Entity*); extern void sub_08078850(Entity*, u32, u32, u32*); @@ -135,8 +133,8 @@ void sub_080661BC(Entity* this) { } void sub_08066200(Entity* this) { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); UpdateAnimationSingleFrame(this); } diff --git a/src/npc/stamp.c b/src/npc/stamp.c index 870060ef..52b100d6 100644 --- a/src/npc/stamp.c +++ b/src/npc/stamp.c @@ -7,9 +7,7 @@ extern void sub_08078778(Entity*); extern void sub_0805E47C(Entity*); extern void sub_0805E584(); -extern void sub_0807DD64(); extern void sub_08062CA4(); -extern void sub_0807DDE4(); extern u32 CheckKinstoneFused(); extern void (*gStampBehaviors1[4])(Entity*); @@ -68,8 +66,8 @@ void sub_08062C7C(Entity* ent) { } void sub_08062CA4(Entity* ent) { - sub_0807DDAC(ent, NULL); - sub_0807DDE4(ent); + ExecuteScriptForEntity(ent, NULL); + HandleEntity0x82Actions(ent); GetNextFrame(ent); } diff --git a/src/npc/syrup.c b/src/npc/syrup.c index 7ca47dc1..ff12fa4a 100644 --- a/src/npc/syrup.c +++ b/src/npc/syrup.c @@ -1,8 +1,8 @@ #include "global.h" #include "entity.h" #include "npc.h" +#include "script.h" -extern void sub_0807DD50(Entity*); extern void sub_0806ED78(Entity*); extern void sub_0805E3A0(Entity*, u32); @@ -11,7 +11,6 @@ extern void (*gUnk_081121D4[])(Entity*); extern SpriteLoadData gUnk_081121C4; extern SpriteLoadData gUnk_081121B4; extern u32 gScreenTransition; -extern void sub_0807DD94(Entity*, u32); extern void sub_0806A26C(Entity*); extern void sub_080042BA(Entity*, u32); diff --git a/src/npc/teachers.c b/src/npc/teachers.c index eaae979d..d04d2ab6 100644 --- a/src/npc/teachers.c +++ b/src/npc/teachers.c @@ -6,7 +6,6 @@ #include "script.h" extern SpriteLoadData gUnk_08113910[]; -extern void sub_0807DD50(Entity*); extern u32 GetFacingDirection(Entity*, Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index ff96b1fb..0785d87a 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -112,7 +112,7 @@ void sub_0806ACC4(Entity* this) { this->interactType = 0; sub_0806F118(this); } else { - sub_0807DDAC(this, NULL); + ExecuteScriptForEntity(this, NULL); sub_0806AEA8(this); if (this->type2 == 10 && this->interactType) { this->action = 2; @@ -182,7 +182,7 @@ void sub_0806AEA8(Entity* this) { if (old & 0x20) { sub_08003FC4(this, 0x4000); } - sub_0807DDE4(this); + HandleEntity0x82Actions(this); this->field_0x82.HWORD = old; } diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index 76fea004..cad4e29b 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -21,12 +21,10 @@ extern void (*const gUnk_0810B77C[])(Entity*); extern void sub_08061CB4(Entity*, u32); extern u32 sub_0805ACC0(Entity*); extern u32 sub_0801E99C(Entity*); -extern void sub_0807DD64(Entity*); extern void sub_08061D64(Entity*); extern void sub_0806F118(Entity*); extern u32 sub_0806F5A4(u32); extern u32 GetFacingDirection(Entity*, Entity*); -extern void sub_0807DDE4(Entity*); extern void sub_08062048(Entity*); extern void sub_08078784(Entity*, u32); extern void sub_08078778(Entity*); @@ -138,8 +136,8 @@ void sub_08061D64(Entity* this) { this->field_0x68.HALF.HI = this->animIndex; InitializeAnimation(this, (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } else { - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); if (this->frameDuration == 0xff) { this->frameDuration = gUnk_0810B680[this->type].unk2; } diff --git a/src/npc/wheaton.c b/src/npc/wheaton.c index 2edbc69c..07697274 100644 --- a/src/npc/wheaton.c +++ b/src/npc/wheaton.c @@ -1,11 +1,10 @@ #include "global.h" #include "entity.h" +#include "script.h" extern void sub_0805E3A0(Entity*, u32); extern void ResolveEntityOnTop(Entity*, Entity*); extern Hitbox gUnk_0810C3C0; -extern void sub_0807DD64(Entity*); -extern void sub_0807DD94(Entity*, u32); void Wheaton(Entity* this) { if (this->action == 0) { diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index bbecda9b..ea09f484 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -9,10 +9,8 @@ #include "script.h" extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*); -extern void sub_0807DD50(Entity*); extern void sub_0806C7D4(Entity*); extern void sub_0806F118(Entity*); -extern void sub_0807DD80(Entity*, u32*); extern u32 sub_0801E99C(); extern void sub_08078784(Entity*, u32); extern void SetExtraSpriteFrame(Entity*, u32, u32); @@ -24,7 +22,7 @@ extern void (*const gUnk_08113A7C[])(Entity*); extern void (*const gUnk_08113A8C[])(Entity*, ScriptExecutionContext*); extern SpriteLoadData gUnk_08113A1C[]; -extern u32 script_08014A80; +extern u16 script_08014A80; extern Dialog gUnk_08113ABC[]; extern u16 gUnk_08113B0C[]; diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 1eb8420f..f8ad4324 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -6,7 +6,6 @@ #include "script.h" extern void PrependEntityToList(Entity*, u32); -extern void sub_0807DD50(Entity*); extern Entity* FindEntityBySubtype(u32, u32); void CopyPosition(Entity*, Entity*); void sub_08068680(Entity*, Entity*); diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index 3dbca161..0d9b6e81 100644 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -117,7 +117,7 @@ static void sub_0808681C(Entity* this) { } if (this->flags & 0x2) { - ExecuteScriptCommandSet(this, *(ScriptExecutionContext**)&this->cutsceneBeh); + ExecuteScript(this, *(ScriptExecutionContext**)&this->cutsceneBeh); sub_080868EC(this, *(void**)&this->cutsceneBeh); } } @@ -129,7 +129,7 @@ void sub_080868B0(Entity* this) { this->hitbox = &gUnk_081206AC; this->actionDelay = 8; } - ExecuteScriptCommandSet(this, *(ScriptExecutionContext**)&this->cutsceneBeh); + ExecuteScript(this, *(ScriptExecutionContext**)&this->cutsceneBeh); sub_080868EC(this, *(void**)&this->cutsceneBeh); } diff --git a/src/object/windcrest.c b/src/object/windcrest.c index efc11dc4..b4b7893a 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -1,11 +1,8 @@ #include "global.h" #include "entity.h" -#include "functions.h" #include "save.h" #include "script.h" -extern void sub_0807DD64(Entity*); -extern void sub_0807DDE4(Entity*); extern void sub_08078850(Entity*, u32, u32, u8*); extern void SoundReq(u32); extern Entity* CreateFx(Entity*, u32, u32); @@ -18,8 +15,8 @@ void Windcrest(Entity* this) { this->frameIndex = 0; sub_0807DD64(this); } - sub_0807DDAC(this, NULL); - sub_0807DDE4(this); + ExecuteScriptForEntity(this, NULL); + HandleEntity0x82Actions(this); } void sub_080A2124(Entity* this) { diff --git a/src/script.c b/src/script.c index 1f8e583e..2bf9b6f0 100644 --- a/src/script.c +++ b/src/script.c @@ -8,8 +8,8 @@ #include "functions.h" #include "save.h" -void sub_0807DAF0(Entity*, ScriptExecutionContext*, u16*); -void sub_0807DB88(ScriptExecutionContext*, u16*); +void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*); +void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script); void sub_0807DE80(Entity*); void sub_0807DF38(void); void ScriptCommandNop(Entity* entity, ScriptExecutionContext* context); @@ -132,8 +132,8 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EF80(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EF90(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context); @@ -278,8 +278,8 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_0807EEB4, ScriptCommand_0807EEF4, ScriptCommand_0807EF3C, - ScriptCommand_0807EF80, - ScriptCommand_0807EF90, + ScriptCommand_DoPostScriptAction, + ScriptCommand_DoPostScriptAction2, ScriptCommand_SoundReq, ScriptCommand_SoundReq2, ScriptCommand_SoundReq3, @@ -303,7 +303,7 @@ extern u8 gUnk_0811E510[]; extern ScriptExecutionContext gPlayerScriptExecutionContext; extern ScriptExecutionContext gScriptExecutionContextArray[0x20]; -void sub_0807DA70(void) { +void InitScriptData(void) { MemClear32(&gActiveScriptInfo, sizeof(gActiveScriptInfo)); MemClear32(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray)); MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); @@ -327,20 +327,20 @@ void DestroyScriptExecutionContext(ScriptExecutionContext* context) { MemClear32(context, sizeof(ScriptExecutionContext)); } -ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) { +ScriptExecutionContext* StartCutscene(Entity* entity, u16* script) { ScriptExecutionContext* context; context = CreateScriptExecutionContext(); if (context) { - sub_0807DAF0(entity, context, unk_2); + InitScriptForEntity(entity, context, script); } return context; } -void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* unk1) { +void InitScriptForEntity(Entity* entity, ScriptExecutionContext* context, u16* script) { entity->flags = entity->flags | 2; *(ScriptExecutionContext**)&entity->cutsceneBeh = context; - sub_0807DB88(context, unk1); + InitScriptExecutionContext(context, script); } void UnloadCutsceneData(Entity* entity) { @@ -351,11 +351,11 @@ void UnloadCutsceneData(Entity* entity) { } } -void StartPlayerScript(u16* unk1) { +void StartPlayerScript(u16* script) { Entity* player; MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); - gPlayerScriptExecutionContext.scriptInstructionPointer = unk1; + gPlayerScriptExecutionContext.scriptInstructionPointer = script; player = &gPlayerEntity; *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext; gPlayerState.playerAction = 0x1c; @@ -364,89 +364,89 @@ void StartPlayerScript(u16* unk1) { gPlayerState.field_0x38 = 0; } -ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) { +ScriptExecutionContext* StartCutscene2(Entity* entity, u16* script) { ScriptExecutionContext* context; context = CreateScriptExecutionContext(); if (context) { entity->flags |= 2; *(ScriptExecutionContext**)&entity->field_0x3c = context; - context->scriptInstructionPointer = unk1; + context->scriptInstructionPointer = script; } return context; } -void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) { +void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script) { MemClear32(context, sizeof(ScriptExecutionContext)); - context->scriptInstructionPointer = unk1; + context->scriptInstructionPointer = script; } -void sub_0807DB98(Entity* entity, ScriptExecutionContext* context) { - u32 switchVar; - - while (context->unk_08) { - switchVar = (~context->unk_08 + 1) & context->unk_08; - context->unk_08 ^= switchVar; - switch (switchVar) { - case 1: +void HandlePostScriptActions(Entity* entity, ScriptExecutionContext* context) { + u32 bit; + // iterate over bits of context->postScriptActions, LSB first + while (context->postScriptActions) { + bit = (~context->postScriptActions + 1) & context->postScriptActions; + context->postScriptActions ^= bit; + switch (bit) { + case 1 << 0x00: entity->field_0x80.HWORD = 0; break; - case 2: + case 1 << 0x01: entity->field_0x80.HWORD = 4; break; - case 4: + case 1 << 0x02: break; - case 8: + case 1 << 0x03: entity->field_0x20 = 0x18000; break; - case 0x10: + case 1 << 0x04: CreateSpeechBubbleExclamationMark(entity, 8, -0x18); break; - case 0x20: + case 1 << 0x05: CreateSpeechBubbleQuestionMark(entity, 8, -0x18); break; - case 0x40: + case 1 << 0x06: DestroyScriptExecutionContext(context); DeleteThisEntity(); - case 0x80: + case 1 << 0x07: entity->spriteSettings.b.draw = 1; break; - case 0x100: + case 1 << 0x08: entity->spriteSettings.b.draw = 0; break; - case 0x200: + case 1 << 0x09: entity->spriteOffsetY = 0; entity->spriteOffsetX = 0; entity->field_0x82.HWORD = 0; break; - case 0x400: + case 1 << 0x0a: entity->field_0x82.HWORD |= 2; break; - case 0x800: + case 1 << 0x0b: entity->field_0x82.HWORD &= 0xfffd; break; - case 0x1000: + case 1 << 0x0c: entity->field_0x82.HWORD &= 0xfffe; break; - case 0x2000: + case 1 << 0x0d: entity->field_0x82.HWORD |= 1; break; - case 0x4000: + case 1 << 0x0e: entity->field_0x82.HWORD |= 8; break; - case 0x8000: + case 1 << 0x0f: entity->field_0x82.HWORD ^= 4; break; - case 0x10000: + case 1 << 0x10: entity->field_0x82.HWORD ^= 0x10; break; - case 0x20000: + case 1 << 0x11: entity->spriteSettings.b.flipX ^= 1; break; - case 0x40000: + case 1 << 0x12: entity->field_0x82.HWORD |= 0x20; break; - case 0x80000: + case 1 << 0x13: entity->field_0x82.HWORD &= 0xffdf; break; default: @@ -467,27 +467,27 @@ void sub_0807DD64(Entity* entity) { entity->field_0x82.HWORD = 0; } -void sub_0807DD80(Entity* entity, u16* unk1) { - sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, unk1); +void sub_0807DD80(Entity* entity, u16* script) { + InitScriptExecutionContext(*(ScriptExecutionContext**)&entity->cutsceneBeh, script); sub_0807DD64(entity); } void sub_0807DD94(Entity* entity, void (*function)(Entity*, ScriptExecutionContext*)) { - sub_0807DDAC(entity, function); - sub_0807DDE4(entity); + ExecuteScriptForEntity(entity, function); + HandleEntity0x82Actions(entity); sub_0807DE80(entity); } -void sub_0807DDAC(Entity* entity, void (*function)(Entity*, ScriptExecutionContext*)) { +void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*)) { ScriptExecutionContext** piVar1; piVar1 = (ScriptExecutionContext**)&entity->cutsceneBeh; if (*piVar1) { - ExecuteScriptCommandSet(entity, *piVar1); - if (function) { - function(entity, *piVar1); + ExecuteScript(entity, *piVar1); + if (postScriptCallback) { + postScriptCallback(entity, *piVar1); } else { - sub_0807DB98(entity, *piVar1); + HandlePostScriptActions(entity, *piVar1); } if (!entity->next) { DeleteThisEntity(); @@ -495,36 +495,36 @@ void sub_0807DDAC(Entity* entity, void (*function)(Entity*, ScriptExecutionConte } } -void sub_0807DDE4(Entity* entity) { +void HandleEntity0x82Actions(Entity* entity) { u32 temp; - u32 switchVar; + u32 bit; u32 loopVar; loopVar = entity->field_0x82.HWORD; while (loopVar) { - switchVar = (~loopVar + 1) & loopVar; - loopVar = loopVar ^ switchVar; - switch (switchVar) { - case 2: + bit = (~loopVar + 1) & loopVar; + loopVar = loopVar ^ bit; + switch (bit) { + case 1 << 1: if (entity->kind == 7) { sub_0806ED78(entity); } else { sub_0800445C(entity); } break; - case 8: + case 1 << 3: if ((gScreenTransition.frameCount & 3) == 0) { temp = (entity->field_0xf + 2U) & 7; entity->animationState = temp; entity->field_0xf = temp; } break; - case 0x10: + case 1 << 4: if ((gScreenTransition.frameCount & 1) == 0) { entity->spriteOffsetX = gUnk_0811E510[Random() & 3]; } break; - case 0x20: + case 1 << 5: sub_08003FC4(entity, 0x2000); break; } @@ -563,20 +563,20 @@ void sub_0807DE80(Entity* entity) { sub_080042BA(entity, local1); } -void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 arg2, u32 arg3) { - int temp; - s32 t0, t1; +void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) { + int direction; + s32 xOffset, yOffset; context->unk_19 = 8; - context->unk_08 |= 2; + context->postScriptActions |= 2; context->condition = 0; - context->unk_1C.HALF.HI = arg2; - context->unk_20.HALF.HI = arg3; - t0 = context->unk_1C.HALF.HI - entity->x.HALF.HI; - t1 = context->unk_20.HALF.HI - entity->y.HALF.HI; - temp = sub_080045DA(t0, t1); - entity->direction = temp; - entity->animationState = (entity->animationState & 0x80) | gUnk_0811E514[(u32)(temp << 0x18) >> 0x1c]; + context->x.HALF.HI = x; + context->y.HALF.HI = y; + xOffset = context->x.HALF.HI - entity->x.HALF.HI; + yOffset = context->y.HALF.HI - entity->y.HALF.HI; + direction = sub_080045DA(xOffset, yOffset); + entity->direction = direction; + entity->animationState = (entity->animationState & 0x80) | gUnk_0811E514[(u32)(direction << 0x18) >> 0x1c]; } void sub_0807DF28() { @@ -598,29 +598,29 @@ void sub_0807DF50() { sub_08079184(); } -void ExecuteScriptCommandSet(Entity* unk1, ScriptExecutionContext* unk2) { - if (!unk2->scriptInstructionPointer) +void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { + if (!context->scriptInstructionPointer) return; - if (unk2->wait) { - unk2->wait--; + if (context->wait) { + context->wait--; } else { - struct_02033280* tmp2 = &gActiveScriptInfo; - tmp2->flags = 0; + struct_02033280* activeScriptInfo = &gActiveScriptInfo; + activeScriptInfo->flags = 0; do { - u32 cmd = GetNextScriptCommandHalfword(unk2->scriptInstructionPointer); - u16* tmp; + u32 cmd = GetNextScriptCommandHalfword(context->scriptInstructionPointer); + u16* lastInstruction; if (cmd == 0xFFFF) return; - tmp2->commandSize = cmd >> 0xA; - tmp2->commandIndex = cmd & 0x3FF; - tmp = unk2->scriptInstructionPointer; - tmp2->flags &= ~1; - gScriptCommands[tmp2->commandIndex](unk1, unk2); - unk2->scriptInstructionPointer += tmp2->commandSize; - if (tmp != unk2->scriptInstructionPointer) { - unk2->unk_18 = 0; + activeScriptInfo->commandSize = cmd >> 0xA; + activeScriptInfo->commandIndex = cmd & 0x3FF; + lastInstruction = context->scriptInstructionPointer; + activeScriptInfo->flags &= ~1; + gScriptCommands[activeScriptInfo->commandIndex](entity, context); + context->scriptInstructionPointer += activeScriptInfo->commandSize; + if (lastInstruction != context->scriptInstructionPointer) { + context->unk_18 = 0; } - } while (tmp2->flags & 3); + } while (activeScriptInfo->flags & 3); } } @@ -833,19 +833,19 @@ void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* co } void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context) { - u32 tmp, tmp2; - s32 tmp3; - tmp = context->scriptInstructionPointer[1]; + u32 item, tmp2; + s32 price; + item = context->scriptInstructionPointer[1]; tmp2 = context->scriptInstructionPointer[2]; - if (!tmp) { - tmp = gRoomVars.itemForSaleIndex; + if (!item) { + item = gRoomVars.itemForSaleIndex; tmp2 = gRoomVars.field_0x7; } - tmp3 = sub_08053FE0(tmp); - context->condition = (tmp3 <= gSave.stats.rupees); + price = GetItemPrice(item); + context->condition = (price <= gSave.stats.rupees); if (context->condition) { - ModRupees(-tmp3); - sub_080A7C18(tmp, tmp2, 0); + ModRupees(-price); + sub_080A7C18(item, tmp2, 0); gRoomVars.itemForSaleIndex = 0; gRoomVars.field_0x7 = 0; } @@ -1032,16 +1032,16 @@ void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context) { } void sub_0807E818(u32 unk1) { - Entity* tmp = gRoomControls.cameraTarget; - u32 tmp2, tmp3; - if (tmp) { - tmp2 = tmp->x.HALF.HI - gRoomControls.roomScrollX; - tmp3 = tmp->y.HALF.HI - gRoomControls.roomScrollY; + Entity* cameraTarget = gRoomControls.cameraTarget; + u32 x, y; + if (cameraTarget) { + x = cameraTarget->x.HALF.HI - gRoomControls.roomScrollX; + y = cameraTarget->y.HALF.HI - gRoomControls.roomScrollY; } else { - tmp2 = 0x78; - tmp3 = 0x50; + x = 0x78; + y = 0x50; } - sub_08050110(tmp2, tmp3, unk1, gActiveScriptInfo.unk_08); + sub_08050110(x, y, unk1, gActiveScriptInfo.unk_08); } void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) { @@ -1282,14 +1282,14 @@ void ScriptCommand_0807EC1C(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; context->unk_12 = context->scriptInstructionPointer[1]; - context->unk_08 |= 2; + context->postScriptActions |= 2; } sub_0807EC44(entity, context); } -void sub_0807EC44(Entity* unk1, ScriptExecutionContext* unk2) { - sub_0806F69C(unk1); - if (--unk2->unk_12) { +void sub_0807EC44(Entity* entity, ScriptExecutionContext* context) { + sub_0806F69C(entity); + if (--context->unk_12) { gActiveScriptInfo.commandSize = 0; } } @@ -1300,7 +1300,7 @@ void ScriptCommand_0807EC64(Entity* entity, ScriptExecutionContext* context) { context->unk_12 = context->scriptInstructionPointer[1]; entity->animationState = 0; entity->direction = 0; - context->unk_08 |= 2; + context->postScriptActions |= 2; } sub_0807EC44(entity, context); } @@ -1311,7 +1311,7 @@ void ScriptCommand_0807EC94(Entity* entity, ScriptExecutionContext* context) { context->unk_12 = context->scriptInstructionPointer[1]; entity->animationState = 2; entity->direction = 8; - context->unk_08 |= 2; + context->postScriptActions |= 2; } sub_0807EC44(entity, context); } @@ -1322,7 +1322,7 @@ void ScriptCommand_0807ECC4(Entity* entity, ScriptExecutionContext* context) { context->unk_12 = context->scriptInstructionPointer[1]; entity->animationState = 4; entity->direction = 0x10; - context->unk_08 |= 2; + context->postScriptActions |= 2; } sub_0807EC44(entity, context); } @@ -1333,7 +1333,7 @@ void ScriptCommand_0807ECF4(Entity* entity, ScriptExecutionContext* context) { context->unk_12 = context->scriptInstructionPointer[1]; entity->animationState = 6; entity->direction = 0x18; - context->unk_08 |= 2; + context->postScriptActions |= 2; } sub_0807EC44(entity, context); } @@ -1345,22 +1345,22 @@ void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context) { context->unk_12 = context->scriptInstructionPointer[3]; tmp = context->scriptInstructionPointer[1]; tmp2 = entity->x.HALF.HI - gRoomControls.roomOriginX; - context->unk_1C.WORD = ((tmp - tmp2) << 0x10) / context->unk_12; + context->x.WORD = ((tmp - tmp2) << 0x10) / context->unk_12; tmp = context->scriptInstructionPointer[2]; tmp3 = entity->y.HALF.HI - gRoomControls.roomOriginY; - context->unk_20.WORD = ((tmp - tmp3) << 0x10) / context->unk_12; + context->y.WORD = ((tmp - tmp3) << 0x10) / context->unk_12; entity->animationState = sub_0806F5B0(sub_080045B4(entity, context->scriptInstructionPointer[1] + gRoomControls.roomOriginX, context->scriptInstructionPointer[2] + gRoomControls.roomOriginY)); - context->unk_08 |= 2; + context->postScriptActions |= 2; } else { if (!--context->unk_12) { entity->x.HALF.HI = context->scriptInstructionPointer[1] + gRoomControls.roomOriginX; entity->y.HALF.HI = context->scriptInstructionPointer[2] + gRoomControls.roomOriginY; return; } - entity->x.WORD += context->unk_1C.WORD; - entity->y.WORD += context->unk_20.WORD; + entity->x.WORD += context->x.WORD; + entity->y.WORD += context->y.WORD; } gActiveScriptInfo.commandSize = 0; } @@ -1387,16 +1387,16 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { if (!--context->unk_19) { context->unk_19 = 8; entity->direction = - sub_080045DA(context->unk_1C.HALF.HI - entity->x.HALF.HI, context->unk_20.HALF.HI - entity->y.HALF.HI); + sub_080045DA(context->x.HALF.HI - entity->x.HALF.HI, context->y.HALF.HI - entity->y.HALF.HI); } - tmp = entity->x.HALF.HI - context->unk_1C.HALF.HI; - tmp2 = entity->y.HALF.HI - context->unk_20.HALF.HI; + tmp = entity->x.HALF.HI - context->x.HALF.HI; + tmp2 = entity->y.HALF.HI - context->y.HALF.HI; sub_0806F62C(entity, entity->nonPlanarMovement, entity->direction); - tmp *= entity->x.HALF.HI - context->unk_1C.HALF.HI; - tmp2 *= entity->y.HALF.HI - context->unk_20.HALF.HI; + tmp *= entity->x.HALF.HI - context->x.HALF.HI; + tmp2 *= entity->y.HALF.HI - context->y.HALF.HI; if (tmp <= 0 && tmp2 <= 0) { - entity->x.HALF.HI = context->unk_1C.HALF.HI; - entity->y.HALF.HI = context->unk_20.HALF.HI; + entity->x.HALF.HI = context->x.HALF.HI; + entity->y.HALF.HI = context->y.HALF.HI; context->condition = 1; } else { context->condition = 0; @@ -1430,21 +1430,21 @@ void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; entity->field_0x20 = ((s16)context->scriptInstructionPointer[1]) << 8; - context->unk_1C.HALF.LO = context->scriptInstructionPointer[2] << 8; - sub_08003FC4(entity, (u16)context->unk_1C.HALF.LO); + context->x.HALF.LO = context->scriptInstructionPointer[2] << 8; + sub_08003FC4(entity, (u16)context->x.HALF.LO); } else { - if (!sub_08003FC4(entity, (u16)context->unk_1C.HALF.LO)) + if (!sub_08003FC4(entity, (u16)context->x.HALF.LO)) return; } gActiveScriptInfo.commandSize = 0; } -void ScriptCommand_0807EF80(Entity* entity, ScriptExecutionContext* context) { - context->unk_08 |= 1 << context->scriptInstructionPointer[1]; +void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context) { + context->postScriptActions |= 1 << context->scriptInstructionPointer[1]; } -void ScriptCommand_0807EF90(Entity* entity, ScriptExecutionContext* context) { - context->unk_08 |= 1 << context->scriptInstructionPointer[1]; +void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context) { + context->postScriptActions |= 1 << context->scriptInstructionPointer[1]; } void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) { diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py index 9bb1424b..96104d05 100644 --- a/tools/script_disassembler/definitions.py +++ b/tools/script_disassembler/definitions.py @@ -128,8 +128,8 @@ commands = [ {'fun': 'ScriptCommand_0807EEB4', 'params': ''}, {'fun': 'ScriptCommand_0807EEF4', 'params': 'ss'}, {'fun': 'ScriptCommand_0807EF3C', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EF80', 'params': 's'}, - {'fun': 'ScriptCommand_0807EF90', 'params': 's'}, + {'fun': 'ScriptCommandDoPostScriptAction', 'params': 's'}, + {'fun': 'ScriptCommandDoPostScriptAction2', 'params': 's'}, {'fun': 'ScriptCommand_SoundReq', 'params': 's'}, {'fun': 'ScriptCommand_SoundReq2', 'params': 's'}, {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'},